Merge pull request #236 from UgnisSoftware/UGN-426

Fix modal not closing after submit

Author: masiulis

src/steps/ValidationStep/ValidationStep.tsx

@@ -100,23 +100,28 @@ export const ValidationStep = <T extends string>({ initialData, file, onBack }:
     )
     setShowSubmitAlert(false)
     setSubmitting(true)
-    onSubmit(calculatedData, file)
-      ?.then(() => {
-        onClose()
-      })
-      .catch((err: Error) => {
-        toast({
-          status: "error",
-          variant: "left-accent",
-          position: "bottom-left",
-          title: `${translations.alerts.submitError.title}`,
-          description: err?.message || `${translations.alerts.submitError.defaultMessage}`,
-          isClosable: true,
+    const response = onSubmit(calculatedData, file)
+    if (response?.then) {
+      response
+        .then(() => {
+          onClose()
         })
-      })
-      .finally(() => {
-        setSubmitting(false)
-      })
+        .catch((err: Error) => {
+          toast({
+            status: "error",
+            variant: "left-accent",
+            position: "bottom-left",
+            title: `${translations.alerts.submitError.title}`,
+            description: err?.message || `${translations.alerts.submitError.defaultMessage}`,
+            isClosable: true,
+          })
+        })
+        .finally(() => {
+          setSubmitting(false)
+        })
+    } else {
+      onClose()
+    }
   }
   const onContinue = () => {
     const invalidData = data.find((value) => {

src/steps/ValidationStep/tests/ValidationStep.test.tsx

@@ -48,6 +48,35 @@ describe("Validation step tests", () => {
     })
   })
 
+  test("Submit data without returning promise", async () => {
+    const onSuccess = jest.fn()
+    const onSubmit = jest.fn(() => {
+      onSuccess()
+    })
+    const onClose = jest.fn()
+    render(
+      <Providers theme={defaultTheme} rsiValues={{ ...mockValues, onSubmit, onClose }}>
+        <ModalWrapper isOpen={true} onClose={() => {}}>
+          <ValidationStep initialData={[]} file={file} />
+        </ModalWrapper>
+      </Providers>,
+    )
+
+    const finishButton = screen.getByRole("button", {
+      name: "Confirm",
+    })
+
+    await userEvent.click(finishButton)
+
+    await waitFor(() => {
+      expect(onSubmit).toBeCalledWith({ all: [], invalidData: [], validData: [] }, file)
+    })
+    await waitFor(() => {
+      expect(onSuccess).toBeCalled()
+      expect(onClose).toBeCalled()
+    })
+  })
+
   test("Submit data with a successful async return", async () => {
     const onSuccess = jest.fn()
     const onSubmit = jest.fn(async (): Promise<void> => {