fix: addressing pr comments

Author: jacobo-dominguez-wgu

src/containers/CourseCard/components/CourseCardMenu/hooks.js

@@ -39,7 +39,7 @@ export const useHandleToggleDropdown = (cardId) => {
 
 export const useCardSocialSettingsData = (cardId) => {
   const { data: learnerHomeData } = useInitializeLearnerHome();
-  const { data: courseData } = useCourseData(cardId);
+  const courseData = useCourseData(cardId);
   const socialShareSettings = learnerHomeData?.socialShareSettings;
   const { socialShareUrl } = courseData?.course || {};
   const defaultSettings = { isEnabled: false, shareUrl: '' };

src/containers/CoursesPanel/index.jsx

@@ -54,7 +54,7 @@ export const CoursesPanel = () => {
       <div className="course-list-heading-container">
         <h2 className="course-list-title">{formatMessage(messages.myCourses)}</h2>
         <div className="course-filter-controls-container">
-          <CourseFilterControls {...courseListData.filterOptions} />
+          <CourseFilterControls />
         </div>
       </div>
       {hasCourses ? <CourseListSlot courseListData={courseListData} /> : <NoCoursesViewSlot />}

src/containers/EmailSettingsModal/hooks.js

@@ -16,11 +16,12 @@ export const useEmailData = ({
 }) => {
   const courseData = useCourseData(cardId);
   const hasOptedOutOfEmail = courseData?.enrollment?.hasOptedOutOfEmail || false;
+  const courseId = courseData?.courseRun?.courseId;
   const [isOptedOut, setIsOptedOut] = module.state.toggle(hasOptedOutOfEmail);
   const { mutate: updateEmailSettings } = useUpdateEmailSettings();
   const onToggle = () => setIsOptedOut(!isOptedOut);
   const save = () => {
-    updateEmailSettings({ courseId: cardId, enable: !isOptedOut });
+    updateEmailSettings({ courseId, enable: !isOptedOut });
     closeModal();
   };
 

src/containers/EmailSettingsModal/hooks.test.jsx

@@ -95,7 +95,8 @@ describe('EmailSettingsModal hooks', () => {
     });
 
     it('calls updateEmailSettings api and closeModal when save is called', async () => {
-      useCourseData.mockReturnValue({ enrollment: { hasOptedOutOfEmail: true } });
+      const courseId = 'test-course-id';
+      useCourseData.mockReturnValue({ enrollment: { hasOptedOutOfEmail: true }, courseRun: { courseId } });
       api.updateEmailSettings.mockResolvedValue({});
 
       const { result } = renderHook(() => useEmailData({ closeModal, cardId }), {
@@ -106,13 +107,14 @@ describe('EmailSettingsModal hooks', () => {
         result.current.save();
       });
 
-      const expectedArg = { courseId: cardId, enable: !result.current.isOptedOut };
+      const expectedArg = { courseId, enable: !result.current.isOptedOut };
       expect(api.updateEmailSettings).toHaveBeenCalledWith(expectedArg);
       expect(closeModal).toHaveBeenCalled();
     });
 
     it('calls updateEmailSettings with enable:true when isOptedOut is false', async () => {
-      useCourseData.mockReturnValue({ enrollment: { hasOptedOutOfEmail: false } });
+      const courseId = 'test-course-id';
+      useCourseData.mockReturnValue({ enrollment: { hasOptedOutOfEmail: false }, courseRun: { courseId } });
       api.updateEmailSettings.mockResolvedValue({});
 
       const { result } = renderHook(() => useEmailData({ closeModal, cardId }), {
@@ -124,7 +126,7 @@ describe('EmailSettingsModal hooks', () => {
       });
 
       expect(api.updateEmailSettings).toHaveBeenCalledWith({
-        courseId: cardId,
+        courseId,
         enable: true,
       });
     });

src/data/hooks/queryHooks.ts

@@ -25,7 +25,10 @@ const useInitializeLearnerHome = () => {
   }, [masqueradeUser, query.data, setBackUpData]);
 
   // When masquerading fails, show the original user's dashboard rather than an error
-  const data = masqueradeUser && !query.isError ? query.data : backUpData;
+  let { data } = query;
+  if (masqueradeUser && query.isError) {
+    data = backUpData;
+  }
 
   return { ...query, data };
 };