Merge pull request #305 from suvarnakale/shiksha-2.0

Issue #0000 chore: data mapping changed according to api response for search api
tekdi · Jun 20, 2024 · b4eb329 · b4eb329
2 parents 894c322 + 96f2901
commit b4eb329
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/src/pages/attendance-history.tsx b/src/pages/attendance-history.tsx
@@ -129,14 +129,14 @@ const UserAttendanceHistory = () => {
           const extractedNames = resp?.results?.cohortDetails;
           const filteredData = extractedNames
             ?.map((item: any) => {
-              const stateNameField = item?.cohortData?.customFields.find(
+              const stateNameField = item?.customFields.find(
                 (field: any) => field.label === 'State Name'
               );
               const stateName = stateNameField ? stateNameField.value : '';
 
               return {
-                cohortId: item?.cohortData?.cohortId,
-                name: item?.cohortData?.name,
+                cohortId: item?.cohortId,
+                name: item?.name,
                 state: stateName,
               };
             })

diff --git a/src/pages/attendance-overview.tsx b/src/pages/attendance-overview.tsx
@@ -200,14 +200,14 @@ const AttendanceOverview: React.FC<AttendanceOverviewProps> = () => {
           const cohortDetails = response?.cohortDetails || [];
 
           const filteredData = cohortDetails?.map((item: any) => {
-            const stateNameField = item?.cohortData?.customFields.find(
+            const stateNameField = item?.customFields.find(
               (field: any) => field.label === 'State Name'
             );
             const stateName = stateNameField ? stateNameField.value : '';
 
             return {
-              cohortId: item?.cohortData?.cohortId,
-              name: toPascalCase(item?.cohortData?.name),
+              cohortId: item?.cohortId,
+              name: toPascalCase(item?.name),
               state: stateName,
             };
           });
@@ -218,11 +218,8 @@ const AttendanceOverview: React.FC<AttendanceOverviewProps> = () => {
             // setClassId(filteredData[0].cohortId);
 
             // add state name to localstorage
-            if (
-              cohortDetails?.length > 0 &&
-              cohortDetails?.[0].cohortData.customFields
-            ) {
-              const customFields = cohortDetails?.[0].cohortData.customFields;
+            if (cohortDetails?.length > 0 && cohortDetails?.[0].customFields) {
+              const customFields = cohortDetails?.[0].customFields;
               const stateNameField = customFields?.find(
                 (field: any) => field.label === 'State Name'
               );

diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx
@@ -149,16 +149,13 @@ const Dashboard: React.FC<DashboardProps> = () => {
           const resp = await cohortList({ limit, page, filters });
 
           const extractedNames = resp?.results?.cohortDetails;
-          localStorage.setItem(
-            'parentCohortId',
-            extractedNames?.[0].cohortData.parentId
-          );
+          localStorage.setItem('parentCohortId', extractedNames?.[0].parentId);
 
           const filteredData = extractedNames
             ?.map((item: any) => ({
-              cohortId: item?.cohortData?.cohortId,
-              parentId: item?.cohortData?.parentId,
-              name: item?.cohortData?.name,
+              cohortId: item?.cohortId,
+              parentId: item?.parentId,
+              name: item?.name,
             }))
             ?.filter(Boolean);
           setCohortsData(filteredData);