@campxdev/shared 1.11.22 → 1.11.24

package/package.json

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

package/src/components/ApplicationProfile/UserProfileRelation.tsx

@@ -15,6 +15,7 @@ import {
   updateCreateUserApplicationProfile,
   userProfileSchema,
 } from './services'
+import { useErrorModal } from '../ErrorModalWrapper/ErrorModalWrapper'
 interface UserProps {
   options: {
     label: any
@@ -26,6 +27,7 @@ const getDepartments = () => {
   return axios.get('/hrms/departments').then((res) => res?.data?.data)
 }
 function UserProfileRelation({ close, application, profiles, data }) {
+  const errorModal = useErrorModal()
   const [state, setState] = useImmer<UserProps>({
     options: [],
     inputValue: '',
@@ -58,7 +60,8 @@ function UserProfileRelation({ close, application, profiles, data }) {
       onError: (err) => {
         // eslint-disable-next-line no-console
         console.log(err)
-        axiosErrorToast(err)
+        // axiosErrorToast(err)
+        errorModal({ error: err })
       },
     },
   )

package/src/components/ErrorModalWrapper/ErrorModalTemplate.tsx

@@ -82,26 +82,27 @@ export const ErrorModalTemplate = ({ handleClose, modal, setModal }) => {
         <StyledImage>
           <img src={animatedImage} alt="Error Image" />
         </StyledImage>
-        <Alert severity={'error'} sx={{ padding: '10px' }}>
-          Please resolve the below mentioned errors to proceed further
-        </Alert>
-        <MessageContainer>
-          {modal.type == 'String' ? (
+
+        {modal.type == 'String' ? (
+          <MessageContainer>
             <Typography
               variant="h6"
               sx={{ textAlign: 'center', lineHeight: 1.7 }}
               dangerouslySetInnerHTML={{ __html: modal?.errorMessage }}
             />
-          ) : (
-            <>
-              <Stack gap={2}>
-                <StyledTableContainer
-                  dangerouslySetInnerHTML={{ __html: modal?.errorMessage }}
-                />
-              </Stack>
-            </>
-          )}
-        </MessageContainer>
+          </MessageContainer>
+        ) : (
+          <>
+            <MessageContainer>
+              <Alert severity={'error'} sx={{ padding: '10px' }}>
+                Please resolve the below mentioned errors to proceed further
+              </Alert>
+              <StyledTableContainer
+                dangerouslySetInnerHTML={{ __html: modal?.errorMessage }}
+              />
+            </MessageContainer>
+          </>
+        )}
 
         {modal.content && modal.content({ close: handleClose })}
         <Button

package/src/components/Form/Form.tsx

@@ -14,6 +14,7 @@ import { useMutation, useQueryClient } from 'react-query'
 import { toast } from 'react-toastify'
 import axios, { axiosErrorToast } from '../../config/axios'
 import RenderForm, { RenderFormProps, generateYupSchema } from './RenderForm'
+import { useErrorModal } from '../ErrorModalWrapper/ErrorModalWrapper'
 
 const makePostRequest = async ({
   endpoint,
@@ -59,6 +60,7 @@ export default function Form({
   onCancel,
   successToastMessage,
 }: FormProps) {
+  const errorModal = useErrorModal()
   const queryClient = useQueryClient()
   const [error, setError] = useState<any>(null)
   const { control, watch, handleSubmit } = useForm({
@@ -74,7 +76,8 @@ export default function Form({
     },
     onError(error: any) {
       setError(error?.response?.data?.message)
-      axiosErrorToast(error)
+      // axiosErrorToast(error)
+      errorModal({ error: error })
     },
   })
 

package/src/components/ImageUpload.tsx

@@ -2,6 +2,7 @@ import { InsertPhotoOutlined } from '@mui/icons-material'
 import { styled, Typography } from '@mui/material'
 import { ReactNode, useRef, useState } from 'react'
 import axios, { axiosErrorToast } from '../config/axios'
+import { useErrorModal } from './ErrorModalWrapper/ErrorModalWrapper'
 
 interface ImageUploadProps {
   onFileUploaded: (v) => void
@@ -17,6 +18,7 @@ export default function ImageUpload({
   loadingState,
   postBody = {},
 }: ImageUploadProps) {
+  const errorModal = useErrorModal()
   const [loading, setLoading] = useState(false)
   const ref = useRef<HTMLInputElement>(null)
 
@@ -47,7 +49,8 @@ export default function ImageUpload({
         .catch((err) => {
           setLoading(false)
           loadingState && setLoading(false)
-          axiosErrorToast(err)
+          // axiosErrorToast(err)
+          errorModal({ error: err })
         })
     }
   }

package/src/components/Layout/Header/applications.ts

@@ -15,14 +15,18 @@ const origins = {
     dev: 'https://admin.campx.dev',
     prod: 'https://admin.campx.in',
   },
-  ums: {
-    dev: 'https://ums.campx.dev',
-    prod: 'https://ums.campx.in',
+  enroll: {
+    dev: 'https://enroll.campx.dev',
+    prod: 'https://enroll.campx.in',
   },
   payments: {
     dev: 'https://payments.campx.dev',
     prod: 'https://payments.campx.in',
   },
+  ums: {
+    dev: 'https://ums.campx.dev',
+    prod: 'https://ums.campx.in',
+  },
   exams: {
     dev: 'https://exams.campx.dev',
     prod: 'https://exams.campx.in',
@@ -39,10 +43,6 @@ const origins = {
     dev: 'https://commute.campx.dev',
     prod: 'https://commute.campx.in',
   },
-  enroll: {
-    dev: 'https://enroll.campx.dev',
-    prod: 'https://enroll.campx.in',
-  },
 }
 
 export const applications = [
@@ -54,6 +54,23 @@ export const applications = [
     domainName: 'admin',
     description: 'Manage Complete Campus Root Configuration',
   },
+
+  {
+    title: 'EnrollX',
+    key: 'enroll_x',
+    domainName: 'enroll',
+    path: isDevelopment ? origins.enroll.dev : origins.enroll.prod,
+    icon: enrollSmall,
+    description: 'Manage Admissions in the Campus',
+  },
+  {
+    title: 'PayX',
+    key: 'payments',
+    domainName: 'payments',
+    path: isDevelopment ? origins.payments.dev : origins.payments.prod,
+    icon: paySmall,
+    description: 'Manage Payments in the Campus',
+  },
   {
     title: 'CollegeX',
     path: isDevelopment ? origins.ums.dev : origins.ums.prod,
@@ -71,20 +88,12 @@ export const applications = [
     description: 'Manage all Examinations in the Campus',
   },
   {
-    title: 'PayX',
-    key: 'payments',
-    domainName: 'payments',
-    path: isDevelopment ? origins.payments.dev : origins.payments.prod,
-    icon: paySmall,
-    description: 'Manage Payments in the Campus',
-  },
-  {
-    title: 'EnrollX',
-    key: 'enroll_x',
-    domainName: 'enroll',
-    path: isDevelopment ? origins.enroll.dev : origins.enroll.prod,
-    icon: enrollSmall,
-    description: 'Manage Admissions in the Campus',
+    title: 'PeopleX',
+    key: 'hrms',
+    domainName: 'people',
+    path: isDevelopment ? origins.people.dev : origins.people.prod,
+    icon: peopleSmall,
+    description: 'Manage People in the Campus',
   },
   {
     title: 'HostelX',
@@ -102,13 +111,4 @@ export const applications = [
     icon: commuteSmall,
     description: 'Manage Commute in the Campus',
   },
-
-  {
-    title: 'PeopleX',
-    key: 'hrms',
-    domainName: 'people',
-    path: isDevelopment ? origins.people.dev : origins.people.prod,
-    icon: peopleSmall,
-    description: 'Manage People in the Campus',
-  },
 ]

package/src/components/Tables/BasicTable/Table.tsx

@@ -28,7 +28,7 @@ export interface TableColumn<T> {
   dataIndex: string
   key: string
   title: any
-  render?: (cellData: any, row: T, index: number) => any
+  render?: (cellData: any, row: any, index: number) => any
   textColor?: string
   sort?: boolean
   width?: string //pixels

package/src/components/UploadFileDialog/UploadFileDialog.tsx

@@ -17,6 +17,7 @@ import { toast } from 'react-toastify'
 import axios, { axiosErrorToast } from '../../config/axios'
 import { buffertoCSV } from '../../utils'
 import { DeleteButton, EditButton } from '../IconButtons'
+import { useErrorModal } from '../ErrorModalWrapper/ErrorModalWrapper'
 const animatedImage = require('./AnimatedUploadFile.gif')
 
 const StyledDialogHeader = styled(Box)(({ theme }) => ({
@@ -97,7 +98,7 @@ export default function UploadFileDialog({
 }: UploadFileDialogProps) {
   const inputRef: any = useRef(null)
   const [loading, setLoading] = useState(false)
-
+  const errorModal = useErrorModal()
   const [file, setFile] = useState(null)
   const [open, setOpen] = useState(false)
   const onClose = () => {
@@ -136,17 +137,18 @@ export default function UploadFileDialog({
       .catch((err) => {
         console.log(err)
         setLoading(false)
-        axiosErrorToast(err)
+        // axiosErrorToast(err)
+        errorModal({ error: err })
       })
   }
 
   const handleSampleFileDownload = async () => {
     try {
       const res = await axios.get(sampleFileDownloadUrl)
-
       buffertoCSV({ data: res.data, filename: `${dialogTitle}` })
     } catch (error) {
-      axiosErrorToast(error)
+      errorModal({ error: error })
+      // axiosErrorToast(error)
     }
   }
 

package/src/hooks/useAuth.ts

@@ -30,6 +30,7 @@ type AuthResponse = {
 }
 
 const ApplicationObj = {
+  admin: 'admin',
   enroll: 'enroll_x',
   ums: 'square',
   payments: 'payments',