Merge pull request #2151 from tekdi/release-1.12.0

Release 1.12.0

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

@@ -316,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),
@@ -332,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)) {