Merge pull request #2528 from tekdi/release-1.13.0-prod-register

Release 1.13.0 prod register to admin qa

Author: rushi-tekdi

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

@@ -4,6 +4,7 @@ import React from 'react';
 import { Box, Typography, Paper, Stack, Button, Divider } from '@mui/material';
 import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
 import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
+import { useTranslation } from '@shared-lib';
 
 type AccountExistsCardProps = {
   fullName: string;
@@ -16,6 +17,8 @@ const AccountExistsCard: React.FC<AccountExistsCardProps> = ({
   usernames,
   onLoginClick,
 }) => {
+  const { t } = useTranslation();
+
   return (
     <Box
       display="flex"
@@ -41,8 +44,7 @@ const AccountExistsCard: React.FC<AccountExistsCardProps> = ({
           verticalAlign: 'middle', // ensures vertical alignment
         }}
       >
-        One or more accounts with this name, email ID, and/or phone number
-        already exist, as listed below
+        {t('NAVAPATHAM.ACCOUNT_ALREADY_EXISTS_MESSAGE')}
       </Typography>
 
       <Typography
@@ -98,7 +100,7 @@ const AccountExistsCard: React.FC<AccountExistsCardProps> = ({
                   lineHeight: 1.4,
                 }}
               >
-                Login with this username
+                {t('NAVAPATHAM.LOGIN_WITH_USERNAME')}
               </Typography>
             </Box>
 

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

@@ -172,14 +172,14 @@ const CreateAccountForm = ({
             textAlign: 'center',
           }}
         >
-          Already signed up?{' '}
+          {t('NAVAPATHAM.ALREADY_SIGNED_UP')} ?{' '}
           <Link
             href="/login"
             underline="hover"
             color="secondary"
             sx={{ fontWeight: '500' }}
           >
-            Click here to login
+            {t('NAVAPATHAM.CLICK_HERE_TO_LOGIN')}
           </Link>
         </Typography>
       </Box>
@@ -198,7 +198,7 @@ const CreateAccountForm = ({
         <Box display="flex" alignItems="center" gap={1} mb={2}>
           <Image src={face} alt="Step Icon" />
           <Typography fontWeight={600}>
-            2/2 Create your username & password
+            2/2 {t('NAVAPATHAM.CREATE_USERNAME_PASSWORD')}
           </Typography>
         </Box>
 
@@ -213,12 +213,12 @@ const CreateAccountForm = ({
             mb: 3,
           }}
         >
-          Tip: Note down your credentials somewhere safe so you have it handy!
+        {t('NAVAPATHAM.CREDENTIALS_TIP')}
         </Alert>
 
         {/* Username */}
         <TextField
-          label="Username"
+          label={t('NAVAPATHAM.USERNAME')}
           value={username}
           onChange={(e) => handleUsernameChange(e.target.value)}
           onBlur={(e) => handleUsernameBlur(e.target.value)}
@@ -227,13 +227,13 @@ const CreateAccountForm = ({
           error={!!usernameError}
           helperText={
             usernameError ||
-            'Make it unique! Customise it with your birth date or lucky number'
+            t('NAVAPATHAM.USERNAME_HELPER')
           }
         />
 
         {/* Password */}
         <TextField
-          label="Password"
+          label={t('NAVAPATHAM.PASSWORD')}
           type={showPassword ? 'text' : 'password'}
           value={password}
           onChange={(e) => onPasswordChange(e.target.value)}
@@ -244,7 +244,7 @@ const CreateAccountForm = ({
               <InputAdornment position="end">
                 <IconButton onClick={togglePassword} edge="end">
                   {showPassword ? <Visibility /> : <VisibilityOff />}
-                </IconButton>
+                </IconButton> 
               </InputAdornment>
             ),
           }}
@@ -261,7 +261,7 @@ const CreateAccountForm = ({
 
         {/* Confirm Password */}
         <TextField
-          label="Confirm Password"
+          label={t('NAVAPATHAM.CONFIRM_PASSWORD')}
           type={showConfirm ? 'text' : 'password'}
           value={confirmPassword}
           onChange={(e) => onConfirmPasswordChange(e.target.value)}
@@ -305,7 +305,7 @@ const CreateAccountForm = ({
                 color="#0071E3"
                 onClick={handleConsentform}
               >
-                Consent Form
+                {t('NAVAPATHAM.CONSENT_FORM')}
               </Typography>
               .
             </Typography>
@@ -323,8 +323,7 @@ const CreateAccountForm = ({
             }
             label={
               <Typography variant="h3">
-                I confirm this checkbox is filled out by the parent/guardian of
-                the learner.
+                {t('NAVAPATHAM.PARENT_GUARDIAN_CONFIRMATION')}
               </Typography>
             }
           />
@@ -364,10 +363,10 @@ const CreateAccountForm = ({
           {isSubmitDisabled ? (
             <Box display="flex" alignItems="center" gap={1}>
               <CircularProgress size={20} sx={{ color: '#9E9E9E' }} />
-              <span>Creating Account...</span>
+              <span>{t('NAVAPATHAM.CREATING_ACCOUNT')}</span>
             </Box>
           ) : (
-            'Create Account'
+            t('NAVAPATHAM.CREATE_ACCOUNT')
           )}
         </Button>
       </Box>

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

@@ -97,7 +97,6 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
   const [parentDataAddUiSchema, setParentDataAddUiSchema] = useState({});
   const [parentDataSchema, setParentDataSchema] = useState({});
 
-
   console.log('addSchema', addSchema);
 
   // const [schema, setSchema] = useState(facilitatorSearchSchema);
@@ -127,7 +126,6 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
         ]);
 
         const responseFormForEnroll: any = await fetchForm([
-
           {
             fetchUrl: `${process.env.NEXT_PUBLIC_MIDDLEWARE_URL}/form/read?context=${FormContext.learner.context}&contextType=${FormContext.learner.contextType}`,
             header: {
@@ -210,6 +208,10 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
 
           //set 2 grid layout
           alterUISchema = enhanceUiSchemaWithGrid(alterUISchema);
+
+          // Add helper text to all CustomTextFieldWidget fields if isForNavaPatham is true
+          alterUISchema = addHelperTextToTextFieldWidgets(alterUISchema);
+
           console.log('alterUISchema', alterUISchema);
           if (!completeProfile) {
             alterUISchema = {
@@ -266,6 +268,47 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
     return enhancedSchema;
   };
 
+  const addHelperTextToTextFieldWidgets = (uiSchema: any): any => {
+    // Check if isForNavaPatham is true in localStorage
+    const isForNavaPatham =
+      typeof window !== 'undefined'
+        ? localStorage.getItem('isForNavaPatham') === 'true'
+        : false;
+
+    // If isForNavaPatham is not true, return the schema without modifications
+    if (!isForNavaPatham) {
+      return uiSchema;
+    }
+
+    const enhancedSchema = { ...uiSchema };
+
+    Object.keys(enhancedSchema).forEach((fieldKey) => {
+      // Skip ui:order and other non-field keys
+      if (fieldKey === 'ui:order') return;
+
+      if (
+        typeof enhancedSchema[fieldKey] === 'object' &&
+        enhancedSchema[fieldKey] !== null
+      ) {
+        // Check if this field uses CustomTextFieldWidget
+        if (enhancedSchema[fieldKey]['ui:widget'] === 'CustomTextFieldWidget') {
+          // Ensure ui:options exists
+          if (!enhancedSchema[fieldKey]['ui:options']) {
+            enhancedSchema[fieldKey]['ui:options'] = {};
+          }
+
+          // Add helperText if it doesn't already exist
+          if (!enhancedSchema[fieldKey]['ui:options'].helperText) {
+            enhancedSchema[fieldKey]['ui:options'].helperText =
+              'దయచేసి ఈ సమాచారాన్ని ఇంగ్లీష్ భాషలో మాత్రమే నమోదు చేయండి';
+          }
+        }
+      }
+    });
+
+    return enhancedSchema;
+  };
+
   // formData.mobile = '8793607919';
   // formData.firstName = 'karan';
   // formData.lastName = 'patil';
@@ -369,9 +412,6 @@ if(enrolledProgram && userTenantStatus){
           router.push('/content');
         }
       }
-
-
-      
     }
 
     console.log(payload);