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

Release 1.13.0 prod register to learner qa

Author: rushi-tekdi

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

@@ -36,6 +36,22 @@ const CourseCertificateCard: React.FC<CertificateCardProps> = ({
 }) => {
   const [courseDetails, setCourseDetails] = useState<CourseDetails | null>(null);
   const [isLoading, setIsLoading] = useState(true);
+  const [isCertificateRestricted, setIsCertificateRestricted] = useState(false);
+
+  // Check certificate restriction from uiconfig in localStorage
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      try {
+        const uiconfig = localStorage.getItem('uiConfig');
+        if (uiconfig) {
+          const parsedConfig = JSON.parse(uiconfig);
+          setIsCertificateRestricted(parsedConfig.certificateRestriction === true);
+        }
+      } catch (error) {
+        console.error('Error parsing uiconfig:', error);
+      }
+    }
+  }, []);
 
   useEffect(() => {
     const fetchCourseDetails = async () => {
@@ -81,6 +97,11 @@ const CourseCertificateCard: React.FC<CertificateCardProps> = ({
     return <CardShimmer />;
   }
 
+  // Don't render if certificate is restricted
+  // if (isCertificateRestricted) {
+  //   return null;
+  // }
+
   return (
     <Card
       sx={{
@@ -195,7 +216,7 @@ const CourseCertificateCard: React.FC<CertificateCardProps> = ({
           </Typography>
         </Box>
 
-        <Button
+       {!isCertificateRestricted && (<Button
           variant="text"
           onClick={onPreviewCertificate}
           sx={{
@@ -220,7 +241,7 @@ const CourseCertificateCard: React.FC<CertificateCardProps> = ({
           endIcon={<ArrowForwardIcon sx={{ fontSize: '18px' }} />}
         >
           Preview Certificate
-        </Button>
+        </Button>)}
       </CardContent>
     </Card>
   );

apps/learner-web-app/src/components/pos/Home.tsx

@@ -19,6 +19,7 @@ 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 type { Swiper as SwiperType } from 'swiper';
 import 'swiper/css';
 import 'swiper/css/navigation';
 import 'swiper/css/pagination';
@@ -222,6 +223,20 @@ const rangeLength = contentLanguageField?.range?.length || 0;
   const mediaMD = useMediaQuery('(max-width: 900px)');
   const prevRef = useRef<HTMLButtonElement>(null);
   const nextRef = useRef<HTMLButtonElement>(null);
+  const [swiperInstance, setSwiperInstance] = useState<SwiperType | null>(null);
+
+  // Update navigation when refs are ready
+  useEffect(() => {
+    if (swiperInstance && prevRef.current && nextRef.current) {
+      const navigation = swiperInstance.params.navigation;
+      if (navigation && typeof navigation !== 'boolean') {
+        navigation.prevEl = prevRef.current;
+        navigation.nextEl = nextRef.current;
+        swiperInstance.navigation.init();
+        swiperInstance.navigation.update();
+      }
+    }
+  }, [swiperInstance]);
 
   return (
     <Layout onlyHideElements={['footer']} _topAppBar={{ _config: {} }}>
@@ -263,18 +278,8 @@ const rangeLength = contentLanguageField?.range?.length || 0;
               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;
-                  }
-                }
-              }}
+              navigation={true}
+              onSwiper={setSwiperInstance}
               style={{ width: '100%', height: '100%' }}
             >
               <SwiperSlide style={{ position: 'relative', width: '100%', height: '500px' }}>

mfes/content/src/components/Content/CourseUnitDetails.tsx

@@ -64,12 +64,30 @@ export default function Details(props: DetailsProps) {
   const [effectiveUnitId, setEffectiveUnitId] = useState<string | undefined>(
     Array.isArray(unitId) ? unitId[0] : unitId
   );
+  const [isCertificateRestricted, setIsCertificateRestricted] = useState(false);
+  
   let activeLink = null;
   if (typeof window !== 'undefined') {
     const searchParams = new URLSearchParams(window.location.search);
     activeLink = searchParams.get('activeLink');
   }
 
+  // Check certificate restriction from uiconfig in localStorage
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      try {
+        const uiconfig = localStorage.getItem('uiConfig');
+        if (uiconfig) {
+          const parsedConfig = JSON.parse(uiconfig);
+          console.log('parsedConfig=====>', parsedConfig);
+          setIsCertificateRestricted(parsedConfig.certificateRestriction === true);
+        }
+      } catch (error) {
+        console.error('Error parsing uiconfig:', error);
+      }
+    }
+  }, []);
+
   useEffect(() => {
     const getDetails = async (identifier: string) => {
       try {
@@ -253,7 +271,6 @@ export default function Details(props: DetailsProps) {
                     setCertificateId(
                       resultCertificate?.result?.credentialSchemaId
                     );
-                  } else {
                   }
                 }
               }
@@ -424,12 +441,12 @@ export default function Details(props: DetailsProps) {
           ...props?._box,
         }}
       >
-        {certificateId && !effectiveUnitId && (
+        {!isCertificateRestricted && certificateId && !effectiveUnitId && (
           <CourseCompletionBanner certificateId={certificateId} />
         )}
 
         {/* Show completion banner for completed courses */}
-        {!unitId && courseItem?.children?.length === 1 && courseItem?.issuedOn && (
+        {!isCertificateRestricted && !unitId && courseItem?.children?.length === 1 && courseItem?.issuedOn && (
           <CourseCompletionBanner certificateId={certificateId || ''} />
         )}
         {props?.type === 'collapse' ? (

mfes/scp-teacher-repo/src/pages/board-enrollment/student-detail/[userId].tsx

@@ -553,7 +553,7 @@ const BoardEnrollmentDetail = () => {
                         {t('BOARD_ENROLMENT.CHOOSE_BOARD')}
                       </Box>
                       <Box sx={{ maxHeight: '550px', overflowY: 'auto' }}>
-                        {boardOptions?.map((boardItem) => (
+                        {boardOptions?.filter((boardItem) => boardItem.status !== "Retired").map((boardItem) => (
                           <Box sx={{ mt: 2 }} key={boardItem.code}>
                             <Box
                               sx={{