@campxdev/shared 1.11.63 → 1.11.65

package/package.json

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

package/src/components/ActivityLog/ActivityLog.tsx

@@ -226,10 +226,10 @@ export const TimeLineComponent = ({
                   }}
                 >
                   <StyledAvatar>
-                    {item?.fullName.charAt(0).toUpperCase()}
+                    {item?.userName.charAt(0).toUpperCase()}
                   </StyledAvatar>
                   <Typography sx={{ fontSize: '13px', fontWeight: 900 }}>
-                    {item?.fullName}
+                    {item?.userName}
                   </Typography>
                 </Typography>
               </Box>

package/src/components/Layout/SideNav.tsx

@@ -9,7 +9,7 @@ import {
 import { Store } from 'pullstate'
 import { ReactNode, memo } from 'react'
 import { Link, useMatch, useResolvedPath } from 'react-router-dom'
-import { PermissionsStore } from '../../shared-state'
+import { PermissionsStore, UserStore } from '../../shared-state'
 import {
   ListItemButton,
   StyledChevronIcon,
@@ -23,14 +23,24 @@ const checkHasAccess = (
   permissionKey,
   institutionType,
   permissions,
+  checkIsMasterInstitution,
+  masterInstitutionUniqueId,
+  isMasterInstitution,
+  user,
 ) => {
   if (checkForMasterSlave) {
-    return permissions[permissionKey] && institutionType == 'MASTER_CHILD'
-      ? true
-      : false
-  } else {
-    return permissionKey ? permissions[permissionKey] : true
+    if (institutionType == 'MASTER_CHILD') {
+      if (checkIsMasterInstitution) {
+        return (
+          permissions[permissionKey] &&
+          user.institutionIds.includes(masterInstitutionUniqueId) &&
+          isMasterInstitution
+        )
+      }
+      return permissionKey ? permissions[permissionKey] : true
+    }
   }
+  return permissionKey ? permissions[permissionKey] : true
 }
 
 const sideNavStore = new Store({
@@ -73,17 +83,30 @@ const RenderMenuItem = ({ menuItem }) => {
     title,
     icon,
     permissionKey,
-    checkForMasterSlave = false,
+    checkForMasterSlave,
+    checkIsMasterInstitution,
   } = menuItem
+
   let resolved = useResolvedPath(path)
   let match = useMatch({ path: resolved.pathname, end: false })
 
-  const { permissions, institutionType } = PermissionsStore.useState((s) => s)
+  const {
+    permissions,
+    institutionType,
+    masterInstitutionUniqueId,
+    isMasterInstitution,
+  } = PermissionsStore.useState((s) => s)
+  const { user } = UserStore.useState((s) => s)
+
   const hasAccess = checkHasAccess(
     checkForMasterSlave,
     permissionKey,
     institutionType,
     permissions,
+    checkIsMasterInstitution,
+    masterInstitutionUniqueId,
+    isMasterInstitution,
+    user,
   )
 
   if (children?.length)
@@ -126,7 +149,13 @@ const RenderMenuItem = ({ menuItem }) => {
 
 const DropDownMenu = ({ path, title, icon, menuItems }) => {
   const { activeKey } = sideNavStore.useState((s) => s)
-  const { permissions, institutionType } = PermissionsStore.useState((s) => s)
+  const {
+    permissions,
+    institutionType,
+    masterInstitutionUniqueId,
+    isMasterInstitution,
+  } = PermissionsStore.useState((s) => s)
+  const { user } = UserStore.useState((s) => s)
 
   const validateDropdownAccess = () => {
     if (process.env.NODE_ENV === 'development' && !permissions) return true
@@ -138,6 +167,10 @@ const DropDownMenu = ({ path, title, icon, menuItems }) => {
             item?.permissionKey,
             institutionType,
             permissions,
+            item?.checkIsMasterInstitution,
+            masterInstitutionUniqueId,
+            isMasterInstitution,
+            user,
           )
         : accessIfNoKey,
     )

package/src/hooks/useAuth.ts

@@ -236,6 +236,7 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           s.isMasterInstitutionUser = res.data?.institutions
             ?.map((institution) => institution?.id)
             ?.includes(res?.data?.masterInstitutionUniqueId)
+          s.isMasterInstitution = res.data?.isMasterInstitution
           s.isHomePageEnabled = res.data?.isHomePageEnabled
         })
         AssetsStore.update((s) => {

package/src/permissions/ValidateAccess.tsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import { UserStore } from '../shared-state'
 import {
   EnrollPermissions,
   Permission,
@@ -10,17 +11,30 @@ export default function ValidateAccess({
   accessKey,
   children,
   checkForMasterSlave = false,
+  checkIsMasterInstitution = false,
 }: {
   accessKey: Permission | SquarePermissions | EnrollPermissions
   children: React.ReactNode
   checkForMasterSlave?: boolean
+  checkIsMasterInstitution?: boolean
 }) {
-  const { permissions, institutionType } = PermissionsStore.useState((s) => s)
+  const {
+    permissions,
+    institutionType,
+    masterInstitutionUniqueId,
+    isMasterInstitution,
+  } = PermissionsStore.useState((s) => s)
+
+  const { user } = UserStore.useState((s) => s)
   const hasAccess = checkHasAccess(
     checkForMasterSlave,
     accessKey,
     institutionType,
     permissions,
+    checkIsMasterInstitution,
+    isMasterInstitution,
+    masterInstitutionUniqueId,
+    user,
   )
 
   if (hasAccess) {
@@ -34,12 +48,22 @@ const checkHasAccess = (
   accessKey,
   institutionType,
   permissions,
+  checkIsMasterInstitution,
+  isMasterInstitution,
+  masterInstitutionUniqueId,
+  user,
 ) => {
   if (checkForMasterSlave) {
-    return permissions[accessKey] && institutionType == 'MASTER_CHILD'
-      ? true
-      : false
-  } else {
-    return accessKey ? permissions[accessKey] : true
+    if (institutionType == 'MASTER_CHILD') {
+      if (checkIsMasterInstitution) {
+        return (
+          permissions[accessKey] &&
+          user.institutionIds.includes(masterInstitutionUniqueId) &&
+          isMasterInstitution
+        )
+      }
+      return accessKey ? permissions[accessKey] : true
+    }
   }
+  return accessKey ? permissions[accessKey] : true
 }