Merge pull request #446 from suvarnakale/release-1.0.0

Issue #PS-2546 bug: Not able to see preview / template image at requisites of topic and subtopic- fix
tekdi · Nov 27, 2024 · 1cb3bf9 · 1cb3bf9
2 parents 6ef1da0 + 81b7933
commit 1cb3bf9
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 810 deletions.
diff --git a/src/components/RequisitesAccordion.tsx b/src/components/RequisitesAccordion.tsx
@@ -72,7 +72,11 @@ const RequisitesAccordion: React.FC<RequisitesAccordionProps> = ({
                 <Grid item xs={6} sx={{ mt: 2 }} key={item.name}>
                   <Box
                     className="facilitator-bg"
-                    onClick={() => handlePlayers(item?.identifier)}
+                    sx={{
+                      backgroundImage: `url(${item?.appIcon ? item.appIcon : '/decorationBg.png'})`,
+                      position: 'relative',
+                    }}
+                    onClick={() => handlePlayers(item?.id)}
                   >
                     <Box
                       sx={{

diff --git a/src/components/SessionCardFooter.tsx b/src/components/SessionCardFooter.tsx
@@ -26,6 +26,8 @@ import { convertUTCToIST, getDayMonthYearFormat } from '@/utils/Helper';
 import { EventStatus } from '@/utils/app.constant';
 import { useDirection } from '../hooks/useDirection';
 import { useRouter } from 'next/router';
+import { fetchBulkContents } from '@/services/PlayerService';
+import { IResource } from '@/pages/course-planner/center/[cohortId]';
 
 const SessionCardFooter: React.FC<SessionCardFooterProps> = ({
   item,
@@ -108,7 +110,7 @@ const SessionCardFooter: React.FC<SessionCardFooterProps> = ({
                       name: resource?.name,
                       link: resource?.link,
                       type: resource?.type || '',
-                      identifier: resource?.identifier || '',
+                      id: resource?.id || '',
                     })
                   );
                   return subAcc;
@@ -118,7 +120,9 @@ const SessionCardFooter: React.FC<SessionCardFooterProps> = ({
               return acc;
             }, {});
             console.log(learningResources);
-            setLearningResources(learningResources);
+            const resources: IResource[] = extractResources(learningResources);
+            const enrichedContent = await fetchLearningResources(resources);
+            setLearningResources(enrichedContent);
           }
         }
       } catch (error) {
@@ -129,6 +133,40 @@ const SessionCardFooter: React.FC<SessionCardFooterProps> = ({
     fetchTopicSubtopic();
   }, [item]);
 
+  const extractResources = (learningResources: any): IResource[] => {
+    const resources: IResource[] = [];
+
+    Object.values(learningResources).forEach((childTasks: any) => {
+      Object.values(childTasks).forEach((resourceArray: any) => {
+        if (Array.isArray(resourceArray)) {
+          resources.push(...resourceArray);
+        }
+      });
+    });
+
+    return resources;
+  };
+
+  const fetchLearningResources = async (resources: IResource[]) => {
+    try {
+      const identifiers = resources?.map((resource: IResource) => resource?.id);
+      const response = await fetchBulkContents(identifiers);
+
+      resources = resources.map((resource: IResource) => {
+        const content = response?.find(
+          (content: any) => content?.identifier === resource?.id
+        );
+        return { ...resource, ...content, name: resource.name };
+      });
+
+      // setResources(resources);
+      console.log('response===>', resources);
+      return resources;
+    } catch (error) {
+      console.error('error', error);
+    }
+  };
+
   const handleComponentOpen = () => {
     setSelectedTopic('');
     setSelectedSubtopics([]);

diff --git a/src/components/TopicDetails.tsx b/src/components/TopicDetails.tsx
@@ -38,18 +38,18 @@ const TopicDetails: React.FC<TopicDetailsProps> = ({
   const { t } = useTranslation();
   const theme = useTheme<any>();
 
-  const content: any = [];
-  if (learningResources?.[topic]) {
-    const subTopics = learningResources[topic];
-    subTopic?.forEach((currentSubTopic: string) => {
-      if (subTopics[currentSubTopic]) {
-        const resources = subTopics[currentSubTopic];
-        resources?.forEach((resource: any) => {
-          content.push(resource);
-        });
-      }
-    });
-  }
+  // const content: any = [];
+  // if (learningResources?.[topic]) {
+  //   const subTopics = learningResources[topic];
+  //   subTopic?.forEach((currentSubTopic: string) => {
+  //     if (subTopics[currentSubTopic]) {
+  //       const resources = subTopics[currentSubTopic];
+  //       resources?.forEach((resource: any) => {
+  //         content.push(resource);
+  //       });
+  //     }
+  //   });
+  // }
 
   const openTopicModal = () => {
     handleOpen();
@@ -154,29 +154,27 @@ const TopicDetails: React.FC<TopicDetailsProps> = ({
           />
         </Box>
       </Box>
-
       <Box sx={{ mb: 1.5 }}>
-
         <RequisitesAccordion
           title={t('CENTER_SESSION.FACILITATOR_REQUISITES')}
           type={RequisiteType.FACILITATOR_REQUISITE}
-          content={content}
+          content={learningResources}
           handlePlayers={handlePlayers}
           theme={theme}
           subTopic={subTopic}
         />
         <RequisitesAccordion
           title={t('CENTER_SESSION.PREREQUISITES')}
           type={RequisiteType.PRE_REQUISITES}
-          content={content}
+          content={learningResources}
           handlePlayers={handlePlayers}
           theme={theme}
           subTopic={subTopic}
         />
         <RequisitesAccordion
           title={t('CENTER_SESSION.POST_REQUISITES')}
           type={RequisiteType.POST_REQUISITES}
-          content={content}
+          content={learningResources}
           handlePlayers={handlePlayers}
           theme={theme}
           subTopic={subTopic}