@campxdev/shared 1.8.11 → 1.8.13

package/package.json

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

package/src/components/ErrorBoundary/ErrorBoundary.tsx

@@ -1,5 +1,8 @@
-import { ReactNode } from 'react'
-import { ErrorBoundary as ReactErrorBoundary } from 'react-error-boundary'
+import { ReactElement, ReactNode } from 'react'
+import {
+  ErrorBoundary as ReactErrorBoundary,
+  FallbackProps,
+} from 'react-error-boundary'
 import { QueryErrorResetBoundary } from 'react-query'
 import { useLocation } from 'react-router-dom'
 import ErrorFallback from './ErrorFallback'
@@ -7,9 +10,11 @@ import ErrorFallback from './ErrorFallback'
 export default function ErrorBoundary({
   children,
   resetKey,
+  customFallback,
 }: {
   children: ReactNode
   resetKey?: string
+  customFallback?: (props: FallbackProps) => JSX.Element
 }) {
   const location = useLocation()
   return (
@@ -17,7 +22,7 @@ export default function ErrorBoundary({
       {({ reset }) => (
         <ReactErrorBoundary
           key={resetKey ?? location?.pathname}
-          fallbackRender={ErrorFallback}
+          fallbackRender={customFallback ?? ErrorFallback}
           onReset={reset}
         >
           {children}

package/src/components/ErrorBoundary/ErrorFallback.tsx

@@ -14,6 +14,7 @@ import { PermissionsStore } from '../../shared-state'
 import axios from '../../config/axios'
 
 const StyledAlert = styled(Alert)(({ theme }) => ({
+  height: '60px',
   border: `1px solid ${theme.palette.error.main}`,
   display: 'flex',
   alignItems: 'center',
@@ -66,7 +67,7 @@ export default function ErrorFallback({ error, resetErrorBoundary }) {
   }
 
   return (
-    <Box sx={{ marginTop: '16px', padding: '16px' }}>
+    <Box sx={{ marginTop: '16px', padding: '20px' }}>
       <StyledAlert severity="error">
         {error?.response?.data?.message ?? error?.message}
         <Button
@@ -139,7 +140,11 @@ export function InternalServer({ resetBoundary, error }) {
           Internal Server Error.
         </Typography>
         <Typography variant="body1">
-          {error?.response?.data?.message}
+          {error?.response?.data?.message
+            ? typeof error?.response?.data?.message === 'string'
+              ? error?.response?.data?.message
+              : JSON.stringify(error?.response?.data?.message)
+            : 'Internal Server Error'}
         </Typography>
         <Button
           size="small"

package/src/shared-state/PermissionsStore.ts

@@ -234,6 +234,8 @@ export enum Permission {
   CAN_INTERNAL_MARKS_VIEW = 'can_internal_marks_view',
   CAN_INTERNAL_MARKS_ADD = 'can_internal_marks_add',
   CAN_INTERNAL_MARKS_EDIT = 'can_internal_marks_edit',
+  CAN_INTERNAL_MARKS_IMPORT = 'can_internal_marks_import',
+  CAN_INTERANL_MARKS_IMPORT_LMS = 'can_internal_marks_import_lms',
 
   // External Marks
   CAN_EXTERNAL_MARKS_VIEW = 'can_external_marks_view',
@@ -261,6 +263,13 @@ export enum Permission {
   CAN_TIME_SLOTS_ADD = 'can_time_slots_add',
   CAN_TIME_SLOTS_EDIT = 'can_time_slots_edit',
   CAN_TIME_SLOTS_DELETE = 'can_time_slots_delete',
+
+  // Grades
+
+  CAN_GRADES_ADD = 'can_grades_add',
+  CAN_GRADES_EDIT = 'can_grades_edit',
+  CAN_GRADES_DELETE = 'can_grades_delete',
+  CAN_GRADES_VIEW = 'can_grades_view',
 }
 
 export interface IPermissions {
@@ -358,6 +367,12 @@ export interface IPermissions {
   can_tasks_delete: boolean
   can_classroom_subject_attendance_edit: boolean
   can_classroom_subjects_view: boolean
+  can_internal_marks_import: boolean
+  can_internal_marks_import_lms: boolean
+  can_grades_add: boolean
+  can_grades_edit: boolean
+  can_grades_delete: boolean
+  can_grades_view: boolean
 }
 
 interface IPermissionsStore {