@campxdev/shared 1.11.7-1.alpha.1 → 1.11.7-1.alpha.3

package/package.json

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

package/src/components/PageHeader.tsx

@@ -37,20 +37,18 @@ export default function PageHeader({
 }: PageHeaderProps) {
   return (
     <StyledBox noPadding={noPadding}>
-      <Box key="0">
+      <>
         {typeof title === 'string' ? (
           <Typography variant="h1">{title}</Typography>
         ) : (
           title
         )}
-      </Box>
-      <Box marginTop={'10px'} key="1">
         {typeof subtitle === 'string' ? (
           <Typography>{subtitle}</Typography>
         ) : (
-          subtitle
+          <Box marginTop={'10px'}>{subtitle}</Box>
         )}
-      </Box>
+      </>
       <Box className="actions">{actions}</Box>
     </StyledBox>
   )

package/src/components/Tables/ReactTable/ReactTable.tsx

@@ -205,11 +205,11 @@ export default function ReactTable({
       />
       <Table sx={{ position: 'relative' }} {...getTableProps()}>
         <TableHead>
-          {headerGroups.map((headerGroup, rowIndex) => (
-            <TableRow {...headerGroup.getHeaderGroupProps()}>
+          {headerGroups.map((headerGroup, index) => (
+            <TableRow key={index} {...headerGroup.getHeaderGroupProps()}>
               {showSerialNumber && <TableCell>S. No.</TableCell>}
-              {headerGroup.headers.map((column: any, colIndex) => (
-                <TableCell {...column.getHeaderProps()}>
+              {headerGroup.headers.map((column: any, index) => (
+                <TableCell key={index} {...column.getHeaderProps()}>
                   {column.render('Header')}
                   {column.sort && (
                     <IconButton onClick={() => handleSortClick(column.id)}>

package/src/hooks/useAuth.ts

@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios'
 import Cookies from 'js-cookie'
 import { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
@@ -76,6 +77,7 @@ const getInstitutionKey = () => {
     return instituitionKey
   }
 }
+const navigate = useNavigate()
 
 function handleInstitutions(institutions) {
   if (institutions?.length === 0) {
@@ -94,87 +96,95 @@ function handleInstitutions(institutions) {
   }
 }
 
-const useAuth = ({
-  permissionsEndpoint,
+const loginErrorHandler = ({
   loginUrl,
-}: AuthParams): AuthResponse => {
+  setLoading,
+  err,
+}: {
+  loginUrl: string
+  setLoading?: any
+  err: AxiosError
+}) => {
+  setLoading(false)
+
+  if (isDevelopment) {
+    openRootModal({
+      key: 'login',
+      contentData: {
+        loginUrl,
+      },
+      dialogProps: {
+        disableEscapeKeyDown: true,
+        onClose: () => {},
+      },
+    })
+    return
+  } else {
+    navigate('/auth/login')
+  }
+}
+
+function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
   const [loading, setLoading] = useState<boolean>(false)
-  const [data, setData] = useState<any>(null)
+  const [data, setData] = useState(null)
   const { current } = InstitutionsStore.useState()
-  const navigate = useNavigate()
 
   const appInit = async () => {
     setLoading(true)
-    try {
-      const res = await axios.get(permissionsEndpoint)
-      const isAdmin = checkIsAdmin(res.data.user)
-
-      setData(res.data)
-      UserStore.update((s) => {
-        s.username = res.data?.user?.username
-        s.user = res.data?.user
-        s.roles = res.data?.roles
-        s.globalUserId = res.data?.globalUserId
-        s.fullName = res.data?.fullName
-      })
-
-      PermissionsStore.update((s) => {
-        s.permissions = {
-          ...res.data?.permissions,
-          can_settings_view: 1,
-          can_dashboard_view: 1,
-          can_individual_pages_view: 1,
-          can_analatics_view: isAdmin,
-          can_admin_view: isAdmin,
-          can_my_mentees_view:
-            res.data?.user?.isMentor &&
-            res.data?.permissions.can_my_mentees_view,
-        }
-        s.applications = res.data?.applications ?? []
-        s.institutionType = res.data?.institutionType
-        s.masterInstitutionUniqueId = res.data?.masterInstitutionUniqueId
-        s.masterInstitutionId = res.data?.masterInstitutionId
-        s.isMasterInstitutionUser = res.data?.institutions
-          ?.map((institution) => institution?.id)
-          ?.includes(res?.data?.masterInstitutionUniqueId)
-        s.isMasterInstitution = res.data?.isMasterInstitution
-        s.isHomePageEnabled = res.data?.isHomePageEnabled
-      })
+    axios
+      .get(permissionsEndpoint)
+      .then((res) => {
+        const isAdmin = checkIsAdmin(res.data.user)
+
+        setData(res.data)
+        UserStore.update((s) => {
+          s.username = res.data?.user?.username
+          s.user = res.data?.user
+          s.roles = res.data?.roles
+          s.globalUserId = res.data?.globalUserId
+          s.fullName = res.data?.fullName
+        })
 
-      InstitutionsStore.update((s) => {
-        s.institutions = res.data?.institutions
-        s.current = res.data?.institutions.find(
-          (item) => item.code === Cookies.get('campx_institution'),
-        )
-      })
+        PermissionsStore.update((s) => {
+          s.permissions = {
+            ...res.data?.permissions,
+            can_settings_view: 1,
+            can_dashboard_view: 1,
+            can_individual_pages_view: 1,
+            can_analatics_view: isAdmin,
+            can_admin_view: isAdmin,
+            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
+          s.masterInstitutionUniqueId = res.data?.masterInstitutionUniqueId
+          s.masterInstitutionId = res.data?.masterInstitutionId
+          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) => {
-        s.logo = res.data?.assets.logo
-        s.logo_square = res.data?.assets.logo_square
-      })
+        InstitutionsStore.update((s) => {
+          s.institutions = res.data?.institutions
+          s.current = res.data?.institutions.find(
+            (item) => item.code === Cookies.get('campx_institution'),
+          )
+        })
 
-      setLoading(false)
-    } catch (err: any) {
-      setLoading(false)
-      const origin = window.location.origin
-      const isStaging = origin.split('campx')[1] === '.dev'
-
-      if (isDevelopment || isStaging) {
-        openRootModal({
-          key: 'login',
-          contentData: {
-            loginUrl,
-          },
-          dialogProps: {
-            disableEscapeKeyDown: true,
-            onClose: () => {},
-          },
+        AssetsStore.update((s) => {
+          s.logo = res.data?.assets.logo
+          s.logo_square = res.data?.assets.logo_square
         })
-        return
-      } else {
-        navigate('/auth/login')
-      }
-    }
+
+        setLoading(false)
+      })
+      .catch((err: AxiosError) => {
+        loginErrorHandler({ loginUrl, setLoading, err })
+      })
   }
 
   useEffect(() => {

package/src/layouts/Components/styles.tsx

@@ -25,9 +25,9 @@ export const StyledHeaderContainer = styled.header`
 
 export const StyledLeftNavContainer = muiStyled('aside')(({ theme }) => ({
   width: sideNavWidth,
-  borderRadius: '8px 0px 0px 8px',
   background: theme.palette.secondary.main,
   color: 'white',
+  borderRadius: '8px 0px 0px 8px',
   overflowY: 'scroll',
   '&::-webkit-scrollbar': {
     width: '0.5em',