@campxdev/shared 1.10.79 → 1.10.81

package/package.json

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

package/src/components/Input/MultiSelect.tsx

@@ -13,7 +13,7 @@ import { BpCheckedIcon, BpIcon } from './SingleCheckbox'
 import TextField from './TextField'
 import { IOption } from './types'
 
-const StyledAutocomplete = styled(Autocomplete)(({ theme }) => ({
+export const StyledAutocomplete = styled(Autocomplete)(({ theme }) => ({
   '& .MuiAutocomplete-tag': {
     border: '1px solid #D1D1D1',
     background: '#F8F8F8',
@@ -31,7 +31,7 @@ const StyledAutocomplete = styled(Autocomplete)(({ theme }) => ({
   },
 }))
 
-const StyledPopper = styled(Popper)(({ theme }) => ({
+export const StyledPopper = styled(Popper)(({ theme }) => ({
   '& .MuiPaper-root': {
     borderRadius: '10px',
     borderTopRightRadius: 0,

package/src/components/Institutions/InstitutionsDropdown.tsx

@@ -1,33 +1,57 @@
-import { useState } from 'react'
-import { FormSingleSelect } from '../HookForm'
-import { SingleSelect } from '../Input'
-import { InsititutionsStore } from '../../shared-state/InstitutionsStore'
+import { KeyboardArrowDown } from '@mui/icons-material'
+import { Box } from '@mui/material'
 import { urlTenantKey } from '../../contexts/Providers'
+import { InsititutionsStore } from '../../shared-state/InstitutionsStore'
+import { TextField } from '../Input'
+import { StyledAutocomplete, StyledPopper } from '../Input/MultiSelect'
 
 export default function SchoolSwitch() {
   const { current, institutions } = InsititutionsStore.useState((s) => s)
 
-  const handleChange = (e) => {
-    localStorage.setItem('institution_key', e.target.value)
-    window.location.replace(
-      `${window.location.origin}/${urlTenantKey}/${e.target.value}`,
-    )
+  const handleChange = (value) => {
+    if (value) {
+      localStorage.setItem('institution_key', value?.value)
+      window.location.replace(
+        `${window.location.origin}/${urlTenantKey}/${value?.value}`,
+      )
+    }
   }
+  const options =
+    institutions?.map((item) => ({
+      label: item.name,
+      value: item.code,
+    })) || []
 
   return (
-    <SingleSelect
-      containerProps={{
-        sx: {
-          minWidth: '200px',
-        },
-      }}
-      size="small"
-      options={institutions?.map((item) => ({
-        label: item.name,
-        value: item.code,
-      }))}
-      value={current?.code}
-      onChange={handleChange}
-    />
+    <Box sx={{ legend: { display: 'none' } }}>
+      <StyledAutocomplete
+        multiple={false}
+        sx={{
+          minWidth: '220px',
+        }}
+        getOptionLabel={(option: any) => option?.label || ''}
+        options={options || []}
+        value={{ label: current.name, value: current.code }}
+        onChange={(e, value) => {
+          handleChange(value)
+        }}
+        isOptionEqualToValue={(option: any, value: any) =>
+          option?.value === value?.value
+        }
+        disableCloseOnSelect
+        PopperComponent={StyledPopper}
+        popupIcon={<KeyboardArrowDown />}
+        renderInput={(params) => (
+          <TextField
+            label={null}
+            InputProps={{
+              ...params.InputProps,
+              endAdornment: <>{params.InputProps.endAdornment}</>,
+            }}
+            {...params}
+          />
+        )}
+      />
+    </Box>
   )
 }

package/src/hooks/useAuth.ts

@@ -195,6 +195,7 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
         const isAdmin = checkIsAdmin(res.data.user)
         const isSetup =
           window.location.hostname.split('.').includes('setup') && isAdmin
+        const isMasterSlave = res.data?.institutionType === 'MASTER_CHILD'
 
         // eslint-disable-next-line no-console
         console.log('Is Admin -> ', isAdmin)
@@ -231,6 +232,9 @@ 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,
           } as any
           s.applications = res.data?.applications ?? []
         })

package/src/shared-state/PermissionsStore.ts

@@ -190,6 +190,12 @@ export enum SquarePermissions {
   COURSE_REGISTRATION_EDIT = 'can_course_registration_edit',
   COURSE_REGISTRATION_DELETE = 'can_course_registration_delete',
 
+  // Mentors
+  CAN_MENTORS_VIEW = 'can_mentors_view',
+  CAN_ALL_MENTORS_VIEW = 'can_all_mentors_view',
+  CAN_MY_MENTEES_VIEW = 'can_my_mentees_view',
+  CAN_SESSION_CREATE = 'can_session_create',
+
   // Extra Cirricular activities
   EXTRA_CURRICULAR_ACTIVITIES_NEWS_FEED = 'can_extra_curricular_activities_news_feed',
   EXTRA_CURRICULAR_ACTIVITIES_CLUBS = 'can_extra_curricular_activities_clubs',
@@ -313,13 +319,6 @@ export enum SquarePermissions {
   CAN_SURVEYS_EDIT = 'can_surveys_edit',
   CAN_SURVEYS_ADD = 'can_surveys_add',
   CAN_SURVEYS_DELETE = 'can_surveys_delete',
-
-
-
-
-
-
-
 }
 
 export enum EnrollPermissions {
@@ -623,6 +622,7 @@ export enum Permission {
   CAN_DETAINED_STUDENT_VIEW = 'can_detained_student_view',
   CAN_DISCONTINUED_STUDENT_VIEW = 'can_discontinued_student_view',
   CAN_CONCESSION_REPORT_VIEW = 'can_concession_report_view',
+  CAN_FEE_TYPE_SUMMARY_VIEW = 'can_fee_type_summary_report_view',
   CAN_EXAMINATION_REPORT_VIEW = 'can_examination_report_view',
   CAN_EXAMINATION_NOT_PAID_REPORT_VIEW = 'can_examination_not_paid_report_view',
   CAN_EXAMINATION_BLOCKED_STUDENTS_VIEW = 'can_examination_blocked_students_view',
@@ -956,7 +956,7 @@ export enum Permission {
   CAN_SURVEYS_ADD = 'can_surveys_add',
   CAN_SURVEYS_DELETE = 'can_surveys_delete',
 
-  //Configuration 
+  //Configuration
 
   CAN_CONFIGURATION_VIEW = 'can_configuration_view',
 
@@ -966,14 +966,12 @@ export enum Permission {
   CAN_NOTICE_BOARD_ADD = 'can_notice_board_add',
   CAN_NOTICE_BOARD_DELETE = 'can_notice_board_delete',
 
-
   //Research Projects
   CAN_RESEARCH_PROJECT_VIEW = 'can_research_project_view',
   CAN_RESEARCH_PROJECT_EDIT = 'can_research_project_edit',
   CAN_RESEARCH_PROJECT_ADD = 'can_research_project_add',
   CAN_RESEARCH_PROJECT_DELETE = 'can_research_project_delete',
 
-
   // Enroll X
 
   // manage exams profile_permissions
@@ -1064,19 +1062,28 @@ export enum Permission {
   CAN_MANAGE_EXAMS_PROFILE_PERMISSIONS_EDIT = 'can_manage_exams_profile_permissions_edit',
   CAN_MANAGE_EXAMS_PROFILE_PERMISSIONS_DELETE = 'can_manage_exams_profile_permissions_delete',
 
-
   // End Semester Examination
   CAN_END_SEMESTER_EXAMINATIONS_VIEW = 'can_end_semester_examinations_view',
   CAN_END_SEMESTER_EXAMINATIONS_ADD = 'can_end_semester_examinations_add',
   CAN_END_SEMESTER_EXAMINATIONS_EDIT = 'can_end_semester_examinations_edit',
+  CAN_END_SEMESTER_EXAMINATIONS_ARCHIVE_EXAM = 'can_end_semester_examinations_archive_exam',
   CAN_END_SEMESTER_EXAMINATIONS_DELETE = 'can_end_semester_examinations_delete',
-  CAN_END_SEMESTER_EXAMINATIONS_NOTIFICATION_DETAILS_VIEW = "can_end_semester_examinations_notification_details_view",
+  CAN_END_SEMESTER_EXAMINATIONS_NOTIFICATION_DETAILS_VIEW = 'can_end_semester_examinations_notification_details_view',
 
   // Registrations
   CAN_EXAM_REGISTARTIONS_VIEW = 'can_exam_registrations_view',
   CAN_EXAM_REGISTARTIONS_ADD = 'can_exam_registrations_add',
-  CAN_EXAM_REGISTARTIONS_CHALLAN_UPLOAD = "can_exam_registrations_challan_upload",
-  CAN_EXAM_REGISTARTIONS_SUBMIT = "can_exam_registrations_submit",
+  CAN_EXAM_REGISTARTIONS_CHALLAN_UPLOAD = 'can_exam_registrations_challan_upload',
+  CAN_EXAM_REGISTARTIONS_SUBMIT = 'can_exam_registrations_submit',
+
+  //Challan Upload
+  CAN_CHALLAN_UPLOAD_VIEW = 'can_challan_upload_view',
+  CAN_CHALLAN_REGISTRATION_VIEW = 'can_challan_registrations_view',
+  CAN_CHALLAN_REGISTRATION_ADD = 'can_challan_registrations_add',
+  CAN_CHALLAN_UPLOAD_ADD = 'can_challan_upload_add',
+
+  //settings
+  CAN_EXAMS_SETTINGS_VIEW = 'can_exams_settings_view',
 
   // Fee configuration
   EXAM_FEE_CONFIGURATION_VIEW = 'can_exam_fee_configuration_view',
@@ -1090,25 +1097,25 @@ export enum Permission {
 
   // Hall tickets
   CAN_HALL_TICKETS_VIEW = 'can_hall_tickets_view',
-  CAN_HALL_TICKETS_DOWNLOAD = "can_hall_tickets_download",
+  CAN_HALL_TICKETS_DOWNLOAD = 'can_hall_tickets_download',
 
   // OMRS
   CAN_OMRS_VIEW = 'can_omrs_view',
   CAN_OMRS_UPDATE = 'can_omrs_update',
   CAN_OMRS_GENERATE = 'can_omrs_generate',
-  CAN_OMRS_DOWNLOAD = "can_omrs_download",
+  CAN_OMRS_DOWNLOAD = 'can_omrs_download',
 
   // Paper Configuration
   CAN_PAPER_CONFIGURATION_VIEW = 'can_paper_configuration_view',
   CAN_PAPER_CONFIGURATION_ADD = 'can_paper_configuration_add',
   CAN_PAPER_CONFIGURATION_EDIT = 'can_paper_configuration_edit',
   CAN_PAPER_CONFIGURATION_DELETE = 'can_paper_configuration_delete',
-  CAN_PAPER_CONFIGURATION_DOWNLOAD = "can_paper_configuration_download",
+  CAN_PAPER_CONFIGURATION_DOWNLOAD = 'can_paper_configuration_download',
 
   // D Form
   CAN_D_FORM_VIEW = 'can_d_forms_view',
   CAN_D_FORM_ADD = 'can_d_forms_add',
-  CAN_D_FORM_DOWNLOAD = "can_d_forms_download",
+  CAN_D_FORM_DOWNLOAD = 'can_d_forms_download',
 
   // Bundling
   CAN_VIEW_ANSWER_SHEET_REPORT = 'can_view_answer_sheet_report',