@campxdev/shared 1.11.30 → 1.11.32-alpha.1

package/package.json

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

package/src/components/Layout/LayoutWrapper.tsx

@@ -2,6 +2,7 @@ import {
   StyledLeftNavContainer,
   StyledMainContentContainer,
 } from '../../layouts/Components/styles'
+import { PermissionsStore } from '../../shared-state'
 import ErrorBoundary from '../ErrorBoundary'
 import SideNav from './SideNav'
 interface Props {
@@ -15,12 +16,29 @@ export default function LayoutWrapper({
   menu,
   sideMenuHeader,
 }: Props) {
+  const permissions = PermissionsStore.useState()
+
   return (
     <ErrorBoundary>
-      <StyledLeftNavContainer>
-        <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
-      </StyledLeftNavContainer>
-      <StyledMainContentContainer>
+      {!permissions.isHomePageEnabled && (
+        <StyledLeftNavContainer>
+          <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
+        </StyledLeftNavContainer>
+      )}
+      <StyledMainContentContainer
+        style={{
+          width: permissions.isHomePageEnabled
+            ? 'inherit'
+            : 'calc(100% - 220px)',
+          position: permissions.isHomePageEnabled ? 'unset' : 'fixed',
+          marginTop: permissions.isHomePageEnabled ? '10px' : '0px',
+          borderRadius: permissions.isHomePageEnabled ? '10px' : '0px',
+          border: permissions.isHomePageEnabled ? '1px solid #1212' : 'none',
+          height: permissions.isHomePageEnabled
+            ? 'calc(100vh - 74px)'
+            : 'calc(100vh - 64px)',
+        }}
+      >
         <ErrorBoundary>{children}</ErrorBoundary>
       </StyledMainContentContainer>
     </ErrorBoundary>

package/src/components/Selectors/ExamGroupSelector.tsx

@@ -26,13 +26,13 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
   const [prevExamType, setPrevExamType] = useState(null)
   const [prevCourseId, setPrevCourseId] = useState(null)
   let api =
-    filters.examType !== 'internal'
+    filters?.examType !== 'internal'
       ? '/exams/exams/exam-groups'
       : '/exams/internal-exams'
   const handleOpen = () => {
     if (filters) {
       if (
-        (filters.examType && filters.examType !== prevExamType) ||
+        (filters?.examType && filters?.examType !== prevExamType) ||
         (filters?.courseId && filters?.courseId !== prevCourseId)
       ) {
         setOptions([])
@@ -46,12 +46,12 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
           })
           .then((response) => {
             setOptions(
-              filters.examType !== 'internal'
+              filters?.examType !== 'internal'
                 ? response.data?.examGroups
                 : response.data?.exams,
             )
-            setPrevExamType(filters.examType)
-            setPrevCourseId(filters.courseId)
+            setPrevExamType(filters?.examType)
+            setPrevCourseId(filters?.courseId)
           })
           .catch((error) => {
             console.error('Error fetching data from the API:', error)
@@ -59,9 +59,18 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
       }
     } else if (options.length === 0) {
       axios
-        .get(api)
+        .get(api, {
+          params: {
+            isArchived: 'false',
+            isExamPublished: 'true',
+          },
+        })
         .then((response) => {
-          setOptions(response.data)
+          setOptions(
+            filters?.examType !== 'internal'
+              ? response.data?.examGroups
+              : response.data?.exams,
+          )
         })
         .catch((error) => {
           console.error('Error fetching data from the API:', error)
@@ -80,7 +89,7 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
           ...(allowAll ? [{ value: 'all', label: 'All' }] : []),
           ...options.map((item) => ({
             label:
-              filters.examType != 'internal'
+              filters?.examType != 'internal'
                 ? item?.groupName
                 : item?.displayName,
             value: item?.id,

package/src/components/UploadFileDialog/UploadFileDialog.tsx

@@ -14,10 +14,10 @@ import {
 } from '@mui/material'
 import { ReactNode, useEffect, useRef, useState } from 'react'
 import { toast } from 'react-toastify'
-import axios, { axiosErrorToast } from '../../config/axios'
+import axios from '../../config/axios'
 import { buffertoCSV } from '../../utils'
-import { DeleteButton, EditButton } from '../IconButtons'
 import { useErrorModal } from '../ErrorModalWrapper/ErrorModalWrapper'
+import { DeleteButton, EditButton } from '../IconButtons'
 const animatedImage = require('./AnimatedUploadFile.gif')
 
 const StyledDialogHeader = styled(Box)(({ theme }) => ({
@@ -80,7 +80,8 @@ interface UploadFileDialogProps {
   sampleFileDownloadUrl?: string
   uploadUrl: string
   successMessage?: string
-  refetchFn: (res: any) => void
+  refetchFn?: (res: any) => void
+  onUpload?: () => void
   postBody?: { [key: string]: string }
 }
 
@@ -95,6 +96,7 @@ export default function UploadFileDialog({
   refetchFn,
   sampleFileDownloadUrl,
   postBody = {},
+  onUpload,
 }: UploadFileDialogProps) {
   const inputRef: any = useRef(null)
   const [loading, setLoading] = useState(false)
@@ -115,6 +117,7 @@ export default function UploadFileDialog({
   }
 
   const handleOnUpload = () => {
+    onUpload && onUpload()
     if (!file) return ``
     const formData = new FormData()
     formData.append('file', file)
@@ -129,7 +132,7 @@ export default function UploadFileDialog({
       .post(uploadUrl, formData)
       .then((res) => {
         setLoading(false)
-        refetchFn(res)
+        refetchFn && refetchFn(res)
         setOpen(false)
         toast.success(successMessage ?? 'Successful')
         setFile(null)

package/src/config/axios.ts

@@ -6,7 +6,7 @@ import { isDevelopment, isSetup } from '../constants'
 import { InstitutionsStore } from '../shared-state/InstitutionsStore'
 
 const sessionKey = Cookies.get('campx_session_key')
-const clientId = window.location.pathname.split('/')[1] ?? 'campx_dev'
+const clientId = window.location.origin.split('.')[0] ?? 'campx_dev'
 const institutionId = window.location.pathname.split('/')[2] ?? 'campx_dev'
 const openPaymentsKey = Cookies.get('campx_open_payments_key')
 

package/src/hooks/useAuth.ts

@@ -26,6 +26,7 @@ type AuthResponse = {
       logo: string
       logo_square: string
     }
+    isHomePageEnabled?: boolean
   }
 }
 
@@ -235,6 +236,7 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           s.isMasterInstitutionUser = res.data?.institutions
             ?.map((institution) => institution?.id)
             ?.includes(res?.data?.masterInstitutionUniqueId)
+          s.isHomePageEnabled = res.data?.isHomePageEnabled
         })
         AssetsStore.update((s) => {
           s.logo = res.data?.assets.logo

package/src/layouts/Components/styles.tsx

@@ -1,5 +1,5 @@
-import styled from 'styled-components'
 import { styled as muiStyled } from '@mui/material'
+import styled from 'styled-components'
 
 export const headerHeight = '64px'
 export const sideNavWidth = '220px'
@@ -59,16 +59,29 @@ export const StyledMainContentContainer = muiStyled('main')(() => ({
   overflowY: 'auto',
 
   '&::-webkit-scrollbar': {
-    width: '0.6em',
-    height: '0.6em',
+    width: '0.4em',
+    height: '0.4em',
   },
 
   '&::-webkit-scrollbar-thumb': {
-    backgroundColor: 'rgba(0,0,0, 0.3)',
+    backgroundColor: 'rgba(0, 0, 0, 0.2)',
     borderRadius: '3px',
-
     '&:hover': {
       background: 'rgba(0,0,0, 0.4)',
     },
   },
+
+  // '&::-webkit-scrollbar': {
+  //   width: '0.6em',
+  //   height: '0.6em',
+  // },
+
+  // '&::-webkit-scrollbar-thumb': {
+  //   backgroundColor: 'rgba(0,0,0, 0.3)',
+  //   borderRadius: '3px',
+
+  //   '&:hover': {
+  //     background: 'rgba(0,0,0, 0.4)',
+  //   },
+  // },
 }))

package/src/shared-state/PermissionsStore.ts

@@ -2047,6 +2047,7 @@ interface IPermissionsStore {
   masterInstitutionId?: string
   isMasterInstitution: boolean
   isMasterInstitutionUser?: boolean
+  isHomePageEnabled?: boolean
 }
 
 export const PermissionsStore = new Store<IPermissionsStore>({
@@ -2057,4 +2058,5 @@ export const PermissionsStore = new Store<IPermissionsStore>({
   masterInstitutionId: null,
   isMasterInstitution: false,
   isMasterInstitutionUser: false,
+  isHomePageEnabled: false,
 })

package/src/utils/getUrlParams.ts

@@ -6,3 +6,14 @@ export default function getUrlParams() {
   }
   return params
 }
+
+export const createSearchParams = (query: { [key: string]: string }) => {
+  const searchParams = new URLSearchParams()
+
+  for (const key in query) {
+    if (query[key] !== null && query[key] !== 'all') {
+      searchParams.append(key, encodeURIComponent(query[key]))
+    }
+  }
+  return query
+}

package/src/utils/index.ts

@@ -1,8 +1,11 @@
-export { default as getUrlParams } from './getUrlParams'
+import { createSearchParams } from './getUrlParams'
 export { default as arrayPadEnd } from './arrayPadEnd'
-export { default as romanize } from './romanize'
 export { default as buffertoCSV } from './buffertoCSV'
+export { default as getUrlParams } from './getUrlParams'
+export { default as romanize } from './romanize'
 
+export { default as onLogout } from './logout'
 export { default as withRouteWrapper } from './withRouteWrapper'
 export { default as withSuspense } from './withSuspense'
-export { default as onLogout } from './logout'
+
+export { createSearchParams }