@campxdev/shared 1.11.59 → 1.11.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.11.59",
+  "version": "1.11.61",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/ActivityLog/ActivityLog.tsx

@@ -138,6 +138,19 @@ const columns = [
     title: 'Message',
     dataIndex: 'message',
     key: 'message',
+    render: (message) => (
+      <Typography sx={{ fontSize: '16px' }} variant="subtitle1">
+        {message?.split("'").map((text: string, index: number) =>
+          index % 2 === 0 ? (
+            <span key={index}>{text}</span>
+          ) : (
+            <Typography key={index} sx={{ display: 'inline', fontWeight: 900 }}>
+              {text}
+            </Typography>
+          ),
+        )}
+      </Typography>
+    ),
   },
 ]
 
@@ -213,10 +226,10 @@ export const TimeLineComponent = ({
                   }}
                 >
                   <StyledAvatar>
-                    {item?.userName.charAt(0).toUpperCase()}
+                    {item?.fullName.charAt(0).toUpperCase()}
                   </StyledAvatar>
                   <Typography sx={{ fontSize: '13px', fontWeight: 900 }}>
-                    {item?.userName}
+                    {item?.fullName}
                   </Typography>
                 </Typography>
               </Box>

package/src/components/Layout/LayoutWrapper.tsx

@@ -29,7 +29,7 @@ export default function LayoutWrapper({
   }
   return (
     <ErrorBoundary>
-      {!permissions.isHomePageEnabled && (
+      {window.innerWidth > 1024 && !permissions.isHomePageEnabled && (
         <StyledLeftNavContainer>
           <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
         </StyledLeftNavContainer>
@@ -49,22 +49,18 @@ export default function LayoutWrapper({
             : 'calc(100vh - 64px)',
         }}
       >
-        <>
-          <IconButton
-            color="inherit"
-            aria-label="open drawer"
-            onClick={handleDrawer}
-            edge="start"
-            sx={{
-              mr: 0.5,
-              ['@media (min-width: 760px)']: {
-                display: 'none',
-              },
-            }}
-          >
-            <MenuIcon />
-          </IconButton>
-          {/* <Button
+        {window.innerWidth < 1024 && (
+          <>
+            <IconButton
+              color="inherit"
+              aria-label="open drawer"
+              onClick={handleDrawer}
+              edge="start"
+              sx={{ mr: 0.5 }}
+            >
+              <MenuIcon />
+            </IconButton>
+            {/* <Button
             onClick={() => {
               console.log('hi')
             }}
@@ -73,16 +69,16 @@ export default function LayoutWrapper({
           >
             <MenuIcon />
           </Button> */}
-          <StyledDrawer
-            variant={'temporary'}
-            anchor="left"
-            open={open}
-            onClose={handleDrawer}
-          >
-            <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
-          </StyledDrawer>
-        </>
-
+            <StyledDrawer
+              variant={'temporary'}
+              anchor="left"
+              open={open}
+              onClose={handleDrawer}
+            >
+              <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
+            </StyledDrawer>
+          </>
+        )}
         <ErrorBoundary>{children}</ErrorBoundary>
       </StyledMainContentContainer>
     </ErrorBoundary>

package/src/layouts/Components/styles.tsx

@@ -48,18 +48,19 @@ export const StyledLeftNavContainer = muiStyled('aside')(({ theme }) => ({
   },
 
   zIndex: 100,
-
-  ['@media (max-width: 760px)']: {
-    display: 'none',
-  },
 }))
 
 export const StyledMainContentContainer = muiStyled('main')(() => ({
-  width: `calc(100% - ${sideNavWidth})`,
+  width:
+    window.innerWidth > 1024
+      ? `calc(100% - ${sideNavWidth})`
+      : '100% !important',
   height: `calc(100vh - ${headerHeight})`,
   position: 'fixed',
   top: headerHeight,
-  left: sideNavWidth,
+  left: window.innerWidth > 1024 ? sideNavWidth : 0,
+  right: window.innerWidth > 1024 ? 'unset' : 0,
+  bottom: window.innerWidth > 1024 ? 'unset' : 0,
   overflowY: 'auto',
 
   '&::-webkit-scrollbar': {
@@ -75,13 +76,6 @@ export const StyledMainContentContainer = muiStyled('main')(() => ({
     },
   },
 
-  ['@media (max-width: 760px)']: {
-    left: 0,
-    right: 0,
-    bottom: 0,
-    width: '100% !important',
-  },
-
   // '&::-webkit-scrollbar': {
   //   width: '0.6em',
   //   height: '0.6em',

package/src/shared-state/PermissionsStore.ts

@@ -1186,6 +1186,11 @@ export enum Permission {
   CAN_D_FORM_ADD = 'can_d_forms_add',
   CAN_D_FORM_DOWNLOAD = 'can_d_forms_download',
 
+  // D Form Internal Exam
+  CAN_INTERNAL_EXAM_D_FORM_VIEW = 'can_internal_exam_d_forms_view',
+  CAN_INTERNAL_EXAM_D_FORM_ADD = 'can_internal_exam_d_forms_add',
+  CAN_INTERNAL_EXAM_D_FORM_DOWNLOAD = 'can_internal_exam_d_forms_download',
+
   // Bundling
   CAN_VIEW_ANSWER_SHEET_REPORT = 'can_view_answer_sheet_report',
   CAN_BUNDLING_VIEW = 'can_bundling_view',
@@ -1398,6 +1403,13 @@ export enum Permission {
   CAN_CONFIGURE_FEEDBACK_FORM = 'can_configure_feedback_form',
   CAN_CHANGE_FEEDBACK_STATUS = 'can_change_feedback_status',
 
+  // FACILITY Feedback
+  VIEW_FACILITY_FEEDBACKS = 'can_view_facility_feedbacks',
+  CREATE_FACILITY_FEEDBACK = 'can_create_facility_feedback',
+  MANAGE_TARGET_AUDIENCE_FACILITY = 'can_manage_target_audience_facility',
+  CONFIGURE_FEEDBACK_FORM_FACILITY = 'can_configure_feedback_form_facility',
+  CHANGE_FEEDBACK_STATUS_FACILITY = 'can_change_feedback_status_facility',
+
   //Feedback Questions
   CAN_VIEW_FEEDBACK_QUESTIONS = 'can_view_feedback_questions',
   CAN_CREATE_FEEDBACK_QUESTION = 'can_create_feedback_question',
@@ -1856,6 +1868,9 @@ export interface IPermissions {
   can_d_forms_view: boolean
   can_d_forms_add: boolean
   can_d_forms_download: boolean
+  can_internal_d_forms_view: boolean
+  can_internal_d_forms_add: boolean
+  can_internal_d_forms_download: boolean
   can_view_answer_sheet_report: boolean
   can_bundling_view: boolean
   can_bundling_add: boolean