Merge pull request #268 from AkshataKatwal16/reassign-cohorts

Issue feat: PS-1502 updated user cohorts values from zustand and loca…
tekdi · Sep 18, 2024 · 9aac37c · 9aac37c
2 parents 158b45a + 9304241
commit 9aac37c
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 12 deletions.
diff --git a/src/components/CohortSelectionSection.tsx b/src/components/CohortSelectionSection.tsx
@@ -31,6 +31,7 @@ import { ArrowDropDownIcon } from '@mui/x-date-pickers/icons';
 import { telemetryFactory } from '@/utils/telemetry';
 import { toPascalCase } from '@/utils/Helper';
 import { useQueryClient } from '@tanstack/react-query';
+import { getUserDetails } from '@/services/ProfileService';
 
 interface CohortSelectionSectionProps {
   classId: string;
@@ -93,6 +94,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
   showFloatingLabel = false,
   showDisabledDropDown = false,
 }) => {
+  console.log("cohortsData",classId, cohortsData[0]?.cohortId)
   const router = useRouter();
   const theme = useTheme<any>();
   const queryClient = useQueryClient();
@@ -147,8 +149,14 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
             queryFn: () => getCohortList(userId, { customField: 'true' }),
           });
 
-          console.log('Response:', response);
           const cohortData = response[0];
+          let userDetailsResponse;
+          if(userId)
+          {
+            userDetailsResponse = await getUserDetails(userId, true);
+          }
+    const blockObject = userDetailsResponse?.result?.userData?.customFields.find((item:any) => item?.label === 'BLOCKS');
+
           if (cohortData?.customField?.length) {
             const district = cohortData?.customField?.find(
               (item: CustomField) => item?.label === 'DISTRICTS'
@@ -172,12 +180,12 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
               (field: any) => field?.label === 'BLOCKS'
             );
 
-            if (blockField) {
-              setBlockCode(blockField?.code);
-              setBlockId(blockField?.fieldId);
+            if (blockObject) {
+              setBlockCode(blockObject?.code);
+              setBlockId(blockObject?.fieldId);
             }
           }
-
+       
           if (response && response?.length > 0) {
             const extractNamesAndCohortTypes = (
               data: ChildData[]
@@ -446,7 +454,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
                           <Select
                             labelId="center-select-label"
                             label={showFloatingLabel ? t('COMMON.CENTER') : ''}
-                            value={classId}
+                            value={classId? classId: cohortsData[0]?.cohortId}
                             onChange={handleCohortSelection}
                             // displayEmpty
                             // style={{ borderRadius: '4px' }}

diff --git a/src/components/ManageUser.tsx b/src/components/ManageUser.tsx
@@ -150,7 +150,7 @@ const ManageUser: React.FC<ManageUsersProps> = ({
             queryKey: [QueryKeys.GET_ACTIVE_FACILITATOR, filters],
             queryFn: () => getMyUserList({ limit, page, filters, fields }),
           });
-
+console.log("facilitator")
           const facilitatorList = resp.result?.getUserDetails;
 
           if (!facilitatorList || facilitatorList?.length === 0) {

diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx
@@ -65,7 +65,11 @@ import CalendarMonthIcon from '@mui/icons-material/CalendarMonth';
 import { useQueryClient } from '@tanstack/react-query';
 import { getCohortList } from '@/services/CohortServices';
 import CentralizedModal from '@/components/CentralizedModal';
-
+import manageUserStore from '@/store/manageUserStore';
+import { getUserDetails } from '@/services/ProfileService';
+import {
+  updateStoreFromCohorts
+} from '@/utils/Helper';
 interface DashboardProps {}
 
 const Dashboard: React.FC<DashboardProps> = () => {
@@ -114,6 +118,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
   const [myCohortList, setMyCohortList] = React.useState<any>();
   const [centralizedModal, setCentralizedModal] = useState(false);
 
+
   const toggleDrawer = (newOpen: boolean) => () => {
     setOpenDrawer(newOpen);
   };
@@ -147,8 +152,19 @@ const Dashboard: React.FC<DashboardProps> = () => {
 
     calculateDateRange();
   }, []);
-
+ 
   useEffect(() => {
+    if(cohortsData[0]?.cohortId)
+      {
+
+      localStorage.setItem('classId', cohortsData[0]?.cohortId) 
+
+    }
+    else
+    {
+      localStorage.setItem('classId', "") 
+
+    }
     if (typeof window !== 'undefined' && window.localStorage) {
       const token = localStorage.getItem('token');
       const role = localStorage.getItem('role');
@@ -162,16 +178,29 @@ const Dashboard: React.FC<DashboardProps> = () => {
       }
       setUserId(storedUserId);
     }
-  }, []);
+  }, [cohortsData]);
 
   useEffect(() => {
+
     const getMyCohortList = async () => {
       const myCohortList = await queryClient.fetchQuery({
         queryKey: [QueryKeys.MY_COHORTS, userId],
         queryFn: () => getCohortList(userId as string, { customField: 'true' }),
       });
+      let response;
+      if(userId)
+      {
+       response = await getUserDetails(userId, true);
+      }
+const blockObject = response?.result?.userData?.customFields.find((item:any) => item?.label === 'BLOCKS');
+
+
+let isCustomFields=true;
+      const result=await getCohortList(userId as string, { customField: 'true' }, isCustomFields)
+      const activeCohorts = result?.filter((cohort: any) => cohort.cohortMemberStatus === "active");
+      updateStoreFromCohorts(activeCohorts, blockObject );
 
-      setMyCohortList(myCohortList);
+           setMyCohortList(myCohortList);
     };
     if (userId) {
       getMyCohortList();

diff --git a/src/services/CohortServices.ts b/src/services/CohortServices.ts
@@ -31,7 +31,8 @@ export const getCohortDetails = async (cohortId: string): Promise<any> => {
 
 export const getCohortList = async (
   userId: string,
-  filters: { [key: string]: string } = {}
+  filters: { [key: string]: string } = {},
+  isCustomFields: boolean = false
 ): Promise<any> => {
   let apiUrl: string = `${process.env.NEXT_PUBLIC_BASE_URL}/cohort/mycohorts/${userId}?children=true`;
   const filterParams = new URLSearchParams(filters).toString();
@@ -40,6 +41,11 @@ export const getCohortList = async (
   }
   try {
     const response = await get(apiUrl);
+    if(isCustomFields)
+    {
+      return response?.data?.result;
+
+    }
     if (response?.data?.result?.length) {
       let res = response?.data?.result;
       res = res.filter((block: any) => {
@@ -53,6 +59,7 @@ export const getCohortList = async (
       return res;
     }
     return response?.data?.result;
+
   } catch (error) {
     console.error('Error in getting cohort details', error);
     // throw error;

diff --git a/src/utils/Helper.ts b/src/utils/Helper.ts
@@ -5,6 +5,7 @@ import FingerprintJS from 'fingerprintjs2';
 import { CustomField, UpdateCustomField } from './Interfaces';
 dayjs.extend(utc);
 import { format, parseISO } from 'date-fns';
+import manageUserStore from '@/store/manageUserStore';
 
 export const ATTENDANCE_ENUM = {
   PRESENT: 'present',
@@ -554,3 +555,45 @@ export const filterAndMapAssociationsNew = (
       associations: option.associations || [],
     }));
 };
+
+
+export const updateStoreFromCohorts = (activeCohorts: any, blockObject: any) => {
+  const setDistrictCode = manageUserStore.getState().setDistrictCode;
+  const setDistrictId = manageUserStore.getState().setDistrictId;
+  const setStateCode = manageUserStore.getState().setStateCode;
+  const setStateId = manageUserStore.getState().setStateId;
+  const setBlockCode = manageUserStore.getState().setBlockCode;
+  const setBlockId = manageUserStore.getState().setBlockId;
+  const setBlockName = manageUserStore.getState().setBlockName;
+  const setDistrictName = manageUserStore.getState().setDistrictName;
+  const setStateName = manageUserStore.getState().setStateName;
+
+
+  const district = activeCohorts[0]?.customField?.find(
+    (item: any) => item?.label === 'DISTRICTS'
+  );
+  if (district) {
+    setDistrictCode(district?.code);
+    setDistrictId(district?.fieldId);
+    setDistrictName(district?.value)
+  }
+
+  const state = activeCohorts[0]?.customField?.find(
+    (item: any) => item?.label === 'STATES'
+  );
+
+  if (state) {
+    setStateCode(state?.code);
+    setStateId(state?.fieldId);
+    setStateName(state?.value);
+
+  }
+
+
+  if (blockObject) {
+    setBlockCode(blockObject?.code);
+    setBlockId(blockObject?.fieldId);
+    setBlockName(blockObject?.value);
+
+  }
+};