Adm-879-fix [frontend]: fix the notification close logic (#1426)

* ADM-879-fix fix: use the dispatch to update redux * ADM-879-fix fix: fix test
au-heartbeat · Apr 30, 2024 · 79fe2d6 · 79fe2d6
1 parent d3e5697
commit 79fe2d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/frontend/__tests__/containers/ReportStep/ReportStep.test.tsx b/frontend/__tests__/containers/ReportStep/ReportStep.test.tsx
@@ -39,7 +39,7 @@ import { ReactNode } from 'react';
 jest.mock('@src/context/notification/NotificationSlice', () => ({
   ...jest.requireActual('@src/context/notification/NotificationSlice'),
   addNotification: jest.fn().mockReturnValue({ type: 'ADD_NOTIFICATION' }),
-  closeNotification: jest.fn(),
+  closeNotification: jest.fn().mockReturnValue({ type: 'CLOSE_NOTIFICATION' }),
 }));
 
 jest.mock('@src/context/stepper/StepperSlice', () => ({

diff --git a/frontend/src/containers/ReportStep/index.tsx b/frontend/src/containers/ReportStep/index.tsx
@@ -228,14 +228,18 @@ const ReportStep = ({ handleSave }: ReportStepProps) => {
     jiraBoardSetting: undefined,
   };
 
+  useEffect(() => {
+    setCurrentDataInfo(reportInfos.find((singleResult) => singleResult.id === selectedDateRange.startDate)!);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [reportInfos, selectedDateRange]);
+
   useEffect(() => {
     notificationIds.forEach((notificationId) => {
-      closeNotification(notificationId);
+      dispatch(closeNotification(notificationId));
     });
     setNotificationIds([]);
-    setCurrentDataInfo(reportInfos.find((singleResult) => singleResult.id === selectedDateRange.startDate)!);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [reportInfos, selectedDateRange]);
+  }, [selectedDateRange]);
 
   useEffect(() => {
     setPageType(onlySelectClassification ? REPORT_PAGE_TYPE.BOARD : REPORT_PAGE_TYPE.SUMMARY);