Merge pull request #2846 from AkshataKatwal16/feat-attendance-revamp

Issue feat: Fix loader issue on scp dashboard

Author: rushi-tekdi

mfes/scp-teacher-repo/src/components/CohortSelectionSection.tsx

@@ -415,6 +415,9 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
           if (!response?.length) {
             setLoading(false);
           }
+          // Guaranteed fallback: always reset loading after fetchCohorts
+          // regardless of response type, to prevent infinite loader.
+          setLoading(false);
         } catch (error) {
           console.error('Error fetching cohort list', error);
           setLoading(false);

mfes/scp-teacher-repo/src/pages/dashboard.tsx

@@ -260,9 +260,6 @@ const Dashboard: React.FC<DashboardProps> = () => {
       setRole(role);
       const storedUserId = localStorage.getItem('userId');
       setClassId(localStorage.getItem('classId') ?? '');
-      // #region agent log
-      fetch('http://127.0.0.1:7242/ingest/d2b738fb-79d4-4559-93b3-73b712825063',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'dashboard.tsx:auth-check',message:'H-A: dashboard token check fired',data:{hasToken:!!token,hasRole:!!role,hasUserId:!!storedUserId,userProgram:localStorage.getItem('userProgram'),tenantName:localStorage.getItem('tenantName'),willRedirectToLogin:!token},timestamp:Date.now(),hypothesisId:'H-A'})}).catch(()=>{});
-      // #endregion
       if (token) {
         setIsAuthenticated(true);
         setUserId(storedUserId);

mfes/scp-teacher-repo/src/services/CohortServices.ts

@@ -71,13 +71,18 @@ export const getCohortList = async (
       );
       let res = filtered;
 
+      // When role is not set in localStorage, default to Teacher behaviour so
+      // that the flresponsetotl path reconstructs the proper center hierarchy
+      // from BATCH-level parentIds instead of returning raw BATCH items.
+      const effectiveRole = localStorage.getItem('role') ?? localStorage.getItem('roleName')
+
       res = res.filter((block: any) => {
         if (
           block?.cohortStatus === Status.ACTIVE &&
           //if no center then also show in list only for facilitator
-          ((localStorage.getItem('role') === Role.TEACHER &&
+          ((effectiveRole === Role.TEACHER &&
             block?.childData.length > 0) ||
-            localStorage.getItem('role') !== Role.TEACHER)
+            effectiveRole !== Role.TEACHER)
           //
         ) {
           return block;
@@ -95,7 +100,8 @@ export const getCohortList = async (
         });
         //patch for alter response for facilitator
         try {
-          if (localStorage.getItem('role') === Role.TEACHER) {
+          // Also call flresponsetotl when role is null (defaults to Teacher)
+          if (effectiveRole === Role.TEACHER) {
             res = await flresponsetotl(res);
             // console.log('########## response', res);
           }