Merge pull request #2459 from AkshataKatwal16/release-1.13.0-prod-register

Issue feat: Add select all options for userlist selection and remove sdbv select all option

Author: rushi-tekdi

apps/learner-web-app/src/app/enroll-profile-completion/page.tsx

@@ -11,7 +11,13 @@ import SimpleModal from '@learner/components/SimpleModal/SimpleModal';
 import { Box } from '@mui/material';
 import SignupSuccess from '@learner/components/SignupSuccess /SignupSuccess ';
 import { enrollUserTenant } from '@learner/utils/API/EnrollmentService';
-
+declare global {
+  interface Window {
+    ReactNativeWebView?: {
+      postMessage: (message: string) => void;
+    };
+  }
+}
 const EnrollProfileCompletionInner = () => {
   const router = useRouter();
   const [signupSuccessModal, setSignupSuccessModal] = useState(false);
@@ -72,7 +78,8 @@ const EnrollProfileCompletionInner = () => {
         router.push('/programs');
         return;
       }
-
+     
+        else{
       // Set localStorage values similar to callBackSwitchDialog
       localStorage.setItem('userId', storedUserId);
       localStorage.setItem('templtateId', tenantData?.templateId);
@@ -126,6 +133,7 @@ const EnrollProfileCompletionInner = () => {
 
       // Show success modal instead of redirecting immediately
       setSignupSuccessModal(true);
+    }
     } catch (error) {
       console.error('Failed to access program:', error);
       router.push('/programs');
@@ -138,8 +146,34 @@ const EnrollProfileCompletionInner = () => {
 
   const onSigin = () => {
     setSignupSuccessModal(false);
+     if(localStorage.getItem('isAndroidApp') === 'true')
+        {
+         // Send message to React Native WebView
+
+               const enrolledProgramData = localStorage.getItem('enrolledProgramData');
+               
+                     const program = JSON.parse(enrolledProgramData || '{}');
+
+
+         if (window.ReactNativeWebView) {
+           window.ReactNativeWebView.postMessage(JSON.stringify({
+             type: 'ENROLL_PROGRAM_EVENT', // Event type identifier
+             data: {
+               userId: localStorage.getItem('userId'),
+               tenantId: program.tenantId,
+               token: localStorage.getItem('token'),
+               refreshToken: localStorage.getItem('refreshToken'),
+             
+               // Add any data you want to send
+             }
+           }));
+         }
+        }
+        else{
+              router.push(landingPage || '/home');
+
+    }
     // Navigate to landing page
-    router.push(landingPage || '/home');
   };
 
   return (

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

@@ -320,7 +320,26 @@ const LoginPage = () => {
         } else {
         console.log('tenantData', tenantDataDetails);
         if(tenantDataDetails.length ===1) {
+          if(localStorage.getItem('isAndroidApp') === 'true')
+            {
+             // Send message to React Native WebView
+             if (window.ReactNativeWebView) {
+               window.ReactNativeWebView.postMessage(JSON.stringify({
+                 type: 'LOGIN_INTO_ONLY_ONE_PROGRAM_EVENT', // Event type identifier
+                 data: {
+                   userId: userResponse?.userId,
+                   tenantId:selectedTenantId,
+                   token: localStorage.getItem('token'),
+                   refreshToken: localStorage.getItem('refreshToken'),
+                 
+                   // Add any data you want to send
+                 }
+               }));
+             }
+            }
+            else{
          router.push(`${landingPage}`)
+            }
          // router.push(`/programs?tenantId=${tenantDataDetails[0]?.tenantId}`);
         }
         else{

apps/learner-web-app/src/components/EnrollProgramCarousel/EnrollProgramCarousel.tsx

@@ -30,7 +30,13 @@ import SignupSuccess from '@learner/components/SignupSuccess /SignupSuccess ';
 import { getAcademicYear } from '@learner/utils/API/AcademicYearService';
 import { TenantName } from '@learner/utils/app.constant';
 import { logEvent } from '@learner/utils/googleAnalytics';
-
+declare global {
+  interface Window {
+    ReactNativeWebView?: {
+      postMessage: (message: string) => void;
+    };
+  }
+}
 interface Program {
   ordering: number;
   name: string;
@@ -242,7 +248,8 @@ const EnrollProgramCarousel = ({
       router.push('/login');
       return;
     }
-
+   
+      {
     try {
       setLoadingProgram({ id: program.tenantId, action: 'accessing' });
       const storedUserId = localStorage.getItem('userId');
@@ -276,9 +283,25 @@ const EnrollProgramCarousel = ({
         console.error('User does not have Learner role for this program');
         return;
       }
-
+ if(localStorage.getItem('isAndroidApp') === 'true')
+      {
+       // Send message to React Native WebView
+       if (window.ReactNativeWebView) {
+         window.ReactNativeWebView.postMessage(JSON.stringify({
+           type: 'ACCESS_PROGRAM_EVENT', // Event type identifier
+           data: {
+             userId: userId,
+             tenantId: program.tenantId,
+             token: localStorage.getItem('token'),
+             refreshToken: localStorage.getItem('refreshToken'),
+           
+             // Add any data you want to send
+           }
+         }));
+       }
+      }
       // Set localStorage values similar to callBackSwitchDialog
-      localStorage.setItem('userId', storedUserId);
+    else{  localStorage.setItem('userId', storedUserId);
       localStorage.setItem('templtateId', tenantData?.templateId);
       localStorage.setItem(
         'userIdName',
@@ -332,12 +355,13 @@ const EnrollProgramCarousel = ({
         router.push(enrolledProgram?.params?.uiConfig?.landingPage || '/home');
       }
       router.push(landingPage || '/home');
+    }
     } catch (error) {
       console.error('Failed to access program:', error);
       // You can add error handling/toast notification here
     } finally {
       setLoadingProgram(null);
-    }
+    }}
   };
 
   const handleEnroll = async (program: Program) => {

apps/learner-web-app/src/components/pos/Layout.tsx

@@ -231,7 +231,8 @@ const App: React.FC<LayoutProps> = ({ children, ...props }) => {
         ?.find((category: any) => category.code === 'learningForWork')
         ?.associations?.subDomain?.sort((a: any, b: any) =>
           (a?.name || '').localeCompare(b?.name || '')
-        ) ?? [];
+        )?.filter?.((item: any) => item?.code !== "employeeTraining")?? [];
+        console.log('workSubCategory', workSubCategory);
     const lifeSubCategory =
       option
         ?.find((category: any) => category.code === 'learningForLife')

mfes/scp-teacher-repo/public/locales/en/common.json

@@ -1091,6 +1091,8 @@
     "MOVED_TO_BATCH": "and moved to the batch",
     "OKAY": "Okay",
     "NOT_INTERESTED_TO_JOIN": "Not interested to join",
-    "INTERESTED_MAY_JOIN_NEXT_YEAR": "Interested, may join next year"
+    "INTERESTED_MAY_JOIN_NEXT_YEAR": "Interested, may join next year",
+    "SELECT_ALL": "Select All",
+    "DESELECT_ALL": "Deselect All"
   }
 }

mfes/scp-teacher-repo/public/locales/hi/common.json

@@ -957,5 +957,9 @@
     "IF_ANSWER_SHEET_MULTIPLE_PAGES": "• यदि उत्तर शीट में कई पृष्ठ हैं, तो प्रत्येक पृष्ठ का अलग से फोटो लें और अपलोड करें",
     "READ_LESS": "कम पढ़ें",
     "READ_MORE": "अधिक पढ़ें"
+  },
+  "USER_REGISTRATION": {
+    "SELECT_ALL": "सभी का चयन करें",
+    "DESELECT_ALL": "सभी का चयन रद्द करें"
   }
 }