@campxdev/shared 1.11.51 → 1.11.53

package/package.json

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

package/src/components/ActivityLog/ActivityLog.tsx

@@ -8,6 +8,7 @@ import { Box, SxProps, Typography } from '@mui/material'
 import moment from 'moment'
 import { useCallback, useRef } from 'react'
 import { useInfiniteQuery } from 'react-query'
+import { NoDataIllustration } from '..'
 import axios from '../../config/axios'
 import { useErrorModal } from '../ErrorModalWrapper/ErrorModalWrapper'
 import Spinner from '../Spinner'
@@ -22,19 +23,22 @@ import {
 interface Props {
   endPoint: string
   tableView: boolean
+  enableTitle?: boolean
+  params: any
   sx?: SxProps
 }
 
-export default function ActivityLog({ endPoint, tableView, sx }: Props) {
+export default function ActivityLog({
+  endPoint,
+  tableView,
+  enableTitle,
+  params,
+  sx,
+}: Props) {
   const errorModal = useErrorModal()
   const fetchActivities = async ({ pageParam = 0 }) => {
     try {
-      const response = await axios.get(endPoint, {
-        params: {
-          limit: 30,
-          // nextToken: pageParam,
-        },
-      })
+      const response = await axios.get(endPoint, { params: { ...params } })
       return response.data
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -46,17 +50,33 @@ export default function ActivityLog({ endPoint, tableView, sx }: Props) {
   const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isLoading } =
     useInfiniteQuery('activities', fetchActivities, {
       getNextPageParam: (lastPage) => {
-        return lastPage.length ? lastPage[lastPage.length - 1].id : null
+        return lastPage?.length ? lastPage[lastPage?.length - 1].id : null
       },
     })
 
-  const activitesData = data ? data.pages.flatMap((page) => page) : []
+  const activitesData = data ? data?.pages.flatMap((page) => page) : []
 
   if (isLoading) return <Spinner />
 
+  if (data.pages.length === 0 || !activitesData.length) {
+    return (
+      <NoDataIllustration
+        imageSrc=""
+        message={
+          <Typography
+            variant="h6"
+            style={{ textAlign: 'center', marginTop: '20px' }}
+          >
+            {'No data found'}
+          </Typography>
+        }
+      />
+    )
+  }
+
   return (
     <Box>
-      {!tableView && (
+      {enableTitle && (
         <Typography
           variant="h1"
           sx={{ fontSize: '18px', fontWeight: 700, margin: '20px' }}
@@ -134,7 +154,7 @@ export const TimeLineComponent = ({
 
   return (
     <Timeline sx={{ padding: 0, margin: 0 }}>
-      {activitesData.map((item, index, items) => (
+      {activitesData?.map((item, index, items) => (
         <Box
           key={index}
           ref={items.length - 1 === index ? lastItemRef : null}
@@ -167,12 +187,23 @@ export const TimeLineComponent = ({
               <Box>
                 <Typography variant="subtitle2" sx={{ fontSize: '14px' }}>
                   {moment
-                    .utc(item.timestamp)
+                    .utc(item?.timestamp)
                     .local()
                     .format('DD MMM YYYY - hh:mm A')}
                 </Typography>
-                <Typography sx={{ fontSize: '16px' }} variant="body1">
-                  {item.message}
+                <Typography sx={{ fontSize: '16px' }} variant="subtitle1">
+                  {item?.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>
                 <Typography
                   style={{
@@ -182,10 +213,10 @@ export const TimeLineComponent = ({
                   }}
                 >
                   <StyledAvatar>
-                    {item.userName.charAt(0).toUpperCase()}
+                    {item?.userName.charAt(0).toUpperCase()}
                   </StyledAvatar>
                   <Typography sx={{ fontSize: '13px', fontWeight: 900 }}>
-                    {item.userName}
+                    {item?.userName}
                   </Typography>
                 </Typography>
               </Box>

package/src/components/SwitchButton.tsx

@@ -6,6 +6,7 @@ interface SwicthButtonProps {
   checked: boolean
   onChange: (v: any) => void
   subtitle?: ReactNode
+  disabled?: boolean
 }
 
 export default function SwitchButton({
@@ -13,13 +14,17 @@ export default function SwitchButton({
   checked,
   onChange,
   subtitle,
+  disabled,
 }: SwicthButtonProps) {
   return (
     <StyledBox>
       <Box sx={{ display: 'flex', alignItems: 'center', gap: '1rem' }}>
-        <Typography variant="body1">{label}</Typography>
+        <Typography variant="body1" color={disabled ? 'grey' : 'black'}>
+          {label}
+        </Typography>
         <Switch
           checked={checked}
+          disabled={disabled}
           onChange={(e, checked) => onChange(checked)}
         />
       </Box>

package/src/shared-state/PermissionsStore.ts

@@ -1215,6 +1215,18 @@ export enum Permission {
   CAN_RESULTS_PROCESSING_PUBLISH_RESULTS = 'can_results_processing_publish_results',
   CAN_RESULTS_PROCESSING_UPDATE_INTERNAL_MARKS = 'can_results_processing_update_internal_marks',
 
+  //Blocked Students
+  CAN_BLOCKED_STUDENTS_VIEW = 'can_blocked_students_view',
+  CAN_BLOCKED_STUDENTS_ADD = 'can_blocked_students_add',
+  CAN_BLOCKED_STUDENTS_IMPORT = 'can_blocked_students_import',
+  CAN_BLOCKED_STUDENTS_DELETE = 'can_blocked_students_delete',
+  //student grades
+  CAN_STUDENTS_GRADES_VIEW = 'can_students_grades_view',
+  CAN_STUDENTS_GRADES_IMPORT = 'can_students_grades_import',
+  //student memos
+  CAN_STUDENTS_MEMOS_VIEW = 'can_students_memos_view',
+  CAN_STUDENTS_MEMOS_GENERATE = 'can_students_memos_generate',
+
   // Revaluation Fee Configuration
   CAN_REVALUATION_FEE_CONFIGURATION_VIEW = 'can_revaluation_fee_configuration_view',
   CAN_REVALUATION_FEE_CONFIGURATION_ADD = 'can_revaluation_fee_configuration_add',
@@ -1264,6 +1276,12 @@ export enum Permission {
   CAN_EVALUATORS_EDIT = 'can_evaluators_edit',
   CAN_EVALUATORS_DELETE = 'can_evaluators_delete',
 
+  //Grade Templates
+  CAN_GRADE_TEMPLATES_VIEW = 'can_grade_templates_view',
+  CAN_GRADE_TEMPLATES_ADD = 'can_grade_templates_add',
+  CAN_GRADE_TEMPLATES_EDIT = 'can_grade_templates_edit',
+  CAN_GRADE_TEMPLATES_DELETE = 'can_grade_templates_delete',
+
   // Grades
   CAN_GRADES_ADD = 'can_grades_add',
   CAN_GRADES_EDIT = 'can_grades_edit',