Merge pull request #2659 from tekdi/release-1.15.0

Release 1.15.0 to teacher dev

Author: rushi-tekdi

apps/admin-app-repo/src/config/menuConfig.ts

@@ -8,12 +8,12 @@ export const MENU_CONFIG = {
       link: '/centers',
       roles: [Role.ADMIN, Role.CENTRAL_ADMIN],
     },
-    batch: {
-      title: 'SIDEBAR.BATCH',
-      icon: '/images/centers.svg',
-      link: '/batch',
-      roles: [Role.ADMIN, Role.CENTRAL_ADMIN],
-    },
+    // batch: {
+    //   title: 'SIDEBAR.BATCH',
+    //   icon: '/images/centers.svg',
+    //   link: '/batch',
+    //   roles: [Role.ADMIN, Role.CENTRAL_ADMIN],
+    // },
     manageUsers: {
       title: 'SIDEBAR.MANAGE_USERS',
       icon: '/images/group.svg',

apps/admin-app-repo/src/pages/centers.tsx

@@ -168,20 +168,20 @@ const Centers = () => {
       //set 2 grid layout
       let alterUISchema = responseForm?.uiSchema;
       alterUISchema['ui:order'] = [
-        "name",
-        "center_type",
         "state",
         "district",
         "block",
         "village",
+        "board",
+        "medium",
+        "grade",
+        "name",
+        "center_type",
         "address",
         "image",
         "google_map_link",
         'industry',
-        "catchment_area",
-        "board",
-        "medium",
-        "grade",
+        "catchment_area"
       ];
       alterUISchema = enhanceUiSchemaWithGrid(alterUISchema);
 

mfes/scp-teacher-repo/src/components/Header.tsx

@@ -423,12 +423,18 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
       if (storedTenantData) {
         try {
           const parsedTenantData = JSON.parse(storedTenantData);
-          setTenantData(parsedTenantData);
+          
+          // Filter out pragyanpath tenant
+          const filteredTenantData = parsedTenantData.filter(
+            (tenant: any) => tenant?.tenantName?.toLowerCase() !== 'pragyanpath'
+          );
+          
+          setTenantData(filteredTenantData);
 
           // Show switch button if there are multiple tenants or multiple roles in any tenant
           const shouldShowButton = 
-            parsedTenantData.length > 1 || 
-            parsedTenantData.some((tenant: any) => tenant?.roles?.length > 1);
+            filteredTenantData.length > 1 || 
+            filteredTenantData.some((tenant: any) => tenant?.roles?.length > 1);
           setShowSwitchButton(shouldShowButton);
         } catch (error) {
           console.error('Error parsing tenantData:', error);

mfes/youthNet/public/locales/en/common.json

@@ -819,7 +819,12 @@
     "DISTRICT": "District",
     "DISTRICTS": "Districts",
     "STATE": "State",
-    "PLEASE_GO_BACK_MSG": "Please go back after selection to proceed further"
+    "PLEASE_GO_BACK_MSG": "Please go back after selection to proceed further",
+    "NO_STATES_FOUND": "No States found",
+    "NO_DISTRICTS_FOUND": "No Districts found",
+    "NO_BLOCKS_FOUND": "No Blocks found",
+    "NO_VILLAGES_FOUND": "No Villages found"
+    
   },
   "YOUTHNET_CAMP_DETAILS": {
     "SUBMISSION": "Submission",

mfes/youthNet/src/components/Header.tsx

@@ -92,12 +92,17 @@ const Header: React.FC<HeaderProps> = ({ toggleDrawer, openDrawer }) => {
       if (storedTenantData) {
         try {
           const parsedTenantData = JSON.parse(storedTenantData);
-          setTenantData(parsedTenantData);
+          const filteredTenantData = parsedTenantData.filter(
+            (tenant: any) => tenant?.tenantName?.toLowerCase() !== 'pragyanpath'
+          );
+          
+          setTenantData(filteredTenantData);
+
 
           // Show switch button if there are multiple tenants or multiple roles in any tenant
           const shouldShowButton = 
-            parsedTenantData.length > 1 || 
-            parsedTenantData.some((tenant: any) => tenant?.roles?.length > 1);
+          filteredTenantData.length > 1 || 
+          filteredTenantData.some((tenant: any) => tenant?.roles?.length > 1);
           setShowSwitchButton(shouldShowButton);
         } catch (error) {
           console.error('Error parsing tenantData:', error);