Merge pull request #2153 from tekdi/release-1.12.0-prod-fix

Release 1.12.0 prod fix to teacher prod

Author: rushi-tekdi

apps/learner-web-app/src/app/sso/page.tsx

@@ -200,30 +200,32 @@ const SSOContent = () => {
         if (res?.result?.userData?.customFields) {
           res.result.userData.customFields.forEach((field: any) => {
             const { label, selectedValues } = field;
-            localStorage.setItem(
-              FilterKey[label as keyof typeof FilterKey],
-              JSON.stringify(selectedValues)
-            );
-            if(label === 'EMP_GROUP') {
-              localStorage.setItem(FilterKey.GROUP_MEMBERSHIP, JSON.stringify(selectedValues));
-            }
-
-            // Map the label to the corresponding FilterKey and store in localStorage
-            // switch (label) {
-            //   case 'GROUP_MEMBERSHIP':
-            //     localStorage.setItem(FilterKey.GROUP_MEMBERSHIP, selectedValues);
-            //     break;
-            //   case 'JOB_FAMILY':
-            //     localStorage.setItem(FilterKey.JOB_FAMILY, selectedValues);
-            //     break;
-            //   case 'PSU':
-            //     localStorage.setItem(FilterKey.PSU, selectedValues);
-            //     break;
-            //   default:
-            //     // For any other custom fields, store them as is
-            //     localStorage.setItem(label, selectedValues);
-            //     break;
+            // localStorage.setItem(
+            //   FilterKey[label as keyof typeof FilterKey],
+            //   JSON.stringify(selectedValues)
+            // );
+            // if(label === 'EMP_GROUP') {
+            //   localStorage.setItem(FilterKey.GROUP_MEMBERSHIP, JSON.stringify(selectedValues));
             // }
+
+           // Map the label to the corresponding FilterKey and store in localStorage
+            switch (label) {
+              case 'GROUP_MEMBERSHIP':
+                localStorage.setItem(FilterKey.GROUP_MEMBERSHIP, JSON.stringify(selectedValues));
+                break;
+              case 'JOB_FAMILY':
+                localStorage.setItem(FilterKey.JOB_FAMILY, JSON.stringify(selectedValues));
+                break;
+              case 'PSU':
+                localStorage.setItem(FilterKey.PSU, JSON.stringify(selectedValues));
+                break;
+              default:
+                // For any other custom fields, store them as is
+                localStorage.setItem(FilterKey.GROUP_MEMBERSHIP, JSON.stringify(["NA"]));
+                localStorage.setItem(FilterKey.JOB_FAMILY, JSON.stringify(["NA"]));
+                localStorage.setItem(FilterKey.PSU, JSON.stringify(["NA"]));
+                break;
+            }
           });
         }
         const uiConfig = userResponse?.tenantData[0]?.params?.uiConfig;

mfes/youthNet/src/pages/employee-details/index.tsx

@@ -232,7 +232,7 @@ const EmployeeDetailsPage = () => {
         let userMandatoryCertificateStatus = { data: [] };
         let userOptionalCertificateStatus = { data: [] };
 
-        if (tenantId && mandatoryIds.length > 0 && optionalIds.length > 0) {
+        if (tenantId &&( mandatoryIds.length > 0 || optionalIds.length > 0)) {
           [userMandatoryCertificateStatus, userOptionalCertificateStatus] = await Promise.all([
             fetchUserCertificateStatus([userId], mandatoryIds),
             fetchUserCertificateStatus([userId], optionalIds)

mfes/youthNet/src/pages/manager-dashboard/index.tsx

@@ -172,6 +172,17 @@ const [employeeDataResponse, setEmployeeDataResponse] = useState<any[]>([]);
       const allCompletedCourseIds = Array.from(new Set([...completedMandatoryCourseIds, ...completedOptionalCourseIds]));
       console.log('Unique Completed Course IDs (duplicates removed):', allCompletedCourseIds);
 
+      // If no completed courses, set empty top performers data and return
+      if (allCompletedCourseIds.length === 0) {
+        console.log('No completed courses found, setting empty top performers data');
+        setTopPerformersData({
+          usersData: {
+            '5 Highest Course Completing Users': []
+          }
+        });
+        return;
+      }
+      
       // Collect structured course data from all completed courses
       const getAllStructuredCourseData = async () => {
         const allStructuredData: Array<{courseId: string, units: Array<{unitId: string, contentIds: string[]}> }> = [];
@@ -288,7 +299,11 @@ const [employeeDataResponse, setEmployeeDataResponse] = useState<any[]>([]);
 
         console.log('individualProgressData', apiResponse?.getUserDetails);
         console.log('totalCount', apiResponse?.totalCount);
-        const currentEmployeeIds = apiResponse?.getUserDetails?.map((item: any) => item.userId);
+        // Handle empty array or undefined getUserDetails
+        const userDetails = apiResponse?.getUserDetails || [];
+        const currentEmployeeIds = userDetails.length > 0 
+          ? userDetails.map((item: any) => item.userId) 
+          : [];
 
         // Fetch certificate status for current employees if course identifiers are available
         let userMandatoryCertificateStatus = { data: [] };
@@ -301,7 +316,7 @@ const [employeeDataResponse, setEmployeeDataResponse] = useState<any[]>([]);
         console.log('activeOptionalIds', activeOptionalIds);
         console.log('currentEmployeeIds', currentEmployeeIds);
 
-        if (activeMandatoryIds.length > 0 && activeOptionalIds.length > 0 && currentEmployeeIds.length > 0) {
+        if ((activeMandatoryIds.length > 0 || activeOptionalIds.length > 0 )&& currentEmployeeIds.length > 0) {
           try {
             [userMandatoryCertificateStatus, userOptionalCertificateStatus] = await Promise.all([
               fetchUserCertificateStatus(currentEmployeeIds, activeMandatoryIds),
@@ -317,7 +332,6 @@ const [employeeDataResponse, setEmployeeDataResponse] = useState<any[]>([]);
         // Process certificate status data for easier lookup
         const mandatoryStatusMap = new Map();
         const optionalStatusMap = new Map();
-
         // Process mandatory certificate status
         userMandatoryCertificateStatus.data?.forEach((item: any) => {
           if (!mandatoryStatusMap.has(item.userId)) {
@@ -377,7 +391,8 @@ const [employeeDataResponse, setEmployeeDataResponse] = useState<any[]>([]);
         });
 
         // Transform API data to EmployeeProgress format with calculated progress
-        const transformedProgressData: EmployeeProgress[] = apiResponse?.getUserDetails?.map((user: any) => {
+        const transformedProgressData: EmployeeProgress[] = userDetails.length > 0 
+          ? userDetails.map((user: any) => {
           const mandatoryStats = mandatoryStatusMap.get(user.userId) || { 
             completed: 0, 
             inProgress: 0, 
@@ -424,7 +439,8 @@ const [employeeDataResponse, setEmployeeDataResponse] = useState<any[]>([]);
             mandatoryCompletedIdentifiers: mandatoryStats.completedIdentifiers || [],
             optionalCompletedIdentifiers: optionalStats.completedIdentifiers || []
           };
-        }) || [];
+        })
+          : [];
 
 
         console.log('transformedProgressData with calculated progress', transformedProgressData);
@@ -526,9 +542,14 @@ const [employeeDataResponse, setEmployeeDataResponse] = useState<any[]>([]);
             filters: {emp_manager:userId},
           });
           console.log('employeeDataResponse', employeeDataResponse);
-          setEmployeeDataResponse(employeeDataResponse?.getUserDetails || []);
-           employeeUserIds = employeeDataResponse?.getUserDetails?.map((item: any) => item.userId);
-           setEmployeeUserIds(employeeUserIds);
+          
+          // Handle empty array or undefined getUserDetails
+          const employeeDetails = employeeDataResponse?.getUserDetails || [];
+          setEmployeeDataResponse(employeeDetails);
+          employeeUserIds = employeeDetails.length > 0 
+            ? employeeDetails.map((item: any) => item.userId) 
+            : [];
+          setEmployeeUserIds(employeeUserIds);
         }
         console.log('employeeUserIds', employeeUserIds);
         // Check if tenantId is available before calling certificate status APIs