Merge pull request #2674 from tekdi/release-1.15.0

Release 1.15.0 to learner dev

Author: rushi-tekdi

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

@@ -229,7 +229,7 @@ const Centers = () => {
           ([_, value]) => !Array.isArray(value) || value.length > 0
         )
       );
-      const staticFilter = { type: CohortTypes.COHORT, tenantId: tenantId };
+      const staticFilter = { type: CohortTypes.COHORT };
       const { sortBy } = formData;
       const staticSort = ['name', sortBy || 'asc'];
       await searchListData(

apps/admin-app-repo/src/pages/user-content-creator.tsx

@@ -817,7 +817,7 @@ const ContentCreator = () => {
           )}
         </DialogContent>
         <DialogActions sx={{ p: 2, borderTop: '1px solid #eee' }}>
-          {formStep === 0 && (
+          {formStep === 0 && !(!selectedUserId || isMappingInProgress) && (
             <Button
               sx={{
                 backgroundColor: '#FFC107',

apps/admin-app-repo/src/pages/user-content-reviewer.tsx

@@ -826,7 +826,7 @@ const ContentReviewer = () => {
           )}
         </DialogContent>
         <DialogActions sx={{ p: 2, borderTop: '1px solid #eee' }}>
-          {formStep === 0 && (
+          {formStep === 0 && !(!selectedUserId || isMappingInProgress) && (
             <Button
               sx={{
                 backgroundColor: '#FFC107',

apps/admin-app-repo/src/pages/user-instructor.tsx

@@ -1274,7 +1274,7 @@ const Facilitator = () => {
           )}
         </DialogContent>
         <DialogActions sx={{ p: 2, borderTop: '1px solid #eee' }}>
-          {formStep === 0 && (
+          {formStep === 0 && !(!selectedUserId || isMappingInProgress) && (
             <Button
               sx={{
                 backgroundColor: '#FFC107',
@@ -1299,7 +1299,7 @@ const Facilitator = () => {
               {t('COMMON.NEXT')}
             </Button>
           )}
-          {formStep === 1 && (
+          {formStep === 1 && !(!selectedUserId || !selectedCenterId || isMappingInProgress) && (
             <Button
               variant="contained"
               color="primary"

apps/admin-app-repo/src/pages/user-leader.tsx

@@ -990,7 +990,7 @@ const UserLeader = () => {
           )}
         </DialogContent>
         <DialogActions sx={{ p: 2, borderTop: '1px solid #eee' }}>
-          {formStep === 0 && (
+          {formStep === 0 && !(!selectedUserId || isMappingInProgress) && (
             <Button
               sx={{
                 backgroundColor: '#FFC107',
@@ -1015,7 +1015,7 @@ const UserLeader = () => {
               {t('COMMON.NEXT')}
             </Button>
           )}
-          {formStep === 1 && (
+          {formStep === 1 && !(!selectedUserId || !selectedCenterId || isMappingInProgress) && (
             <Button
               variant="contained"
               color="primary"

apps/admin-app-repo/src/pages/user-mobilizer.tsx

@@ -1554,7 +1554,7 @@ const Mobilizer = () => {
           )}
         </DialogContent>
         <DialogActions sx={{ p: 2, borderTop: '1px solid #eee' }}>
-          {formStep === 0 && (
+          {formStep === 0 && !(!selectedUserId || isMappingInProgress) && (
             <Button
               sx={{
                 backgroundColor: '#FFC107',
@@ -1579,7 +1579,7 @@ const Mobilizer = () => {
               {t('COMMON.NEXT')}
             </Button>
           )}
-          {formStep === 1 && (
+          {formStep === 1 && !(!selectedUserId || !userDetails || !workingVillageAssignmentCenterId || selectedVillagesSet.size === 0 || isMappingInProgress) && (
             <Button
               variant="contained"
               color="primary"

apps/admin-app-repo/src/pages/user-state-lead.tsx

@@ -733,7 +733,7 @@ const StateLead = () => {
           )}
         </DialogContent>
         <DialogActions sx={{ p: 2, borderTop: '1px solid #eee' }}>
-          {formStep === 0 && (
+          {formStep === 0 && !(!selectedUserId || isMappingInProgress) && (
             <Button
               sx={{
                 backgroundColor: '#FFC107',

libs/shared-lib-v2/src/MapUser/MultipleBatchListWidget.tsx

@@ -590,11 +590,15 @@ const MultipleBatchListWidget: React.FC<MultipleBatchListWidgetProps> = ({
         filters.village = selectedVillage;
       }
 
+      //for search name
+      if(searchKeyword){
+        filters.name = searchKeyword;
+      }
+
       const payload = {
         limit: 200,
         offset: 0,
         filters,
-        ...(searchKeyword && { name: searchKeyword }),
       };
 
       const response = await axios.post(

libs/shared-lib-v2/src/MapUser/MultipleCenterListWidgetNew.tsx

@@ -529,11 +529,15 @@ const MultipleCenterListWidget: React.FC<MultipleCenterListWidgetProps> = ({
         filters.village = selectedVillage;
       }
 
+      //for search name
+      if(searchKeyword){
+        filters.name = searchKeyword;
+      }
+
       const payload = {
         limit: 200,
         offset: 0,
         filters,
-        ...(searchKeyword && { name: searchKeyword }),
       };
 
       const response = await axios.post(

libs/shared-lib-v2/src/lib/context/locales/en.json

@@ -33,7 +33,7 @@
   "SELF_PLACED": "Self Placed",
   "Male": "Male",
   "Female": "Female",
-  "Transgender": "Transgender",
+  "Transgender": "Other",
   "email": "Email",
   "DESIGNATION": "Designation",
   "Facilitator": "Facilitator",
@@ -581,7 +581,7 @@
   "WORKING_STATE": "Working State",
   "MALE": "Male",
   "FEMALE": "Female",
-  "TRANSGENDER": "Transgender",
+  "TRANSGENDER": "Other",
   "MOTHER_NAME": "Mother Name",
   "NUMBER_OF_CHILDREN": "Number of Children",
   "NUMBER_OF_CHILDREN_IN_YOUR_GROUP": "Number of Children in your group",
@@ -733,7 +733,7 @@
     "EDUCATIONAL_INSTITUTE": "Educational Institute",
     "UNEMPLOYED_OR_DOMESTIC_WORK": "Unemployed or Domestic Work",
     "SELF_PLACED": "Self Placed",
-    "TRANSGENDER": "Transgender",
+    "TRANSGENDER": "Other",
     "HINDI": "Hindi",
     "MARATHI": "Marathi",
     "URDU": "Urdu",