Merge pull request #2389 from tekdi/release-1.13.0-prod

rushi-tekdi · web-flow · commit 55b2bd50b4ed · 2025-12-16T17:51:01.000+05:30
Release 1.13.0 prod to learner prod
diff --git a/apps/admin-app-repo/public/locales/en/common.json b/apps/admin-app-repo/public/locales/en/common.json
@@ -359,7 +359,7 @@
     "CSV_TEMPLATE": "CSV Template",
     "NEW_TOPIC": "New Topic",
     "DOWNLOAD_CSV": "Download Uploaded CSV",
-    "DURING_COURSE": "During Course"
+    "DURING_COURSE": "Learn"
 
   },
   "MASTER": {
diff --git a/apps/admin-app-repo/src/pages/content-creator.tsx b/apps/admin-app-repo/src/pages/content-creator.tsx
@@ -128,7 +128,7 @@ const ContentCreator = () => {
       );
       const staticFilter = {
         role: RoleName.CONTENT_CREATOR,
-        tenantId: storedUserData.tenantData[0].tenantId,
+        // tenantId: storedUserData.tenantData[0].tenantId,
       };
       const { sortBy } = formData;
       const staticSort = ['firstName', sortBy || 'asc'];
diff --git a/apps/admin-app-repo/src/pages/state-lead.tsx b/apps/admin-app-repo/src/pages/state-lead.tsx
@@ -142,7 +142,7 @@ const StateLead = () => {
       );
       const staticFilter = {
         role: RoleName.STATE_LEAD,
-        tenantId: storedUserData.tenantData[0].tenantId,
+        // tenantId: storedUserData.tenantData[0].tenantId,
       };
       const { sortBy } = formData;
       const staticSort = ['firstName', sortBy || 'asc'];
diff --git a/apps/learner-web-app/public/images/PLP Photos-02.jpg b/apps/learner-web-app/public/images/PLP Photos-02.jpg
diff --git a/apps/learner-web-app/public/images/PLP Photos-03.jpg b/apps/learner-web-app/public/images/PLP Photos-03.jpg
diff --git a/apps/learner-web-app/public/images/PLP Photos-04.jpg b/apps/learner-web-app/public/images/PLP Photos-04.jpg
diff --git a/apps/learner-web-app/public/images/PLP Photos-05.jpg b/apps/learner-web-app/public/images/PLP Photos-05.jpg
diff --git a/apps/learner-web-app/src/components/Content/Player.tsx b/apps/learner-web-app/src/components/Content/Player.tsx
@@ -22,6 +22,7 @@ import {
 import { useParams, useRouter } from 'next/navigation';
 import { ContentSearch } from '@learner/utils/API/contentService';
 import { checkAuth } from '@shared-lib-v2/utils/AuthService';
+import { isDownloadContentEnabled } from '@shared-lib-v2/SwitchAccount/DownloadContent.config';
 import {
   ExpandableText,
   findCourseUnitPath,
@@ -391,7 +392,8 @@ const App = ({
           {..._config?.player}
         />
         {item?.content?.artifactUrl &&
-          isDownloadableMimeType(item?.content?.mimeType || mimeType) && (
+          isDownloadableMimeType(item?.content?.mimeType || mimeType) &&
+          isDownloadContentEnabled() && (
             <Box
               sx={{
                 my: 3,
@@ -537,7 +539,7 @@ const App = ({
             margin: 0,
             maxHeight: '100vh',
           },
-        }}  
+        }}
         PaperProps={{
           sx: {
             width: {
diff --git a/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx b/apps/learner-web-app/src/components/EditProfile/EditProfile.tsx
@@ -234,7 +234,29 @@ const [responseFormData, setResponseFormData] = useState<any>({});
       delete payload.email;
     }
     console.log('payload', payload);
-    const { userData, customFields } = splitUserData(payload);
+    const { userData, customFields = [] } = splitUserData(payload);
+
+    // Ensure "WHAT PROGRAM ARE YOU PART OF" is explicitly sent even when empty
+    const programSchema =
+      responseFormData?.schema?.properties?.what_program_are_you_part_of;
+    const programFieldId = programSchema?.fieldId;
+    
+    const programFieldIndex = customFields.findIndex(
+      (field: any) =>
+        field?.fieldId === programFieldId ||
+        field?.label === 'WHAT PROGRAM ARE YOU PART OF'
+    );
+
+    if (programFieldIndex === -1) {
+      if(programFieldId) {
+      customFields.push({
+        fieldId: programFieldId,
+          value: [],
+        });
+      }
+    } else if (!Array.isArray(customFields[programFieldIndex].selectedValues)) {
+      customFields[programFieldIndex].selectedValues = [];
+    }
 
     const parentPhoneField = customFields.find(
       (field: any) => field.value === formData.parent_phone
diff --git a/apps/learner-web-app/src/components/pos/Home.tsx b/apps/learner-web-app/src/components/pos/Home.tsx
@@ -1,8 +1,10 @@
 'use client';
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import Layout from '@learner/components/pos/Layout';
 
-import { Container, Typography, Grid, Box, useMediaQuery } from '@mui/material';
+import { Container, Typography, Grid, Box, useMediaQuery, Button } from '@mui/material';
+import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
+import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import WhatsNewCarousel from '@learner/components/WhatsNewCarousel';
 import MoreWayCarousel from '@learner/components/MoreWayCarousel';
 import KnwoledgeCarousel from '@learner/components/KnwoledgeCarousel';
@@ -15,6 +17,11 @@ import { useRouter } from 'next/navigation';
 import { SearchButton } from '@learner/components/pos/SearchButton';
 import { ContentSearch, getfilterList } from '@learner/utils/API/contentService';
 import { staticFilterContent } from '@shared-lib-v2/utils/AuthService';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import { Navigation, Pagination, Autoplay } from 'swiper/modules';
+import 'swiper/css';
+import 'swiper/css/navigation';
+import 'swiper/css/pagination';
 
 const Content = dynamic(() => import('@Content'), {
   ssr: false,
@@ -213,19 +220,120 @@ const rangeLength = contentLanguageField?.range?.length || 0;
   ];
 
   const mediaMD = useMediaQuery('(max-width: 900px)');
+  const prevRef = useRef<HTMLButtonElement>(null);
+  const nextRef = useRef<HTMLButtonElement>(null);
 
   return (
     <Layout onlyHideElements={['footer']} _topAppBar={{ _config: {} }}>
       <Grid container spacing={4}>
         <Grid item xs={12} md={6}>
-          <Image
-            src="/images/Tab with childrens 7.png"
-            alt="Happy children learning together"
-            layout="responsive"
-            width={1000}
-            height={568}
-            style={{ width: '100%', height: '568px' }}
-          />
+          <Box sx={{ width: '100%', height: '500px', position: 'relative' }}>
+            <Button
+              ref={prevRef}
+              sx={{
+                position: 'absolute',
+                left: 10,
+                top: '50%',
+                transform: 'translateY(-50%)',
+                zIndex: 10,
+                minWidth: '40px',
+                width: '40px',
+                height: '40px',
+                p: 0,
+                borderRadius: '50%',
+                backgroundColor: '#FFFFFF',
+                boxShadow: '0px 2px 4px 0px #0000004D',
+                color: '#1F1B13',
+                '&:hover': {
+                  backgroundColor: '#f5f5f5',
+                },
+              }}
+            >
+              <ChevronLeftIcon sx={{ fontSize: '28px' }} />
+            </Button>
+            <Swiper
+              modules={[Navigation, Pagination, Autoplay]}
+              spaceBetween={0}
+              slidesPerView={1}
+              loop={true}
+              autoplay={{
+                delay: 3000,
+                disableOnInteraction: false,
+              }}
+              pagination={{
+                clickable: true,
+              }}
+              navigation={{
+                prevEl: prevRef.current,
+                nextEl: nextRef.current,
+              }}
+              onBeforeInit={(swiper) => {
+                if (typeof swiper.params.navigation !== 'boolean') {
+                  if (swiper.params.navigation) {
+                    swiper.params.navigation.prevEl = prevRef.current;
+                    swiper.params.navigation.nextEl = nextRef.current;
+                  }
+                }
+              }}
+              style={{ width: '100%', height: '100%' }}
+            >
+              <SwiperSlide style={{ position: 'relative', width: '100%', height: '500px' }}>
+                <Image
+                  src="/images/PLP Photos-02.jpg"
+                  alt="PLP Photos 02"
+                  fill
+                  style={{ objectFit: 'cover' }}
+                />
+              </SwiperSlide>
+              <SwiperSlide style={{ position: 'relative', width: '100%', height: '500px' }}>
+                <Image
+                  src="/images/PLP Photos-03.jpg"
+                  alt="PLP Photos 03"
+                  fill
+                  style={{ objectFit: 'cover' }}
+                />
+              </SwiperSlide>
+              <SwiperSlide style={{ position: 'relative', width: '100%', height: '500px' }}>
+                <Image
+                  src="/images/PLP Photos-04.jpg"
+                  alt="PLP Photos 04"
+                  fill
+                  style={{ objectFit: 'cover' }}
+                />
+              </SwiperSlide>
+              <SwiperSlide style={{ position: 'relative', width: '100%', height: '500px' }}>
+                <Image
+                  src="/images/PLP Photos-05.jpg"
+                  alt="PLP Photos 05"
+                  fill
+                  style={{ objectFit: 'cover' }}
+                />
+              </SwiperSlide>
+            </Swiper>
+            <Button
+              ref={nextRef}
+              sx={{
+                position: 'absolute',
+                right: 10,
+                top: '50%',
+                transform: 'translateY(-50%)',
+                zIndex: 10,
+                minWidth: '40px',
+                width: '40px',
+                height: '40px',
+                p: 0,
+                borderRadius: '50%',
+                backgroundColor: '#FFFFFF',
+                boxShadow: '0px 2px 4px 0px #0000004D',
+                color: '#1F1B13',
+                '&:hover': {
+                  backgroundColor: '#f5f5f5',
+                },
+              }}
+            >
+              <ChevronRightIcon sx={{ fontSize: '28px' }} />
+            </Button>
+          </Box>
         </Grid>
         <Grid
           item
diff --git a/apps/learner-web-app/src/components/themantic/content/Player.tsx b/apps/learner-web-app/src/components/themantic/content/Player.tsx
@@ -19,6 +19,7 @@ import {
   Typography,
 } from '@mui/material';
 import { useParams, useRouter } from 'next/navigation';
+import { isDownloadContentEnabled } from '@shared-lib-v2/SwitchAccount/DownloadContent.config';
 import {
   ExpandableText,
   findCourseUnitPath,
@@ -446,7 +447,8 @@ const App = ({
               {..._config?.player}
             />
             {item?.content?.artifactUrl &&
-              isDownloadableMimeType(item?.content?.mimeType) && (
+              isDownloadableMimeType(item?.content?.mimeType) &&
+              isDownloadContentEnabled() && (
                 <Box sx={{ mt: 3, display: 'flex', justifyContent: 'center' }}>
                   <Button
                     variant="contained"
diff --git a/apps/learner-web-app/src/utils/helper.ts b/apps/learner-web-app/src/utils/helper.ts
@@ -19,10 +19,11 @@ const getSelectedValueName = (fields: any, label: any) => {
   if (field && field.selectedValues && field.selectedValues.length > 0) {
     return field.selectedValues[0]; // Return the first selected value
   }
+
   return null;
 };
 export const mapUserData = (userData: any) => {
-  console.log(userData, 'userData');
+  console.log(userData, 'userData===>');
   try {
     const getSelectedValue = (label: any) =>
       userData.customFields
@@ -66,6 +67,9 @@ export const mapUserData = (userData: any) => {
       // is_volunteer: getSingleTextValue('IS_VOLUNTEER'),
       drop_out_reason:
         getSelectedValue('REASON_FOR_DROP_OUT_FROM_SCHOOL') || [], // array
+      // Keep program dropdown empty on edit; user should select explicitly
+      what_program_are_you_part_of: getSelectedValue('WHAT PROGRAM ARE YOU PART OF') || [],
+    //  what_program_are_you_part_of: [],
       work_domain:
         getSelectedValue(
           'WHAT_IS_YOUR_PRIMARY_WORK'
diff --git a/libs/shared-lib-v2/src/SwitchAccount/DownloadContent.config.ts b/libs/shared-lib-v2/src/SwitchAccount/DownloadContent.config.ts
@@ -0,0 +1,44 @@
+// List of hostnames where download button should be shown
+const downloadEnabledHostnames = [
+  'pos.prathamdigital.org',
+  'qa-pos.prathamdigital.org',
+  'dev-pos.prathamdigital.org',
+  'https://www.prathamopenschool.org/',
+  'https://experimentoindia.prathamopenschool.org/',
+  'https://dev-themantic.prathamdigital.org/',
+  'https://qa-themantic.prathamdigital.org/',
+  'https://themantic.prathamdigital.org/',
+  'localhost:3003',
+];
+
+// Normalize hostname (removes protocol, www prefix, trailing slashes, and paths)
+const normalizeHostname = (urlOrHostname: string): string => {
+  // Remove protocol if present (https:// or http://)
+  let hostname = urlOrHostname.replace(/^https?:\/\//, '');
+  // Remove trailing slash
+  hostname = hostname.replace(/\/$/, '');
+  // Remove path if present (everything after /)
+  hostname = hostname.split('/')[0];
+  // Remove www. prefix for consistent comparison
+  hostname = hostname.replace(/^www\./, '');
+  return hostname;
+};
+
+// Check if download is enabled for current hostname
+export const isDownloadContentEnabled = (): boolean => {
+  if (typeof window === 'undefined') {
+    return false;
+  }
+
+  // Use host (includes port) instead of hostname to handle localhost:3003
+  const currentHost = window.location.host;
+  const currentHostname = normalizeHostname(currentHost);
+
+  // Check if current hostname matches any configured hostname
+  return downloadEnabledHostnames.some((configHostname) => {
+    const normalizedConfigHostname = normalizeHostname(configHostname);
+    return normalizedConfigHostname === currentHostname;
+  });
+};
+
+export default downloadEnabledHostnames;
diff --git a/libs/shared-lib-v2/src/lib/context/locales/en.json b/libs/shared-lib-v2/src/lib/context/locales/en.json
@@ -677,7 +677,22 @@
     "GRADE_9": "Grade 9",
     "GRADE_10": "Grade 10",
     "GRADE_11": "Grade 11",
-    "GRADE_12": "Grade 12"
+    "GRADE_12": "Grade 12",
+    "hamara_gaon": "hamara gaon",
+    "smile_program": "smile program",
+    "pratham_read_india_initiative_rii": "pratham readindia initiative rii",
+    "government_partnership": "government partnership",
+    "summer_camp_volunteer": "summer camp volunteer",
+    "HAMARA_GAON": "Hamara Gaon",
+    "SMILE_PROGRAM": "Smile Program",
+    "PRATHAM_READ_INDIA_INITIATIVE_RII": "Pratham Read India Initiative RII",
+    "GOVERNMENT_PARTNERSHIP": "Government Partnership",
+    "SUMMER_CAMP_VOLUNTEER": "Summer Camp Volunteer",
+    "WHAT_PROGRAM_ARE_YOU_PART_OF": "What Program Are You Part Of",
+    "WHAT PROGRAM ARE YOU PART OF": "What Program Are You Part Of"
+    
+    
+
   },
   "FORM_ERROR_MESSAGES": {
     "INVALID_INPUT": "Invalid Input.",
diff --git a/mfes/scp-teacher-repo/public/locales/en/common.json b/mfes/scp-teacher-repo/public/locales/en/common.json
@@ -485,7 +485,7 @@
     "FACILITATOR_REQUISITES": "Facilitator's Requisites",
     "PREREQUISITES": "Prepare",
     "POST_REQUISITES": "Practice",
-    "DURING_COURSE": "During Course",
+    "DURING_COURSE": "Learn",
     "CANT_SELECT_AS_EVENT_PASSED_LIVE": "Can not select topic and subtopic as event is already passed or live.",
     "COURSE_TYPE": "Course Type",
     "IDENTIFIER_NOT_FOUND": "Identifier not found! Cannot Open Content!",
