@campxdev/shared 1.10.95 → 1.10.97

package/package.json

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

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/hooks/useAuth.ts

@@ -223,14 +223,12 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
             can_individual_pages_view: 1,
             can_analatics_view: isAdmin,
             can_admin_view: isAdmin,
-            can_challan_registrations_view:
-              isMasterSlave &&
-              res.data?.permissions.can_challan_registrations_view,
             can_my_mentees_view:
               res.data?.user?.isMentor &&
               res.data?.permissions.can_my_mentees_view,
           } as any
           s.applications = res.data?.applications ?? []
+          s.institutionType = res.data?.institutionType
         })
         AssetsStore.update((s) => {
           s.logo = res.data?.assets.logo

package/src/permissions/ValidateAccess.tsx

@@ -4,15 +4,37 @@ import { Permission, PermissionsStore } from '../shared-state/PermissionsStore'
 export default function ValidateAccess({
   accessKey,
   children,
+  checkForMasterSlave = false,
 }: {
   accessKey: Permission
   children: React.ReactNode
+  checkForMasterSlave?: boolean
 }) {
-  const permissions = PermissionsStore.useState((s) => s).permissions
-  const hasAccess = accessKey ? permissions[accessKey] : true
+  const { permissions, institutionType } = PermissionsStore.useState((s) => s)
+  const hasAccess = checkHasAccess(
+    checkForMasterSlave,
+    accessKey,
+    institutionType,
+    permissions,
+  )
 
   if (hasAccess) {
     return <>{children}</>
   }
   return null
 }
+
+const checkHasAccess = (
+  checkForMasterSlave,
+  accessKey,
+  institutionType,
+  permissions,
+) => {
+  if (checkForMasterSlave) {
+    return permissions[accessKey] && institutionType == 'MASTER_CHILD'
+      ? true
+      : false
+  } else {
+    return accessKey ? permissions[accessKey] : true
+  }
+}

package/src/shared-state/PermissionsStore.ts

@@ -764,6 +764,11 @@ export enum Permission {
   STUDENTS_TRANSFER = 'can_students_transfer',
   STUDENTS_ALLOTMENT = 'can_students_allotment',
   STUDENT_INFO_VIEW = 'can_student_info_view',
+  STUDENT_ACADEMIC_PERFORMANCE_VIEW = 'can_student_academic_performance_view',
+  STUDENT_ATTENDANCE_VIEW = 'can_student_attendance_view',
+  STUDENT_PAYMENTS_VIEW = 'can_student_payments_view',
+  STUDENT_MEMOS_VIEW = 'can_student_memos_view',
+  STUDENT_BACKLOGS_VIEW = 'can_student_backlogs_view',
 
   // Student Certificate
   CAN_STUDENT_CERTIFICATES_VIEW = 'can_student_certificates_view',
@@ -1084,6 +1089,11 @@ export enum Permission {
   CAN_CHALLAN_REGISTRATION_ADD = 'can_challan_registrations_add',
   CAN_CHALLAN_UPLOAD_ADD = 'can_challan_upload_add',
 
+  // Question Paper Upload
+  CAN_QUESTION_PAPER_UPLOAD_VIEW = 'can_question_paper_upload_view',
+  CAN_QUESTION_PAPER_UPLOAD_ADD = 'can_question_paper_upload_add',
+  CAN_QUESTION_PAPER_UPLOAD_EDIT = 'can_question_paper_upload_edit',
+
   //settings
   CAN_EXAMS_SETTINGS_VIEW = 'can_exams_settings_view',
 
@@ -1422,14 +1432,22 @@ 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'
 }
 
 export const PermissionsStore = new Store<IPermissionsStore>({
   permissions: null,
   applications: [],
+  institutionType: null,
 })