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

Release 1.13.0 prod register to learner qa

Author: rushi-tekdi

apps/admin-app-repo/src/pages/api/dynamic-form/get-rjsf-form.js

@@ -262,6 +262,28 @@ function generateSchemaAndUISchema(fields) {
           allowedFormats: ['.jpg', '.png', '.jpeg'],
         },
       };
+    } else if (type === 'file' && schemaField?.isMultiSelect === false) {
+      schemaField.items = { type: 'string', format: 'uri' };
+      uiSchema[name] = {
+        'ui:widget': 'CustomFileUpload',
+        'ui:options': {
+          isRequired: schemaField?.isRequired,
+          isMultiSelect: schemaField?.isMultiSelect,
+          maxSelections: schemaField?.maxSelection,
+          allowedFormats: [
+            '.jpg',
+            '.png',
+            '.jpeg',
+            '.pdf',
+            '.doc',
+            '.docx',
+            '.xls',
+            '.xlsx',
+            '.ppt',
+            '.pptx',
+          ],
+        },
+      };
     }
 
     if (extra) {

apps/learner-web-app/src/app/api/dynamic-form/get-rjsf-form/route.js

@@ -233,7 +233,7 @@ function generateSchemaAndUISchema(fields) {
     }
 
     //Our custom RJSF field attributes
-    if (api) {
+    if (api && type !== 'file') {
       schemaField.api = api;
       if (schemaField?.isMultiSelect === true) {
         schemaField.items = {
@@ -245,6 +245,39 @@ function generateSchemaAndUISchema(fields) {
         schemaField.enum = ['Select'];
         schemaField.enumNames = ['Select'];
       }
+    } else if (type === 'file' && schemaField?.isMultiSelect === true) {
+      schemaField.items = { type: 'string', format: 'uri' };
+      uiSchema[name] = {
+        'ui:widget': 'CustomFileUpload',
+        'ui:options': {
+          isRequired: schemaField?.isRequired,
+          isMultiSelect: schemaField?.isMultiSelect,
+          maxSelections: schemaField?.maxSelection,
+          allowedFormats: ['.jpg', '.png', '.jpeg'],
+        },
+      };
+    } else if (type === 'file' && schemaField?.isMultiSelect === false) {
+      schemaField.items = { type: 'string', format: 'uri' };
+      uiSchema[name] = {
+        'ui:widget': 'CustomFileUpload',
+        'ui:options': {
+          isRequired: schemaField?.isRequired,
+          isMultiSelect: schemaField?.isMultiSelect,
+          maxSelections: schemaField?.maxSelection,
+          allowedFormats: [
+            '.jpg',
+            '.png',
+            '.jpeg',
+            '.pdf',
+            '.doc',
+            '.docx',
+            '.xls',
+            '.xlsx',
+            '.ppt',
+            '.pptx',
+          ],
+        },
+      };
     }
 
     if (extra) {

apps/learner-web-app/src/app/registration/RegisterationFlow.tsx

@@ -416,8 +416,14 @@ const RegisterationFlow = () => {
     }
   };
 
-  const handleLoginClick = () => {
-    router.push('/login');
+  const handleLoginClick = (username?: string) => {
+    // Close the modal first
+    setAccountExistModal(false);
+    
+    // Use hard navigation to ensure it works
+   
+      window.location.href = `/login`;
+   
   };
   const handleCloseModal = () => {
     setAccountExistModal(false);

apps/teachers/src/pages/api/dynamic-form/get-rjsf-form.js

@@ -236,7 +236,7 @@ function generateSchemaAndUISchema(fields) {
     }
 
     //Our custom RJSF field attributes
-    if (api) {
+    if (api && type !== 'file') {
       schemaField.api = api;
       if (schemaField?.isMultiSelect === true) {
         schemaField.items = {
@@ -248,6 +248,39 @@ function generateSchemaAndUISchema(fields) {
         schemaField.enum = ['Select'];
         schemaField.enumNames = ['Select'];
       }
+    } else if (type === 'file' && schemaField?.isMultiSelect === true) {
+      schemaField.items = { type: 'string', format: 'uri' };
+      uiSchema[name] = {
+        'ui:widget': 'CustomFileUpload',
+        'ui:options': {
+          isRequired: schemaField?.isRequired,
+          isMultiSelect: schemaField?.isMultiSelect,
+          maxSelections: schemaField?.maxSelection,
+          allowedFormats: ['.jpg', '.png', '.jpeg'],
+        },
+      };
+    } else if (type === 'file' && schemaField?.isMultiSelect === false) {
+      schemaField.items = { type: 'string', format: 'uri' };
+      uiSchema[name] = {
+        'ui:widget': 'CustomFileUpload',
+        'ui:options': {
+          isRequired: schemaField?.isRequired,
+          isMultiSelect: schemaField?.isMultiSelect,
+          maxSelections: schemaField?.maxSelection,
+          allowedFormats: [
+            '.jpg',
+            '.png',
+            '.jpeg',
+            '.pdf',
+            '.doc',
+            '.docx',
+            '.xls',
+            '.xlsx',
+            '.ppt',
+            '.pptx',
+          ],
+        },
+      };
     }
 
     if (extra) {

libs/shared-lib-v2/src/DynamicForm/components/RJSFWidget/CustomDateWidget.tsx

@@ -139,7 +139,8 @@ const CustomDateWidget = ({
               onClose={handleCalendarClose}
               disabled={isDisabled}
               value={selectedDate || null}
-              onChange={(date) => {
+              onChange={handleDateChange}
+              onAccept={(date) => {
                 handleDateChange(date);
                 handleCalendarClose();
               }}

mfes/scp-teacher-repo/src/components/UserRegistration/AssignBatchModal.tsx

@@ -284,7 +284,7 @@ const AssignBatchModal: React.FC<AssignBatchModalProps> = ({
           });
            console.log('allBatchDetails', allBatchDetails);
           // Store all batches for later filtering by center
-          const allBatchOptions = allBatchDetails?.filter((batch: any) => batch.cohortMemberStatus==="active").map((batch: any) => ({
+          const allBatchOptions = allBatchDetails?.map((batch: any) => ({
             label:
               capitalizeFirstChar(batch.name || batch.cohortName) ||
               t('USER_REGISTRATION.UNNAMED_BATCH'),