@campxdev/shared 1.10.96 → 1.11.0

package/package.json

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

package/src/components/HookForm/RadioGroup.tsx

@@ -10,7 +10,7 @@ interface Props extends RadioGroupProps {
   sx?: any
   row?: boolean
   required?: boolean
-  options: { value: any; label: string | ReactNode }[]
+  options: { value: any; label: string | ReactNode; disabled?: boolean }[]
   containerProps?: BoxProps
 }
 

package/src/components/Input/RadioGroup.tsx

@@ -57,7 +57,7 @@ interface Props extends RadioGroupProps {
   sx?: any
   row?: boolean
   required?: boolean
-  options: { value: any; label: string | ReactNode }[]
+  options: { value: any; label: string | ReactNode; disabled?: boolean }[]
   containerProps?: BoxProps
   error?: boolean
   helperText?: string | null
@@ -97,7 +97,7 @@ export default function RadioGroup(props: Props) {
               <Radio
                 checkedIcon={<BpCheckedIcon />}
                 icon={<BpIcon />}
-                disabled={disabled}
+                disabled={disabled || item.disabled} 
               />
             }
             label={item.label}

package/src/components/Input/SearchSingleSelect.tsx

@@ -83,7 +83,6 @@ export const SearchSingleSelect = ({ options, value, onChange }: Props) => {
       PopperComponent={StyledPopper}
       popupIcon={<KeyboardArrowDown />}
       renderInput={(params) => {
-        console.log(params)
         return (
           <TextField
             inputRef={(input) => {

package/src/components/Layout/SideNav.tsx

@@ -18,6 +18,21 @@ import {
 
 const accessIfNoKey = process.env.NODE_ENV === 'development' ? true : false
 
+const checkHasAccess = (
+  checkForMasterSlave,
+  permissionKey,
+  institutionType,
+  permissions,
+) => {
+  if (checkForMasterSlave) {
+    return permissions[permissionKey] && institutionType == 'MASTER_CHILD'
+      ? true
+      : false
+  } else {
+    return permissionKey ? permissions[permissionKey] : true
+  }
+}
+
 const sideNavStore = new Store({
   activeKey: '',
 })
@@ -52,12 +67,24 @@ const SideNav = ({
 export default memo(SideNav)
 
 const RenderMenuItem = ({ menuItem }) => {
-  const { path, children, title, icon, permissionKey } = menuItem
+  const {
+    path,
+    children,
+    title,
+    icon,
+    permissionKey,
+    checkForMasterSlave = false,
+  } = menuItem
   let resolved = useResolvedPath(path)
   let match = useMatch({ path: resolved.pathname, end: false })
 
-  const permissions = PermissionsStore.useState((s) => s).permissions
-  const hasAccess = permissionKey ? permissions[permissionKey] : accessIfNoKey
+  const { permissions, institutionType } = PermissionsStore.useState((s) => s)
+  const hasAccess = checkHasAccess(
+    checkForMasterSlave,
+    permissionKey,
+    institutionType,
+    permissions,
+  )
 
   if (children?.length)
     return (
@@ -99,13 +126,20 @@ const RenderMenuItem = ({ menuItem }) => {
 
 const DropDownMenu = ({ path, title, icon, menuItems }) => {
   const { activeKey } = sideNavStore.useState((s) => s)
-  const permissions = PermissionsStore.useState((s) => s).permissions
+  const { permissions, institutionType } = PermissionsStore.useState((s) => s)
 
   const validateDropdownAccess = () => {
     if (process.env.NODE_ENV === 'development' && !permissions) return true
 
     return menuItems?.some((item) =>
-      item?.permissionKey ? permissions[item.permissionKey] : accessIfNoKey,
+      item?.permissionKey
+        ? checkHasAccess(
+            item?.checkForMasterSlave,
+            item?.permissionKey,
+            institutionType,
+            permissions,
+          )
+        : accessIfNoKey,
     )
   }
 

package/src/components/ReportHeader.tsx

@@ -1,24 +1,96 @@
 import { Box, SxProps, Typography } from '@mui/material'
 import { Variant } from '@mui/material/styles/createTypography'
+import _ from 'lodash'
+import { PermissionsStore } from '../shared-state'
+import { InstitutionsStore } from '../shared-state/InstitutionsStore'
 
-interface TypographyList {
+export interface ReportHeaderTypographyProps {
   text: string
   sx?: SxProps
   variant?: Variant
+  hide?: boolean
 }
-interface ReportHeaderProps {
-  typographyList?: TypographyList[]
-  logo: any
-  imageSize?: string
+
+export interface ReportHeaderOptionalTypographyProps {
+  text?: string
+  sx?: SxProps
+  variant?: Variant
+  hide?: boolean
+}
+
+export enum ReportHeaderType {
+  FULL_HEADER = 'full-header',
+  LOGO_HEADER = 'logo-header',
+}
+
+ReportHeader.defaultProps = {
+  headerType: ReportHeaderType.FULL_HEADER,
+  address: {
+    hide: false,
+    variant: 'body1',
+  },
+  phone: {
+    hide: false,
+    variant: 'body1',
+  },
+  recognitionDetails: {
+    hide: false,
+    variant: 'h5',
+  },
+}
+
+export interface ReportHeaderProps {
   containerSx?: SxProps
+  headerType?: ReportHeaderType
+  reportHeaderImageUrl?: string
+  reportHeaderImageCSS?: any
+  typographyList?: ReportHeaderTypographyProps[]
+  logoImageUrl?: string
+  logoImageCSS?: any
+  address?: ReportHeaderOptionalTypographyProps
+  recognitionDetails?: ReportHeaderOptionalTypographyProps
+  phone?: ReportHeaderOptionalTypographyProps
 }
 
 export default function ReportHeader({
-  logo,
-  typographyList,
   containerSx,
-  imageSize,
+  headerType,
+  reportHeaderImageUrl,
+  reportHeaderImageCSS,
+  typographyList,
+  logoImageUrl,
+  logoImageCSS,
+  address: {
+    hide: hideAddress,
+    variant: addressVariant,
+    text: addressText,
+    sx: addressSx,
+  },
+  recognitionDetails: {
+    hide: hideRecognitionDetails,
+    variant: recognitionDetailsVariant,
+    text: recognitionDetailsText,
+    sx: recognitionDetailsSx,
+  },
+  phone: {
+    hide: hidePhone,
+    variant: phoneVariant,
+    text: phoneText,
+    sx: phoneSx,
+  },
 }: ReportHeaderProps) {
+  const { masterInstitutionUniqueId, institutionType } =
+    PermissionsStore.useState((s) => ({
+      institutionType: s.institutionType,
+      masterInstitutionUniqueId: s.masterInstitutionUniqueId,
+    }))
+  const { current, institutions } = InstitutionsStore.useState((s) => s)
+  const institutionsMap = _.keyBy(institutions, (institution) => institution.id)
+
+  const masterInstitution = institutionsMap[masterInstitutionUniqueId]
+
+  const hasFullHeader = current?.reportHeader?.url ? true : false
+
   return (
     <Box
       sx={{
@@ -29,17 +101,62 @@ export default function ReportHeader({
         ...containerSx,
       }}
     >
-      <img
-        style={{
-          height: imageSize ? imageSize : '80px',
-          objectFit: 'contain',
-        }}
-        src={logo}
-      />
-
+      {hasFullHeader && headerType === ReportHeaderType.FULL_HEADER ? (
+        <>
+          <img
+            style={{
+              objectFit: 'contain',
+              width: '100%',
+              height: '200px',
+              ...reportHeaderImageCSS,
+            }}
+            src={
+              reportHeaderImageUrl ||
+              current?.reportHeader?.url ||
+              masterInstitution.reportHeader?.url
+            }
+          />
+        </>
+      ) : (
+        <>
+          <img
+            style={{
+              height: '40px',
+              objectFit: 'contain',
+              ...logoImageCSS,
+            }}
+            src={
+              logoImageUrl ||
+              current?.images?.url ||
+              masterInstitution?.images?.url
+            }
+          />
+          {!hideRecognitionDetails && (
+            <Typography
+              variant={recognitionDetailsVariant}
+              sx={recognitionDetailsSx}
+            >
+              {recognitionDetailsText ||
+                current.recognitionDetails ||
+                masterInstitution.recognitionDetails}
+            </Typography>
+          )}
+          {!hideAddress && (
+            <Typography variant={addressVariant} sx={addressSx}>
+              {addressText || current.address || masterInstitution.address}
+            </Typography>
+          )}
+          {!hidePhone && (
+            <Typography variant={phoneVariant} sx={phoneSx}>
+              {'Phone: ' +
+                (phoneText || current.phone || masterInstitution.phone)}
+            </Typography>
+          )}
+        </>
+      )}
       {typographyList &&
         typographyList.map((s) => (
-          <Typography variant={s.variant} sx={{ ...s.sx }}>
+          <Typography variant={s.variant || 'body1'} sx={s.sx}>
             {s.text}
           </Typography>
         ))}

package/src/hooks/useAuth.ts

@@ -229,6 +229,8 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           } as any
           s.applications = res.data?.applications ?? []
           s.institutionType = res.data?.institutionType
+          s.masterInstitutionUniqueId = res.data?.masterInstitutionUniqueId
+          s.masterInstitutionId = res.data?.masterInstitutionId
         })
         AssetsStore.update((s) => {
           s.logo = res.data?.assets.logo

package/src/permissions/ValidateAccess.tsx

@@ -1,12 +1,12 @@
 import React from 'react'
-import { Permission, PermissionsStore } from '../shared-state/PermissionsStore'
+import { Permission, PermissionsStore, SquarePermissions } from '../shared-state/PermissionsStore'
 
 export default function ValidateAccess({
   accessKey,
   children,
   checkForMasterSlave = false,
 }: {
-  accessKey: Permission
+  accessKey: Permission | SquarePermissions
   children: React.ReactNode
   checkForMasterSlave?: boolean
 }) {

package/src/shared-state/PermissionsStore.ts

@@ -8,6 +8,10 @@ export enum PaymentsPermission {
   CAN_MANAGE_PAYMENTS_PROFILE_PERMISSIONS_EDIT = 'can_manage_payments_profile_permissions_edit',
   CAN_MANAGE_PAYMENTS_PROFILE_PERMISSIONS_DELETE = 'can_manage_payments_profile_permissions_delete',
 
+   //Payments imports 
+ CAN_IMPORT_RECEIPTS='can_import_receipts',
+ CAN_IMPORT_CREDITS='can_import_credits',
+
   // Fee Counter
   CAN_FEE_COUNTER_ACADEMIC_FEE = 'can_fee_counter_academic_fee',
   CAN_FEE_COUNTER_EXAM_FEE = 'can_fee_counter_exam_fee',
@@ -559,6 +563,10 @@ export enum Permission {
   CAN_FEE_COUNTER_ACADEMIC_FEE = 'can_fee_counter_academic_fee',
   CAN_FEE_COUNTER_EXAM_FEE = 'can_fee_counter_exam_fee',
 
+   //Payments imports 
+ CAN_IMPORT_RECEIPTS='can_import_receipts',
+ CAN_IMPORT_CREDITS='can_import_credits',
+
   // Fee Groups
   CAN_FEE_GROUP_VIEW = 'can_fee_groups_view',
   CAN_FEE_GROUP_ADD = 'can_fee_groups_add',
@@ -577,7 +585,7 @@ export enum Permission {
   CAN_FEE_STRUCTURE_EDIT = 'can_fee_structure_edit',
   CAN_FEE_STRUCTURE_DELETE = 'can_fee_structure_delete',
 
-  // Fine Configuration
+  // Fine Configurastion
   CAN_FINE_CONFIGURATION_VIEW = 'can_fine_configurations_view',
   CAN_FINE_CONFIGURATION_ADD = 'can_fine_configurations_add',
   CAN_FINE_CONFIGURATION_EDIT = 'can_fine_configurations_edit',
@@ -1432,16 +1440,26 @@ export interface IPermissions {
   can_assessment_templates_edit: boolean
   can_assessment_templates_view: boolean
   can_assessment_templates_delete: boolean
+
+  //
+  can_student_academic_performance_view: boolean
+  can_student_permissions_add: boolean
+  can_student_permissions_edit: boolean
+  can_student_permissions_delete: boolean
 }
 
 interface IPermissionsStore {
   permissions: IPermissions
   applications: string[]
   institutionType: 'MASTER_CHILD' | 'INDIVIDUAL'
+  masterInstitutionUniqueId?: number
+  masterInstitutionId?: string
 }
 
 export const PermissionsStore = new Store<IPermissionsStore>({
   permissions: null,
   applications: [],
   institutionType: null,
+  masterInstitutionUniqueId: null,
+  masterInstitutionId: null,
 })