[pull] dev from KelvinTegelaar:dev

src/components/forms/RFFComponents.jsx

@@ -253,6 +253,54 @@ RFFCFormInputArray.propTypes = {
   ...sharedPropTypes,
 }
 
+export const RFFCFormInputList = ({ name, label, className = 'mb-3' }) => {
+  return (
+    <>
+      <FieldArray name={name}>
+        {({ fields }) => (
+          <div>
+            <div className="mb-2">
+              {label && (
+                <CFormLabel className="me-2" htmlFor={name}>
+                  {label}
+                </CFormLabel>
+              )}
+              <CButton
+                onClick={() => fields.push({ Key: '', Value: '' })}
+                className="circular-button"
+                title={'+'}
+              >
+                <FontAwesomeIcon icon={'plus'} />
+              </CButton>
+            </div>
+            {fields.map((name, index) => (
+              <div key={name} className={className}>
+                <div>
+                  <Field name={`${name}`} component="input">
+                    {({ input, meta }) => {
+                      return <CFormInput placeholder="Value" {...input} className="mb-2" />
+                    }}
+                  </Field>
+                </div>
+                <CButton
+                  onClick={() => fields.remove(index)}
+                  className={`circular-button`}
+                  title={'-'}
+                >
+                  <FontAwesomeIcon icon={'minus'} />
+                </CButton>
+              </div>
+            ))}
+          </div>
+        )}
+      </FieldArray>
+    </>
+  )
+}
+RFFCFormInputList.propTypes = {
+  ...sharedPropTypes,
+}
+
 export const RFFCFormRadio = ({
   name,
   label,
@@ -463,10 +511,10 @@ export const RFFSelectSearch = ({
   isLoading = false,
   allowCreate = false,
   refreshFunction,
-  props,
+  ...props
 }) => {
   const [inputText, setInputText] = useState('')
-  const selectSearchvalues = values.map((val) => ({
+  const selectSearchValues = values.map((val) => ({
     value: val.value,
     label: val.name,
     ...val.props,
@@ -490,12 +538,33 @@ export const RFFSelectSearch = ({
   return (
     <Field name={name} validate={validate}>
       {({ meta, input }) => {
-        const handleChange = onChange
-          ? (e) => {
-              input.onChange(e)
-              onChange(e)
-            }
-          : input.onChange
+        const handleChange = (e) => {
+          if (onChange) {
+            onChange(e)
+          }
+          input.onChange(e)
+        }
+
+        const selectProps = {
+          classNamePrefix: 'react-select',
+          ...input,
+          name,
+          id: name,
+          disabled,
+          options: selectSearchValues,
+          placeholder,
+          isMulti: multi,
+          inputValue: inputText,
+          isLoading,
+          onChange: handleChange,
+          onInputChange: setOnInputChange,
+          ...props,
+          //merge className from props into the default className
+          className: props.className
+            ? `${props.className} react-select-container`
+            : 'react-select-container',
+        }
+
         return (
           <div>
             <CFormLabel htmlFor={name}>
@@ -513,79 +582,10 @@ export const RFFSelectSearch = ({
                 </CTooltip>
               )}
             </CFormLabel>
-            {!allowCreate && onChange && (
-              <Select
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={false}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                isMulti={multi}
-                onChange={handleChange}
-                onInputChange={debounceOnInputChange}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
-            )}
-            {!allowCreate && !onChange && (
-              <Select
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={true}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                onInputChange={setOnInputChange}
-                isMulti={multi}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
-            )}
-            {allowCreate && onChange && (
-              <Creatable
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={false}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                isMulti={multi}
-                onChange={handleChange}
-                onInputChange={debounceOnInputChange}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
-            )}
-            {allowCreate && !onChange && (
-              <Creatable
-                className="react-select-container"
-                classNamePrefix="react-select"
-                {...input}
-                isClearable={true}
-                name={name}
-                id={name}
-                disabled={disabled}
-                options={selectSearchvalues}
-                placeholder={placeholder}
-                onInputChange={setOnInputChange}
-                isMulti={multi}
-                inputValue={inputText}
-                isLoading={isLoading}
-                {...props}
-              />
+            {allowCreate ? (
+              <Creatable {...selectProps} isClearable={true} />
+            ) : (
+              <Select {...selectProps} isClearable={!onChange} />
             )}
             {meta.error && meta.touched && (
               <span className="text-danger">

src/components/forms/index.js

@@ -10,6 +10,7 @@ import {
   RFFCFormSelect,
   RFFSelectSearch,
   RFFCFormInputArray,
+  RFFCFormInputList,
 } from 'src/components/forms/RFFComponents'
 
 export {
@@ -24,4 +25,5 @@ export {
   RFFCFormSelect,
   RFFSelectSearch,
   RFFCFormInputArray,
+  RFFCFormInputList,
 }

src/components/utilities/CippFuzzySearch.jsx

@@ -4,7 +4,7 @@ import Fuse from 'fuse.js'
 function CippfuzzySearch(options) {
   const fuse = new Fuse(options, {
     keys: ['name', 'groupName', 'items.name'],
-    threshold: 0.5,
+    threshold: 0.3,
     location: 0,
     ignoreLocation: true,
     useExtendedSearch: true,
@@ -15,8 +15,8 @@ function CippfuzzySearch(options) {
     if (!value.length) {
       return options
     }
-
-    return fuse.search(value).map((_ref) => {
+    const search = fuse.search(value)
+    return search.map((_ref) => {
       let { item } = _ref
       return item
     })

src/components/utilities/TenantSelector.jsx

@@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import PropTypes from 'prop-types'
 import { useListTenantsQuery } from 'src/store/api/tenants'
 import { setCurrentTenant } from 'src/store/features/app'
-import { CButton, CDropdown, CDropdownMenu, CDropdownToggle } from '@coreui/react'
+import { CButton } from '@coreui/react'
 import { useNavigate, useSearchParams } from 'react-router-dom'
 import { queryString } from 'src/helpers'
 import { faBuilding } from '@fortawesome/free-solid-svg-icons'

src/data/Extensions.json

@@ -160,5 +160,65 @@
       }
     ],
     "mappingRequired": true
+  },
+  {
+    "name": "PasswordPusher",
+    "type": "PWPush",
+    "cat": "Passwords",
+    "forceSyncButton": false,
+    "helpText": "This integration allows you to generate password links instead of plain text passwords. Visit https://pwpush.com/ or https://github.com/pglombardo/PasswordPusher for more information.",
+    "SettingOptions": [
+      {
+        "type": "checkbox",
+        "name": "PWPush.Enabled",
+        "label": "Replace generated passwords with PWPush links"
+      },
+      {
+        "type": "input",
+        "fieldtype": "text",
+        "name": "PWPush.BaseUrl",
+        "label": "PWPush URL",
+        "placeholder": "Enter your PWPush URL. (default: https://pwpush.com)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "text",
+        "name": "PWPush.EmailAddress",
+        "label": "PWPush email address",
+        "placeholder": "Enter your email address for PWPush. (optional)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "password",
+        "name": "PWPush.APIKey",
+        "label": "PWPush API Key",
+        "placeholder": "Enter your PWPush API Key. (optional)"
+      },
+      {
+        "type": "checkbox",
+        "name": "PWPush.RetrievalStep",
+        "label": "Click to retrieve password (recommended)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "number",
+        "name": "PWPush.ExpireAfterDays",
+        "label": "Expiration in Days",
+        "placeholder": "Expiration time in days. (optional)"
+      },
+      {
+        "type": "input",
+        "fieldtype": "number",
+        "name": "PWPush.ExpireAfterViews",
+        "label": "Expiration after views",
+        "placeholder": "Expiration after views. (optional)"
+      },
+      {
+        "type": "checkbox",
+        "name": "PWPush.DeletableByViewer",
+        "label": "Allow deletion of passwords"
+      }
+    ],
+    "mappingRequired": false
   }
 ]

src/data/standards.json

@@ -121,6 +121,16 @@
     "impact": "Low Impact",
     "impactColour": "info"
   },
+  {
+    "name": "standards.EnablePronouns",
+    "cat": "Global Standards",
+    "tag": ["lowimpact"],
+    "helpText": "Enables the Pronouns feature for the tenant. This allows users to set their pronouns in their profile.",
+    "addedComponent": [],
+    "label": "Enable Pronouns",
+    "impact": "Low Impact",
+    "impactColour": "info"
+  },
   {
     "name": "standards.AnonReportDisable",
     "cat": "Global Standards",
@@ -1102,6 +1112,44 @@
         "name": "standards.AntiPhishPolicy.EnableUnusualCharactersSafetyTips",
         "default": true
       },
+      {
+        "type": "Select",
+        "label": "If a message is detected as user impersonation",
+        "name": "standards.AntiPhishPolicy.TargetedUserProtectionAction",
+        "values": [
+          {
+            "label": "Move to Junk Folder",
+            "value": "MoveToJmf"
+          },
+          {
+            "label": "Delete the message before its delivered",
+            "value": "Delete"
+          },
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          }
+        ]
+      },
+      {
+        "type": "Select",
+        "label": "If a message is detected as domain impersonation",
+        "name": "standards.AntiPhishPolicy.TargetedDomainProtectionAction",
+        "values": [
+          {
+            "label": "Move to Junk Folder",
+            "value": "MoveToJmf"
+          },
+          {
+            "label": "Delete the message before its delivered",
+            "value": "Delete"
+          },
+          {
+            "label": "Quarantine the message",
+            "value": "Quarantine"
+          }
+        ]
+      },
       {
         "type": "Select",
         "label": "If Mailbox Intelligence detects an impersonated user",