From dcfd8a571dad87b164154d85d5732f12c36d5579 Mon Sep 17 00:00:00 2001
From: Fahim Faisal <fahim.faisal.abir@gmail.com>
Date: Wed, 2 Oct 2024 18:01:27 +0600
Subject: [PATCH 1/2] refactor: Refactor instructor list query in
 CourseBasic.tsx and FormWPEditor.tsx

---
 .../react/v3/entries/course-builder/pages/CourseBasic.tsx   | 2 +-
 assets/react/v3/shared/components/fields/FormWPEditor.tsx   | 6 +++---
 assets/react/v3/shared/services/users.ts                    | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/assets/react/v3/entries/course-builder/pages/CourseBasic.tsx b/assets/react/v3/entries/course-builder/pages/CourseBasic.tsx
index 9a4bc8e245..b555e5e555 100644
--- a/assets/react/v3/entries/course-builder/pages/CourseBasic.tsx
+++ b/assets/react/v3/entries/course-builder/pages/CourseBasic.tsx
@@ -161,7 +161,7 @@ const CourseBasic = () => {
 
   const userList = useUserListQuery(userSearchText);
 
-  const instructorListQuery = useInstructorListQuery(String(courseId) ?? '');
+  const instructorListQuery = useInstructorListQuery(String(courseId) ?? '', isMultiInstructorEnabled);
 
   const convertedCourseInstructors = (courseDetails?.course_instructors || []).map((instructor) => ({
     id: instructor.id,
diff --git a/assets/react/v3/shared/components/fields/FormWPEditor.tsx b/assets/react/v3/shared/components/fields/FormWPEditor.tsx
index 61c2f80d73..a0e600163c 100644
--- a/assets/react/v3/shared/components/fields/FormWPEditor.tsx
+++ b/assets/react/v3/shared/components/fields/FormWPEditor.tsx
@@ -216,7 +216,7 @@ const FormWPEditor = ({
             <Show
               when={editorUsed.name === 'classic' && !loading}
               fallback={
-                <div css={styles.editorOverlay}>
+                <div css={styles.editorOverlay(!loading)}>
                   {loading ? (
                     <LoadingOverlay />
                   ) : (
@@ -294,10 +294,10 @@ const styles = {
     display: flex;
     align-items: center;
   `,
-  editorOverlay: css`
+  editorOverlay: (isLoading: boolean) => css`
     height: 360px;
     ${styleUtils.flexCenter()};
-    background-color: ${rgba(colorTokens.background.modal, 0.6)};
+    background-color: ${isLoading ? rgba(colorTokens.background.modal, 0.6) : 'transparent'};
     border-radius: ${borderRadius.card};
   `,
   editWithButton: css`
diff --git a/assets/react/v3/shared/services/users.ts b/assets/react/v3/shared/services/users.ts
index 50bd4295b9..8b11badcde 100644
--- a/assets/react/v3/shared/services/users.ts
+++ b/assets/react/v3/shared/services/users.ts
@@ -61,7 +61,7 @@ const getInstructorList = (courseId: string) => {
     .then((response) => response.data);
 };
 
-export const useInstructorListQuery = (courseId: string) => {
+export const useInstructorListQuery = (courseId: string, isAddonEnabled: boolean) => {
   return useQuery({
     queryKey: ['InstructorList', courseId],
     queryFn: () =>
@@ -73,5 +73,6 @@ export const useInstructorListQuery = (courseId: string) => {
           avatar_url: item.avatar_url,
         }));
       }),
+    enabled: isAddonEnabled,
   });
 };

From c840a4c9b1b327b49bec61ec4a884d8dad827e53 Mon Sep 17 00:00:00 2001
From: Fahim Faisal <fahim.faisal.abir@gmail.com>
Date: Wed, 2 Oct 2024 18:04:12 +0600
Subject: [PATCH 2/2] Refactor instructor list query in users.ts

---
 assets/react/v3/shared/services/users.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/react/v3/shared/services/users.ts b/assets/react/v3/shared/services/users.ts
index 8b11badcde..e2a77e9b62 100644
--- a/assets/react/v3/shared/services/users.ts
+++ b/assets/react/v3/shared/services/users.ts
@@ -61,7 +61,7 @@ const getInstructorList = (courseId: string) => {
     .then((response) => response.data);
 };
 
-export const useInstructorListQuery = (courseId: string, isAddonEnabled: boolean) => {
+export const useInstructorListQuery = (courseId: string, isEnabled: boolean) => {
   return useQuery({
     queryKey: ['InstructorList', courseId],
     queryFn: () =>
@@ -73,6 +73,6 @@ export const useInstructorListQuery = (courseId: string, isAddonEnabled: boolean
           avatar_url: item.avatar_url,
         }));
       }),
-    enabled: isAddonEnabled,
+    enabled: isEnabled,
   });
 };