Merge pull request #2667 from tekdi/release-1.15.0

Release 1.15.0 to admin dev

Author: rushi-tekdi

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

@@ -32,7 +32,7 @@ import {
 } from '@/services/CohortService/cohortService';
 import ConfirmationPopup from '@/components/ConfirmationPopup';
 import { updateCohort } from '@/services/MasterDataService';
-import { transformLabel } from '@/utils/Helper';
+import { transformLabel, transformLabelWithoutSpaces } from '@/utils/Helper';
 import { useTheme } from '@mui/material/styles';
 import AddIcon from '@mui/icons-material/Add';
 import CenteredLoader from '@/components/CenteredLoader/CenteredLoader';
@@ -279,7 +279,7 @@ const Centers = () => {
     {
       key: 'name',
       label: 'Center Name',
-      render: (row: any) => transformLabel(row?.name),
+      render: (row: any) => transformLabelWithoutSpaces(row?.name),
     },
     {
       key: 'address',

apps/admin-app-repo/src/utils/Helper.ts

@@ -139,6 +139,17 @@ export const transformLabel = (label: string): string => {
     .replace(/\b\w/g, (char) => char.toUpperCase()); // Capitalize the first letter of each word
 };
 
+export const transformLabelWithoutSpaces = (label: string): string => {
+  if (typeof label !== 'string') {
+    return label as any;
+  }
+
+  return label
+    .toLowerCase()
+    .replace(/\b\w/g, (char) => char.toUpperCase());
+};
+
+
 export const transformArray = (arr: State[]): State[] => {
   if (!arr || !Array.isArray(arr)) {
     return arr;

apps/learner-web-app/src/app/landing/page.tsx

@@ -134,6 +134,7 @@ export default function LandingPage() {
   };
 
   const aboutPrathamText = t('LANDING.ABOUT_PRATHAM_TEXT');
+  const aboutPrathamLearningPlatformText = t('LANDING.ABOUT_PRATHAM_LEARNING_PLATFORM_TEXT');
 
   return (
     <>
@@ -395,7 +396,7 @@ export default function LandingPage() {
                   whiteSpace: 'pre-line',
                 }}
               >
-                {aboutPrathamText}
+                {aboutPrathamLearningPlatformText}
               </Typography>
             </Grid>
           </Grid>

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

@@ -144,6 +144,7 @@ const EditProfile = ({ completeProfile, enrolledProgram, uponEnrollCompletion }:
         delete responseFormForEnroll?.schema?.properties?.district;
         delete responseFormForEnroll?.schema?.properties?.block;
         delete responseFormForEnroll?.schema?.properties?.village;
+        delete responseFormForEnroll?.schema?.properties?.consent_file;
         responseFormForEnroll?.schema?.required?.pop('batch');
 
         const responseFormCopy = JSON.parse(JSON.stringify(responseForm));

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

@@ -9,17 +9,24 @@ import {
   Menu,
   MenuItem,
   IconButton,
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogActions,
+  Button,
 } from '@mui/material';
 import { useEffect, useState } from 'react';
 import settingImage from '../../../public/images/settings.png';
 import Image from 'next/image';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
+import VisibilityIcon from '@mui/icons-material/Visibility';
 import { useRouter } from 'next/navigation';
 import { getUserDetails } from '@learner/utils/API/userService';
 import { Loader, useTranslation } from '@shared-lib';
 import { isUnderEighteen, toPascalCase } from '@learner/utils/helper';
 import { fetchForm } from '@shared-lib-v2/DynamicForm/components/DynamicFormCallback';
 import { FormContext } from '@shared-lib-v2/DynamicForm/components/DynamicFormConstant';
+import DocumentViewer from '@shared-lib-v2/DynamicForm/components/DocumentViewer/DocumentViewer';
 
 // Helper function to get field value from userData based on schema
 const getFieldValue = (fieldName: string, fieldSchema: Record<string, unknown>, userData: Record<string, unknown>, customFields: Array<Record<string, unknown>> = []) => {
@@ -104,6 +111,9 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
   const [formSchema, setFormSchema] = useState<Record<string, unknown> | null>(null); // Form schema state
   const { t } = useTranslation();
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
+  const [previewUrl, setPreviewUrl] = useState<string | null>(null);
+  const [isPreviewOpen, setIsPreviewOpen] = useState(false);
+  const [previewTitle, setPreviewTitle] = useState<string>('');
 
   const storedConfig =
     typeof window !== 'undefined'
@@ -184,6 +194,39 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
     setAnchorEl(null);
   };
 
+  const handlePreview = (url: string, title: string) => {
+    setPreviewUrl(url);
+    setPreviewTitle(title);
+    setIsPreviewOpen(true);
+  };
+
+  const handleClosePreview = () => {
+    setIsPreviewOpen(false);
+    setPreviewUrl(null);
+    setPreviewTitle('');
+  };
+
+  // Helper function to check if a field is a file field
+  const isFileField = (fieldSchema: Record<string, unknown>): boolean => {
+    return (
+      fieldSchema?.field_type === 'file_upload' ||
+      fieldSchema?.field_type === 'file' ||
+      fieldSchema?.type === 'array' && (fieldSchema?.items as Record<string, unknown>)?.type === 'string' && 
+      ((fieldSchema?.items as Record<string, unknown>)?.format === 'data-url' || (fieldSchema?.items as Record<string, unknown>)?.format === 'uri')
+    );
+  };
+
+  // Helper function to check if a value is a valid URL
+  const isValidUrl = (value: unknown): boolean => {
+    if (typeof value !== 'string') return false;
+    try {
+      const url = new URL(value);
+      return url.protocol === 'http:' || url.protocol === 'https:';
+    } catch {
+      return false;
+    }
+  };
+
   const handleOpen = (option: string) => {
     console.log(option);
     if (option === t('LEARNER_APP.USER_PROFILE_CARD.EDIT_PROFILE')) {
@@ -586,13 +629,46 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
                 {otherSectionFields.map((field) => {
                   const fieldTitle = (field.schema.title as string) || field.name;
                   const labelKey = `FORM.${fieldTitle}`;
+                  const isFile = isFileField(field.schema);
+                  const hasValidUrl = isValidUrl(field.rawValue);
 
                   return (
                     <Grid item xs={6} key={field.name}>
                       <Typography sx={labelStyle}>
                         {t(labelKey, { defaultValue: toPascalCase(String(fieldTitle).replace(/_/g, ' ')) })}
                       </Typography>
-                      <Typography sx={valueStyle}>{t(`FORM.${String(field.value).toUpperCase()}`, { defaultValue: toPascalCase(String(field.value)) })}</Typography>
+                      {isFile && hasValidUrl ? (
+                        <Box 
+                          sx={{ 
+                            display: 'flex', 
+                            alignItems: 'center', 
+                            gap: 0.5,
+                            cursor: 'pointer',
+                            '&:hover': {
+                              '& .view-text': {
+                                textDecoration: 'underline',
+                              }
+                            }
+                          }}
+                          onClick={() => handlePreview(String(field.rawValue), fieldTitle)}
+                        >
+                          <VisibilityIcon sx={{ fontSize: '1rem', color: 'primary.main' }} />
+                          <Typography 
+                            className="view-text"
+                            sx={{ 
+                              ...valueStyle, 
+                              color: 'primary.main',
+                              fontWeight: 500
+                            }}
+                          >
+                            {t('VIEW_FILE', { defaultValue: 'View File' })}
+                          </Typography>
+                        </Box>
+                      ) : (
+                        <Typography sx={valueStyle}>
+                          {t(`FORM.${String(field.value).toUpperCase()}`, { defaultValue: toPascalCase(String(field.value)) })}
+                        </Typography>
+                      )}
                     </Grid>
                   );
                 })}
@@ -637,6 +713,56 @@ const UserProfileCard = ({ maxWidth = '600px' }) => {
       >
         Open PDF
       </a> */}
+
+      {/* File Preview Dialog */}
+      <Dialog
+        open={isPreviewOpen}
+        onClose={handleClosePreview}
+        maxWidth="lg"
+        fullWidth
+        PaperProps={{
+          sx: {
+            height: '90vh',
+            maxHeight: '90vh',
+          },
+        }}
+      >
+        <DialogTitle>
+          {t('FILE_PREVIEW', { defaultValue: 'File Preview' })} - {t(`FORM.${previewTitle}`, { defaultValue: toPascalCase(String(previewTitle).replace(/_/g, ' ')) })}
+        </DialogTitle>
+        <DialogContent
+          sx={{
+            p: 0,
+            display: 'flex',
+            flexDirection: 'column',
+            overflow: 'hidden',
+          }}
+        >
+          {previewUrl && (
+            <DocumentViewer
+              url={previewUrl}
+              width="100%"
+              height="100%"
+              showError={true}
+              showDownloadButton={false}
+            />
+          )}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={handleClosePreview}>{t('COMMON.CLOSE', { defaultValue: 'Close' })}</Button>
+          {/* {previewUrl && (
+            <Button
+              variant="contained"
+              href={previewUrl}
+              download
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {t('COMMON.DOWNLOAD', { defaultValue: 'Download' })}
+            </Button> */}
+          
+        </DialogActions>
+      </Dialog>
     </Box>
   );
 };

apps/teachers/public/locales/en/common.json

@@ -52,6 +52,9 @@
     "CLOSE": "Close",
     "CANCEL": "Cancel",
     "OK": "OK",
+    "VIEW_FILE": "View File",
+    "FILE_PREVIEW": "File Preview",
+    "DOWNLOAD": "Download",
     "FROM_TO_DATE": "From - To dates",
     "REMOVE": "Remove",
     "SEND_REQUEST": "Send Request",

libs/shared-lib-v2/src/DynamicForm/components/DocumentViewer/DocumentViewer.tsx

@@ -31,13 +31,15 @@ interface DocumentViewerProps {
   width?: string | number;
   height?: string | number;
   showError?: boolean;
+  showDownloadButton?: boolean;
 }
 
 const DocumentViewer: React.FC<DocumentViewerProps> = ({
   url,
   width = '100%',
   height = '600px',
   showError = true,
+  showDownloadButton = true,
 }) => {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
@@ -626,16 +628,18 @@ const DocumentViewer: React.FC<DocumentViewerProps> = ({
               </>
             )}
           </Box>
-          <IconButton
-            size="small"
-            href={url}
-            download
-            target="_blank"
-            rel="noopener noreferrer"
-            title="Download"
-          >
-            <Download />
-          </IconButton>
+          {showDownloadButton && (
+            <IconButton
+              size="small"
+              href={url}
+              download
+              target="_blank"
+              rel="noopener noreferrer"
+              title="Download"
+            >
+              <Download />
+            </IconButton>
+          )}
         </Box>
       )}