Merge pull request #2518 from JohnDuprey/dev

Custom Roles & Scheduler tweaks

Author: JohnDuprey

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,

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/views/cipp/Scheduler.jsx

@@ -5,6 +5,7 @@ import { Field, Form, FormSpy } from 'react-final-form'
 import {
   RFFCFormInput,
   RFFCFormInputArray,
+  RFFCFormInputList,
   RFFCFormSwitch,
   RFFSelectSearch,
 } from 'src/components/forms'
@@ -157,10 +158,14 @@ const Scheduler = () => {
       if (typeof row?.Parameters[key] === 'object') {
         var nestedParamList = []
         Object.keys(row?.Parameters[key]).forEach((nestedKey) => {
-          nestedParamList.push({
-            Key: nestedKey,
-            Value: row?.Parameters[key][nestedKey],
-          })
+          if (nestedKey >= 0) {
+            nestedParamList.push(row?.Parameters[key][nestedKey])
+          } else {
+            nestedParamList.push({
+              Key: nestedKey,
+              Value: row?.Parameters[key][nestedKey],
+            })
+          }
         })
         parameters[key] = nestedParamList
       } else {
@@ -179,6 +184,10 @@ const Scheduler = () => {
       })
     })
 
+    if (!recurrence) {
+      recurrence = { name: 'Only once', value: '0' }
+    }
+
     // Set initial values
     var formValues = {
       taskName: row.Name,
@@ -413,12 +422,22 @@ const Scheduler = () => {
                                                 key={idx}
                                               />
                                             ) : (
-                                              <RFFCFormInput
-                                                type="text"
-                                                key={idx}
-                                                name={`parameters.${param.Name}`}
-                                                label={`${param.Name}`}
-                                              />
+                                              <>
+                                                {param.Type === 'System.String[]' ? (
+                                                  <RFFCFormInputList
+                                                    name={`parameters.${param.Name}[]`}
+                                                    label={`${param.Name}`}
+                                                    key={idx}
+                                                  />
+                                                ) : (
+                                                  <RFFCFormInput
+                                                    type="text"
+                                                    key={idx}
+                                                    name={`parameters.${param.Name}`}
+                                                    label={`${param.Name}`}
+                                                  />
+                                                )}
+                                              </>
                                             )}
                                           </>
                                         )}

src/views/cipp/app-settings/components/SettingsCustomRoles.jsx

@@ -150,9 +150,8 @@ const SettingsCustomRoles = () => {
                           })
                         }
                       })
-                      if (blockedTenantSelectorRef?.current) {
-                        blockedTenantSelectorRef.current.setValue(blockedTenantList)
-                      }
+
+                      blockedTenantSelectorRef.current.setValue(blockedTenantList)
                     } else {
                       onChange(customRole[0][set])
                     }
@@ -323,18 +322,17 @@ const SettingsCustomRoles = () => {
                           </CCallout>
                         )}
                       </div>
-                      {selectedTenant.find((tenant) => tenant.value === 'AllTenants') && (
-                        <div className="mb-3">
-                          <h5>Blocked Tenants</h5>
-                          <TenantSelectorMultiple
-                            ref={blockedTenantSelectorRef}
-                            values={blockedTenants}
-                            AllTenants={false}
-                            valueIsDomain={true}
-                            onChange={(e) => handleBlockedTenantChange(e)}
-                          />
-                        </div>
-                      )}
+                      <div className="mb-3">
+                        <h5>Blocked Tenants</h5>
+                        <TenantSelectorMultiple
+                          ref={blockedTenantSelectorRef}
+                          values={blockedTenants}
+                          AllTenants={false}
+                          valueIsDomain={true}
+                          onChange={(e) => handleBlockedTenantChange(e)}
+                        />
+                      </div>
+
                       <h5>API Permissions</h5>
                       <CRow className="mt-4 px-2">
                         <CCol md={4}>