@campxdev/shared 1.8.49-alpha.6 → 1.8.49-alpha.8

package/package.json

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

package/src/components/Institutions/InsititutionsDialog.tsx

@@ -1,18 +1,8 @@
 import { Box, Typography } from '@mui/material'
-import Image from '../Image/Image'
-import axios from '../../config/axios'
-import { useQuery } from 'react-query'
-import Spinner from '../Spinner'
-import { institutions } from './services'
 import { InsititutionsStore } from '../../shared-state/InstitutionsStore'
+import Image from '../Image/Image'
 
 export default function InsititutionsDialog({ close }) {
-  // const { data, isLoading } = useQuery(
-  //   'institutions',
-  //   institutions.fetchInsititutions,
-  // )
-
-  // if (isLoading) return <Spinner />
   const { institutions } = InsititutionsStore.useState((s) => s)
 
   return (

package/src/components/UploadButton/UploadButton.tsx

@@ -47,11 +47,11 @@ export default function UploadButton({
             fileName: res.data?.mediaObject?.originalFileName ?? '',
             id: res.data?.mediaObject?.id ?? '',
           })
-          refetchFn()
+          refetchFn && refetchFn()
           setLoading(false)
           loadingState && loadingState(false)
           if (onSuccess) onSuccess()
-          formRef?.current.reset()
+          !styledUpload && formRef?.current?.reset()
         })
         .catch((err) => {
           setLoading(false)
@@ -59,7 +59,7 @@ export default function UploadButton({
           toast.error(
             err?.response?.data?.message ?? 'Server Error While Uploading File',
           )
-          !styledUpload && formRef?.current.reset()
+          !styledUpload && formRef?.current?.reset()
         })
     }
   }

package/src/hooks/useAuth.ts

@@ -96,6 +96,11 @@ function handleInstitutions(institutions) {
         `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
       )
     }
+    if (insititutionKey !== institutions[0]?.code) {
+      window.location.replace(
+        `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
+      )
+    }
     InsititutionsStore.update((s) => {
       s.current = institutions[0]
       s.institutions = institutions
@@ -111,6 +116,18 @@ function handleInstitutions(institutions) {
         },
       })
     }
+    if (
+      insititutionKey &&
+      !institutions?.find((item) => item.code === insititutionKey)
+    ) {
+      openRootModal({
+        key: 'institutions',
+        dialogProps: {
+          disableEscapeKeyDown: true,
+          onClose: () => {},
+        },
+      })
+    }
     InsititutionsStore.update((s) => {
       s.institutions = institutions
       s.current = institutions.find((item) => item.code === insititutionKey)
@@ -181,8 +198,8 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           }
         }
 
-        if (res.data?.user?.institutions) {
-          handleInstitutions(res.data?.user?.institutions)
+        if (res.data?.institutions) {
+          handleInstitutions(res.data?.institutions)
         }
 
         setData(res.data)