Merge branch 'KelvinTegelaar:main' into main

mhcg · Jan 17, 2025 · eddb95d · eddb95d
2 parents 2cd089a + 0520849
commit eddb95d
Show file tree

Hide file tree

Showing 13 changed files with 1,271 additions and 168 deletions.
diff --git a/public/version.json b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "7.0.4"
+  "version": "7.0.5"
 }
diff --git a/src/components/CippComponents/CippFormComponent.jsx b/src/components/CippComponents/CippFormComponent.jsx
@@ -225,6 +225,33 @@ export const CippFormComponent = (props) => {
         </>
       );
 
+    case "select":
+      return (
+        <>
+          <div>
+            <Controller
+              name={convertedName}
+              control={formControl.control}
+              rules={validators}
+              render={({ field }) => (
+                <CippAutoComplete
+                  {...other}
+                  isFetching={other.isFetching}
+                  variant="filled"
+                  defaultValue={field.value}
+                  label={label}
+                  multiple={false}
+                  onChange={(value) => field.onChange(value.value)}
+                />
+              )}
+            />
+          </div>
+          <Typography variant="subtitle3" color="error">
+            {get(errors, convertedName, {}).message}
+          </Typography>
+        </>
+      );
+
     case "autoComplete":
       return (
         <>

diff --git a/src/components/CippWizard/CippWizardOffboarding.jsx b/src/components/CippWizard/CippWizardOffboarding.jsx
@@ -300,6 +300,7 @@ export const CippWizardOffboarding = (props) => {
         onPreviousStep={onPreviousStep}
         onNextStep={onNextStep}
         formControl={formControl}
+        replacementBehaviour="removeNulls"
       />
     </Stack>
   );

diff --git a/src/components/CippWizard/CippWizardStepButtons.jsx b/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 (