fix widget undefined calls (#766)

implerhq · Aug 21, 2024 · 2413edc · 2413edc
2 parents 8e1e313 + ae15bc0
commit 2413edc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 89 deletions.
diff --git a/.../components/widget/Phases/AutoImportPhases/hooks/AutoImportPhase2/useAutoImportPhase2.tsx b/.../components/widget/Phases/AutoImportPhases/hooks/AutoImportPhase2/useAutoImportPhase2.tsx
@@ -41,6 +41,7 @@ export function useAutoImportPhase2({ goNext }: IUseAutoImportPhase2Props) {
         })),
       });
     },
+    enabled: !!jobsInfo?._id,
   });
 
   const { mutate: createJobMapping } = useMutation<IUserJobMapping[], IErrorObject, IUserJobMapping[]>(

diff --git a/apps/widget/src/components/widget/Widget.tsx b/apps/widget/src/components/widget/Widget.tsx
@@ -55,15 +55,15 @@ export function Widget() {
     setPromptContinueAction(undefined);
   };
   const onClose = () => {
-    if ([PhasesEnum.VALIDATE, PhasesEnum.IMAGE_UPLOAD, PhasesEnum.UPLOAD, PhasesEnum.COMPLETE].includes(phase))
-      closeWidget(true);
-    else setPromptContinueAction(PromptModalTypesEnum.CLOSE);
+    if ([PhasesEnum.VALIDATE, PhasesEnum.IMAGE_UPLOAD, PhasesEnum.UPLOAD, PhasesEnum.COMPLETE].includes(phase)) {
+      setPhase(PhasesEnum.VALIDATE);
+      resetAppState();
+      closeWidget();
+    } else setPromptContinueAction(PromptModalTypesEnum.CLOSE);
   };
-  const closeWidget = (resetPhase?: boolean) => {
+  const closeWidget = () => {
     setShowWidget(false);
     resetAmplitude();
-    resetAppState();
-    if (resetPhase) setPhase(PhasesEnum.VALIDATE);
     setTimeout(() => {
       ParentWindow.Close();
     }, variables.closeDelayInMS);

diff --git a/apps/widget/src/hooks/Phase2/usePhase2.ts b/apps/widget/src/hooks/Phase2/usePhase2.ts
@@ -54,6 +54,7 @@ export function usePhase2({ goNext }: IUsePhase2Props) {
       onError(error: IErrorObject) {
         notifier.showError({ message: error.message, title: error.error });
       },
+      enabled: !!uploadInfo?._id,
     }
   );
   const { isLoading: isMappingFinalizing, mutate: finalizeMapping } = useMutation<

diff --git a/apps/widget/src/hooks/Phase3/usePhase3.tsx b/apps/widget/src/hooks/Phase3/usePhase3.tsx
@@ -127,6 +127,7 @@ export function usePhase3({ onNext }: IUsePhase3Props) {
         setColumnDefs(newColumnDefs);
         setFrozenColumns(updatedFrozenColumns);
       },
+      enabled: !!uploadInfo?._id,
     }
   );
   const { refetch: fetchUploadInfo } = useQuery<IUpload, IErrorObject, IUpload, [string]>(
@@ -192,6 +193,7 @@ export function usePhase3({ onNext }: IUsePhase3Props) {
   >([`review`, uploadInfo._id], () => api.doReivewData(uploadInfo._id), {
     cacheTime: 0,
     staleTime: 0,
+    enabled: !!uploadInfo._id,
     onSuccess() {
       fetchUploadInfo();
       refetchReviewData([page, type]);

diff --git a/apps/widget/src/hooks/useEventSource.ts b/apps/widget/src/hooks/useEventSource.ts