fix: Imported data count issue and sending imported data on frontend

implerhq · Jul 16, 2024 · 5117e53 · 5117e53
1 parent 65334a5
commit 5117e53
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 23 deletions.
diff --git a/apps/widget/src/components/widget/Phases/Phase3/Phase3.tsx b/apps/widget/src/components/widget/Phases/Phase3/Phase3.tsx
@@ -19,7 +19,7 @@ import { SegmentedControl } from '@ui/SegmentedControl';
 import { ConfirmModal } from 'components/widget/modals/ConfirmModal';
 
 interface IPhase3Props {
-  onNextClick: (uploadData: IUpload) => void;
+  onNextClick: (uploadData: IUpload, importedData?: Record<string, any>[]) => void;
   onPrevClick: () => void;
 }
 

diff --git a/apps/widget/src/components/widget/Widget.tsx b/apps/widget/src/components/widget/Widget.tsx
@@ -52,10 +52,11 @@ export function Widget() {
     resetAppState();
     setPhase(PhasesEnum.VALIDATE);
   };
-  const onComplete = (uploadData: IUpload) => {
+  const onComplete = (uploadData: IUpload, importedData?: Record<string, any>[]) => {
     setDataCount(uploadData.totalRecords);
     setPhase(PhasesEnum.COMPLETE);
     ParentWindow.UploadCompleted(uploadData);
+    if (importedData) ParentWindow.DataImported(importedData);
   };
 
   const PhaseView = {

diff --git a/apps/widget/src/hooks/Phase3/usePhase3.tsx b/apps/widget/src/hooks/Phase3/usePhase3.tsx
@@ -21,7 +21,7 @@ import { SelectEditor } from './SelectEditor';
 import { MultiSelectEditor } from './MultiSelectEditor';
 
 interface IUsePhase3Props {
-  onNext: (uploadData: IUpload) => void;
+  onNext: (uploadData: IUpload, importedData?: Record<string, any>[]) => void;
 }
 
 const defaultPage = 1;
@@ -218,7 +218,7 @@ export function usePhase3({ onNext }: IUsePhase3Props) {
         records: uploadData.uploadInfo.totalRecords - uploadData.uploadInfo.invalidRecords,
       });
       setUploadInfo(uploadData.uploadInfo);
-      onNext(uploadData.uploadInfo);
+      onNext(uploadData.uploadInfo, uploadData.importedData);
     },
     onError(error: IErrorObject) {
       notifier.showError({ message: error.message, title: error.error });

diff --git a/apps/widget/src/util/parent-window.ts b/apps/widget/src/util/parent-window.ts
@@ -21,3 +21,6 @@ export function UploadTerminated(value: { uploadId: string }) {
 export function UploadCompleted(value: IUpload) {
   window.parent.postMessage({ type: EventTypesEnum.UPLOAD_COMPLETED, value }, '*');
 }
+export function DataImported(value: Record<string, any>[]) {
+  window.parent.postMessage({ type: EventTypesEnum.DATA_IMPORTED, value }, '*');
+}
diff --git a/libs/shared/src/types/widget/widget.types.ts b/libs/shared/src/types/widget/widget.types.ts
@@ -27,4 +27,5 @@ export enum EventTypesEnum {
   UPLOAD_STARTED = 'UPLOAD_STARTED',
   UPLOAD_TERMINATED = 'UPLOAD_TERMINATED',
   UPLOAD_COMPLETED = 'UPLOAD_COMPLETED',
+  DATA_IMPORTED = 'DATA_IMPORTED',
 }
diff --git a/packages/react/src/hooks/useImpler.ts b/packages/react/src/hooks/useImpler.ts
@@ -31,8 +31,10 @@ export function useImpler({
           if (onUploadTerminate) onUploadTerminate(eventData.value);
           break;
         case EventTypesEnum.UPLOAD_COMPLETED:
-          if (onDataImported) onDataImported(eventData.value.importedData);
-          if (onUploadComplete) onUploadComplete(eventData.value.uploadInfo);
+          if (onUploadComplete) onUploadComplete(eventData.value);
+          break;
+        case EventTypesEnum.DATA_IMPORTED:
+          if (onDataImported) onDataImported(eventData.value);
           break;
         case EventTypesEnum.CLOSE_WIDGET:
           if (onWidgetClose) onWidgetClose();

diff --git a/packages/react/src/types/index.ts b/packages/react/src/types/index.ts
@@ -1,4 +1,4 @@
-import { IUpload } from '@impler/shared';
+import { IUpload, EventTypesEnum } from '@impler/shared';
 
 export interface ButtonProps {
   projectId: string;
@@ -36,18 +36,6 @@ export type UploadTemplateData = {
 };
 export type UploadData = { uploadId: string };
 
-export enum EventTypesEnum {
-  INIT_IFRAME = 'INIT_IFRAME',
-  SHOW_WIDGET = 'SHOW_WIDGET',
-  WIDGET_READY = 'WIDGET_READY',
-  CLOSE_WIDGET = 'CLOSE_WIDGET',
-  AUTHENTICATION_VALID = 'AUTHENTICATION_VALID',
-  AUTHENTICATION_ERROR = 'AUTHENTICATION_ERROR',
-  UPLOAD_STARTED = 'UPLOAD_STARTED',
-  UPLOAD_TERMINATED = 'UPLOAD_TERMINATED',
-  UPLOAD_COMPLETED = 'UPLOAD_COMPLETED',
-}
-
 export type EventCalls =
   | {
       type: EventTypesEnum.UPLOAD_STARTED;
@@ -59,10 +47,11 @@ export type EventCalls =
     }
   | {
       type: EventTypesEnum.UPLOAD_COMPLETED;
-      value: {
-        uploadInfo: IUpload;
-        importedData: Record<string, any>[];
-      };
+      value: IUpload;
+    }
+  | {
+      type: EventTypesEnum.DATA_IMPORTED;
+      value: Record<string, any>[];
     }
   | {
       type: EventTypesEnum.CLOSE_WIDGET;