Merge pull request #118 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippComponents/CippFormComponent.jsx

@@ -43,6 +43,7 @@ export const CippFormComponent = (props) => {
     name, // The name that may have bracket notation
     label,
     labelLocation = "behind", // Default location for switches
+    defaultValue,
     ...other
   } = props;
   const { errors } = useFormState({ control: formControl.control });
@@ -121,6 +122,7 @@ export const CippFormComponent = (props) => {
               {...other}
               {...formControl.register(convertedName, { ...validators })}
               label={label}
+              defaultValue={defaultValue}
             />
           </div>
           <Typography variant="subtitle3" color="error">
@@ -156,6 +158,7 @@ export const CippFormComponent = (props) => {
               {...other}
               {...formControl.register(convertedName, { ...validators })}
               label={label}
+              defaultValue={defaultValue}
             />
           </div>
           <Typography variant="subtitle3" color="error">
@@ -171,6 +174,7 @@ export const CippFormComponent = (props) => {
             <Controller
               name={convertedName}
               control={formControl.control}
+              defaultValue={defaultValue}
               render={({ field }) =>
                 renderSwitchWithLabel(
                   <Switch

src/components/CippWizard/CippWizardOffboarding.jsx

@@ -292,18 +292,18 @@ export const CippWizardOffboarding = (props) => {
               <Grid item xs={12} sm={6}>
                 <Typography variant="subtitle2">Send results to:</Typography>
                 <CippFormComponent
-                  name="webhook"
+                  name="postExecution.webhook"
                   label="Webhook"
                   type="switch"
                   formControl={formControl}
                 />
                 <CippFormComponent
-                  name="email"
+                  name="postExecution.email"
                   label="E-mail"
                   type="switch"
                   formControl={formControl}
                 />
-                <CippFormComponent name="psa" label="PSA" type="switch" formControl={formControl} />
+                <CippFormComponent name="postExecution.psa" label="PSA" type="switch" formControl={formControl} />
               </Grid>
             </CippFormCondition>
           </Grid>