@campxdev/shared 1.11.48 → 1.11.50

package/package.json

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

package/src/components/ActivityLog/ActivityLog.tsx

@@ -5,9 +5,10 @@ import {
   TimelineSeparator,
 } from '@mui/lab'
 import { Box, SxProps, Typography } from '@mui/material'
-import axios from 'axios'
+import moment from 'moment'
 import { useCallback, useRef } from 'react'
 import { useInfiniteQuery } from 'react-query'
+import axios from '../../config/axios'
 import { useErrorModal } from '../ErrorModalWrapper/ErrorModalWrapper'
 import Spinner from '../Spinner'
 import Table from '../Tables/BasicTable/Table'
@@ -30,11 +31,11 @@ export default function ActivityLog({ endPoint, tableView, sx }: Props) {
     try {
       const response = await axios.get(endPoint, {
         params: {
-          limit: 4,
-          skip: pageParam,
+          limit: 30,
+          // nextToken: pageParam,
         },
       })
-      return response.data.posts
+      return response.data
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error)
@@ -55,12 +56,14 @@ export default function ActivityLog({ endPoint, tableView, sx }: Props) {
 
   return (
     <Box>
-      <Typography
-        variant="h1"
-        sx={{ fontSize: '18px', fontWeight: 700, margin: '20px' }}
-      >
-        Activity Log
-      </Typography>
+      {!tableView && (
+        <Typography
+          variant="h1"
+          sx={{ fontSize: '18px', fontWeight: 700, margin: '20px' }}
+        >
+          Activity Log
+        </Typography>
+      )}
 
       {!tableView ? (
         <Box
@@ -94,10 +97,28 @@ export default function ActivityLog({ endPoint, tableView, sx }: Props) {
 }
 
 const columns = [
-  { title: 'Date', dataIndex: 'date', key: 'date' },
-  { title: 'Time', dataIndex: 'time', key: 'time' },
-  { title: 'Message', dataIndex: 'message', key: 'message' },
-  { title: 'User', dataIndex: 'userName', key: 'userName' },
+  {
+    title: 'Date',
+    dataIndex: 'timestamp',
+    key: 'timestamp',
+    render: (timestamp) =>
+      moment.utc(timestamp).local().format('DD MMM YYYY - hh:mm A'),
+  },
+  {
+    title: 'Action',
+    dataIndex: 'action',
+    key: 'action',
+  },
+  {
+    title: 'User Name',
+    dataIndex: 'userName',
+    key: 'userName',
+  },
+  {
+    title: 'Message',
+    dataIndex: 'message',
+    key: 'message',
+  },
 ]
 
 export const TimeLineComponent = ({
@@ -107,7 +128,7 @@ export const TimeLineComponent = ({
   fetchNextPage,
   sx,
 }) => {
-  const lastItemRef = useIntersectionObserver<HTMLElement>(() => {
+  const lastItemRef = useIntersectionObserver<HTMLDivElement>(() => {
     if (!isFetchingNextPage && hasNextPage) fetchNextPage()
   })
 
@@ -134,7 +155,7 @@ export const TimeLineComponent = ({
                 <Box
                   sx={{
                     width: '1px',
-                    height: '110px',
+                    height: '115%',
                     bgcolor: '#12121233',
                     position: 'absolute',
                     top: '25px',
@@ -142,21 +163,16 @@ export const TimeLineComponent = ({
                 />
               )}
             </TimelineSeparator>
-            <TimelineContent sx={{ padding: '6px 10px' }}>
+            <TimelineContent sx={{ padding: '6px 8px' }}>
               <Box>
                 <Typography variant="subtitle2" sx={{ fontSize: '14px' }}>
-                  {`${Math.floor(Math.random() * 30) + 1} ${
-                    Math.random() > 0.5 ? 'June' : 'July'
-                  }, 2023`}{' '}
-                  -{' '}
-                  {`${Math.floor(Math.random() * 12) + 1}:${
-                    Math.floor(Math.random() * 60) + 1
-                  } ${Math.random() > 0.5 ? 'AM' : 'PM'}`}
-                  {/* {item.date} - {item.time} */}
+                  {moment
+                    .utc(item.timestamp)
+                    .local()
+                    .format('DD MMM YYYY - hh:mm A')}
                 </Typography>
                 <Typography sx={{ fontSize: '16px' }} variant="body1">
-                  {item.title}
-                  {/* {item.message} */}
+                  {item.message}
                 </Typography>
                 <Typography
                   style={{
@@ -166,15 +182,10 @@ export const TimeLineComponent = ({
                   }}
                 >
                   <StyledAvatar>
-                    {'John Doe'
-                      .split(' ')
-                      .map((n) => n[0])
-                      .join('')
-                      .toUpperCase()}
+                    {item.userName.charAt(0).toUpperCase()}
                   </StyledAvatar>
                   <Typography sx={{ fontSize: '13px', fontWeight: 900 }}>
-                    {`John Doe ${item.id}`}
-                    {/* {item.userName} */}
+                    {item.userName}
                   </Typography>
                 </Typography>
               </Box>
@@ -191,7 +202,9 @@ export const TimeLineComponent = ({
   )
 }
 
-function useIntersectionObserver<T extends HTMLElement>(callback: () => void) {
+function useIntersectionObserver<T extends HTMLDivElement>(
+  callback: () => void,
+) {
   const observer = useRef<IntersectionObserver | null>(null)
 
   const handleObserver = useCallback(

package/src/components/ActivityLog/Styles.tsx

@@ -25,7 +25,6 @@ export const StyledAvatar = styled(Avatar)(({ theme }) => ({
   width: 30,
   height: 30,
   marginRight: '8px',
-  backgroundColor: theme.palette.primary.main,
   fontSize: '14px',
 }))
 
@@ -33,5 +32,4 @@ export const StyledSpinnerBox = styled(Box)({
   display: 'flex',
   justifyContent: 'center',
   alignItems: 'center',
-  padding: '20px',
 })

package/src/components/ActivityLog/index.ts

@@ -0,0 +1 @@
+export { default } from './ActivityLog'

package/src/components/UploadFileDialog/UploadFileDialog.tsx

@@ -84,7 +84,7 @@ interface UploadFileDialogProps {
   successMessage?: string
   refetchFn?: (res: any) => void
   onUpload?: () => void
-  postBody?: { [key: string]: string }
+  postBody?: { [key: string]: string | any }
   type?: UploadButtonProps['type']
 }
 

package/src/components/index.ts

@@ -1,3 +1,4 @@
+import ActivityLog from './ActivityLog'
 import ApplicationProfile from './ApplicationProfile'
 import ChangePassword from './ChangePassword'
 import Chips from './Chips'
@@ -72,6 +73,7 @@ export { default as ReactTable } from './Tables/ReactTable'
 export { default as Tabs } from './Tabs/Tabs'
 export { default as ToastContainer } from './ToastContainer'
 export {
+  ActivityLog,
   AppHeader,
   ApplicationProfile,
   AsyncSearchSelect,

package/src/shared-state/PermissionsStore.ts

@@ -502,6 +502,20 @@ export enum ExamsPermissions {
   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_REVAULATION_FEE_CONFIGURATION_ADD = 'can_revaluation_fee_configuration_add',
@@ -541,6 +555,12 @@ export enum ExamsPermissions {
   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',
@@ -1836,6 +1856,14 @@ export interface IPermissions {
   can_results_processing_moderation_and_grafting: boolean
   can_results_processing_generate_memos: boolean
   can_results_processing_publish_results: boolean
+  can_blocked_students_view: boolean
+  can_blocked_students_add: boolean
+  can_blocked_students_import: boolean
+  can_blocked_students_delete: boolean
+  can_students_grades_view: boolean
+  can_students_grades_import: boolean
+  can_students_memos_view: boolean
+  can_students_memos_generate: boolean
   can_revaluation_fee_configuration_view: boolean
   can_revaluation_fee_configuration_add: boolean
   can_revaluation_view: boolean
@@ -1860,6 +1888,10 @@ export interface IPermissions {
   can_evaluators_add: boolean
   can_evaluators_edit: boolean
   can_evaluators_delete: boolean
+  can_grade_templates_view: boolean
+  can_grade_templates_add: boolean
+  can_grade_templates_edit: boolean
+  can_grade_templates_delete: boolean
   can_grades_view: boolean
   can_grades_add: boolean
   can_grades_edit: boolean

package/src/utils/getUrlParams.ts

@@ -7,7 +7,9 @@ export default function getUrlParams() {
   return params
 }
 
-export const createSearchParams = (query: { [key: string]: string }) => {
+export const createSearchParams = (query: {
+  [key: string]: string | number
+}) => {
   const searchParams = new URLSearchParams()
 
   for (const key in query) {