Merge pull request #2963 from glific/fix/form-layout

Fixed a bug in form layout
glific · Jul 8, 2024 · b933396 · b933396
2 parents 37168cf + dddf43c
commit b933396
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/containers/Form/FormLayout.tsx b/src/containers/Form/FormLayout.tsx
@@ -154,11 +154,10 @@ export const FormLayout = ({
     validationSchema: validationSchema,
     enableReinitialize: true,
     onSubmit: (values, { setErrors }) => {
-      setCustomError({ setErrors });
       if (confirmationState?.show) {
         setShowConfirmationDialog(true);
       } else {
-        onSaveButtonClick(formik.errors);
+        setCustomError({ setErrors });
         saveHandler(values);
       }
     },
@@ -562,6 +561,7 @@ export const FormLayout = ({
             variant="contained"
             color="primary"
             onClick={() => {
+              onSaveButtonClick(formik.errors);
               formik.submitForm();
             }}
             className={styles.Button}
@@ -641,7 +641,6 @@ export const FormLayout = ({
       <DialogBox
         title={confirmationState?.title || 'Are you sure you want to proceed?'}
         handleOk={() => {
-          onSaveButtonClick(formik.errors);
           saveHandler(formik.values);
         }}
         handleCancel={() => setShowConfirmationDialog(false)}

diff --git a/src/containers/Template/Form/HSM/HSM.test.tsx b/src/containers/Template/Form/HSM/HSM.test.tsx
@@ -47,8 +47,7 @@ describe('Add mode', () => {
     });
 
     const { queryByText } = within(container.querySelector('form') as HTMLElement);
-    const button: any = queryByText('Submit for Approval');
-    await user.click(button);
+    fireEvent.click(screen.getByTestId('submitActionButton'));
 
     // we should have 2 errors
     await waitFor(() => {
@@ -63,7 +62,7 @@ describe('Add mode', () => {
       },
     });
 
-    await user.click(button);
+    fireEvent.click(screen.getByTestId('submitActionButton'));
 
     // we should still have 2 errors
     await waitFor(() => {