Merge pull request #3347 from JohnDuprey/dev

bugfixes

Author: JohnDuprey

src/components/CippWizard/CippWizardOffboarding.jsx

@@ -300,6 +300,7 @@ export const CippWizardOffboarding = (props) => {
         onPreviousStep={onPreviousStep}
         onNextStep={onNextStep}
         formControl={formControl}
+        replacementBehaviour="removeNulls"
       />
     </Stack>
   );

src/components/CippWizard/CippWizardStepButtons.jsx

@@ -13,14 +13,24 @@ export const CippWizardStepButtons = (props) => {
     formControl,
     noNextButton = false,
     noSubmitButton = false,
+    replacementBehaviour,
     queryKeys,
     ...other
   } = props;
   const { isValid, isSubmitted, isSubmitting } = useFormState({ control: formControl.control });
   const sendForm = ApiPostCall({ relatedQueryKeys: queryKeys });
   const handleSubmit = () => {
     const values = formControl.getValues();
-    sendForm.mutate({ url: postUrl, data: values });
+    const newData = {};
+    Object.keys(values).forEach((key) => {
+      const value = values[key];
+      if (replacementBehaviour !== "removeNulls") {
+        newData[key] = value;
+      } else if (row[value] !== undefined) {
+        newData[key] = row[value];
+      }
+    });
+    sendForm.mutate({ url: postUrl, data: newData });
   };
 
   return (

src/pages/tenant/administration/alert-configuration/alert.jsx

@@ -206,12 +206,21 @@ const AlertWizard = () => {
   };
 
   const handleScriptSubmit = (values) => {
+    const getInputParams = () => {
+      if (values.command.value.requiresInput) {
+        return {
+          [values.command.value.inputName]: values[values.command.value.inputName],
+        };
+      }
+      return {};
+    };
+
     const postObject = {
       RowKey: router.query.clone ? undefined : router.query.id ? router.query.id : undefined,
       tenantFilter: values.tenantFilter?.value,
       Name: `${values.tenantFilter.value}: ${values.command.label}`,
       Command: { value: `Get-CIPPAlert${values.command.value.name}` },
-      Parameters: {},
+      Parameters: getInputParams(),
       ScheduledTime: Math.floor(new Date().getTime() / 1000) + 60,
       Recurrence: values.recurrence,
       PostExecution: values.postExecution,

src/pages/tenant/gdap-management/onboarding/start.js

@@ -205,8 +205,8 @@ const Page = () => {
       });
 
       var missingDefaults = [];
-      relationshipRoles.forEach((role) => {
-        if (!cippDefaults?.find((defaultRole) => defaultRole.value === role.roleDefinitionId)) {
+      cippDefaults.forEach((defaultRole) => {
+        if (!relationshipRoles?.find((role) => defaultRole.value === role.roleDefinitionId)) {
           missingDefaults.push(role);
         }
       });