fix: [AXIMST-516] fixed paste alerts view (#189)

refactor: code refactoring refactor: code refactoring
raccoongang · Mar 1, 2024 · 6c8f4ca · 6c8f4ca
1 parent 2d2073a
commit 6c8f4ca
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/course-unit/CourseUnit.jsx b/src/course-unit/CourseUnit.jsx
@@ -140,10 +140,12 @@ const CourseUnit = ({ courseId }) => {
                   icon={WarningIcon}
                 />
               )}
-              <PasteNotificationAlert
-                staticFileNotices={staticFileNotices}
-                courseId={courseId}
-              />
+              {staticFileNotices && (
+                <PasteNotificationAlert
+                  staticFileNotices={staticFileNotices}
+                  courseId={courseId}
+                />
+              )}
               <Stack gap={4} className="mb-4 course-unit__xblocks">
                 <DraggableList
                   itemList={unitXBlocks}

diff --git a/src/course-unit/CourseUnit.test.jsx b/src/course-unit/CourseUnit.test.jsx
@@ -97,7 +97,7 @@ describe('<CourseUnit />', () => {
         roles: [],
       },
     });
-
+    global.localStorage.clear();
     store = initializeStore();
     axiosMock = new MockAdapter(getAuthenticatedHttpClient());
     axiosMock
@@ -1159,6 +1159,7 @@ describe('<CourseUnit />', () => {
           ...updatedCourseSectionVerticalData,
         });
 
+      global.localStorage.setItem('staticFileNotices', JSON.stringify(clipboardMockResponse.staticFileNotices));
       await executeThunk(fetchCourseSectionVerticalData(blockId), store.dispatch);
       await executeThunk(createNewCourseXBlock(camelCaseObject(postXBlockBody), null, blockId), store.dispatch);
       const newFilesAlert = getByTestId('has-new-files-alert');
@@ -1222,6 +1223,7 @@ describe('<CourseUnit />', () => {
           ...updatedCourseSectionVerticalData,
         });
 
+      global.localStorage.setItem('staticFileNotices', JSON.stringify(clipboardMockResponse.staticFileNotices));
       await executeThunk(fetchCourseSectionVerticalData(blockId), store.dispatch);
       await executeThunk(createNewCourseXBlock(camelCaseObject(postXBlockBody), null, blockId), store.dispatch);
       const conflictingErrorsAlert = getByTestId('has-conflicting-errors-alert');
@@ -1285,6 +1287,7 @@ describe('<CourseUnit />', () => {
           ...updatedCourseSectionVerticalData,
         });
 
+      global.localStorage.setItem('staticFileNotices', JSON.stringify(clipboardMockResponse.staticFileNotices));
       await executeThunk(fetchCourseSectionVerticalData(blockId), store.dispatch);
       await executeThunk(createNewCourseXBlock(camelCaseObject(postXBlockBody), null, blockId), store.dispatch);
       const errorFilesAlert = getByTestId('has-error-files-alert');

diff --git a/src/course-unit/data/selectors.js b/src/course-unit/data/selectors.js
@@ -10,4 +10,3 @@ export const getCourseId = (state) => state.courseDetail.courseId;
 export const getSequenceId = (state) => state.courseUnit.sequenceId;
 export const getCourseVerticalChildren = (state) => state.courseUnit.courseVerticalChildren;
 export const getClipboardData = state => state.courseUnit.clipboardData;
-export const getCourseUnitEnableCopyPaste = state => state.courseUnit.unit.enableCopyPasteUnits;
diff --git a/src/course-unit/data/thunk.js b/src/course-unit/data/thunk.js
@@ -76,9 +76,10 @@ export function fetchCourseSectionVerticalData(courseId, sequenceId) {
         modelType: 'units',
         models: courseSectionVerticalData.units,
       }));
+      dispatch(fetchStaticFileNoticesSuccess(JSON.parse(localStorage.getItem('staticFileNotices'))));
+      localStorage.removeItem('staticFileNotices');
       dispatch(updateClipboardData(courseSectionVerticalData.userClipboard));
       dispatch(fetchSequenceSuccess({ sequenceId }));
-      dispatch(fetchStaticFileNoticesSuccess([]));
       return true;
     } catch (error) {
       dispatch(updateLoadingCourseSectionVerticalDataStatus({ status: RequestStatus.FAILED }));
@@ -166,7 +167,7 @@ export function createNewCourseXBlock(body, callback, blockId) {
             dispatch(fetchCourseSectionVerticalDataSuccess(courseSectionVerticalData));
           }
           if (body.stagedContent) {
-            dispatch(fetchStaticFileNoticesSuccess(formattedResult.staticFileNotices));
+            localStorage.setItem('staticFileNotices', JSON.stringify(formattedResult.staticFileNotices));
           }
           const courseVerticalChildrenData = await getCourseVerticalChildren(blockId);
           dispatch(updateCourseVerticalChildren(courseVerticalChildrenData));