@campxdev/shared 0.2.13 → 0.2.14

package/package.json

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

package/src/components/Layout/Header/AppHeader.tsx

@@ -1,4 +1,5 @@
 import {Box, styled, Typography} from '@mui/material'
+import {ReactNode} from 'react'
 import {Link} from 'react-router-dom'
 import {campxLogoPrimary} from '../../../assets/images'
 import {applications} from './applications'
@@ -39,7 +40,13 @@ interface AppHeaderProps {
 	clientLogo: string
 	username: string
 	profileIcon: string
-	permissions: any
+	permissions?: any
+	userBoxActions: {
+		label: ReactNode
+		icon?: ReactNode
+		onClick: any
+	}[]
+	cogWheelMenu?: {label: string; path: string}[]
 }
 
 const isDev = process.env.NODE_ENV === 'development'
@@ -49,6 +56,8 @@ export default function AppHeader({
 	username,
 	profileIcon,
 	permissions,
+	userBoxActions = [],
+	cogWheelMenu = [],
 }: AppHeaderProps) {
 	return (
 		<StyledHeader>
@@ -59,8 +68,12 @@ export default function AppHeader({
 			<Box className='actions'>
 				<FreshDeskHelpButton />
 				<Notification />
-				<CogWheelMenu />
-				<UserBox username={username} profileIcon={profileIcon} />
+				{cogWheelMenu?.length && <CogWheelMenu menu={cogWheelMenu} />}
+				<UserBox
+					username={username}
+					profileIcon={profileIcon}
+					actions={userBoxActions}
+				/>
 			</Box>
 		</StyledHeader>
 	)

package/src/components/Layout/Header/CogWheelMenu.tsx

@@ -1,35 +1,26 @@
-import { SettingsOutlined } from '@mui/icons-material'
-import { IconButton } from '@mui/material'
-import { useHistory } from '../../../hooks/useRouter'
+import {SettingsOutlined} from '@mui/icons-material'
+import {IconButton} from '@mui/material'
+import {useHistory} from '../../../hooks/useRouter'
 import MenuButton from '../../MenuButton'
 
-const profileMenu = [
-  { label: 'Roles and Permissions', value: '/roles-and-permissions' },
-  { label: 'Audit Logs', value: '/audit-logs' },
-  { label: 'Careers', value: '/careers' },
-  { label: 'PHD Applications', value: '/phd' },
-  { label: 'Anurag CET', value: '/applications' },
-  { label: 'Agri CET', value: '/agricet' },
-]
+const CogWheelMenu = ({menu}) => {
+	const history = useHistory()
 
-const CogWheelMenu = () => {
-  const history = useHistory()
-
-  return (
-    <MenuButton
-      anchor={
-        <IconButton color="secondary">
-          <SettingsOutlined />
-        </IconButton>
-      }
-      menu={profileMenu?.map((item) => ({
-        label: item?.label,
-        onClick: () => {
-          history.push(item?.value)
-        },
-      }))}
-    />
-  )
+	return (
+		<MenuButton
+			anchor={
+				<IconButton color='secondary'>
+					<SettingsOutlined />
+				</IconButton>
+			}
+			menu={menu?.map((item) => ({
+				label: item?.label,
+				onClick: () => {
+					history.push(item?.path)
+				},
+			}))}
+		/>
+	)
 }
 
 export default CogWheelMenu

package/src/components/Layout/Header/UserBox.tsx

@@ -12,14 +12,16 @@ import axios from 'axios'
 import {axiosErrorToast} from '../../../config/axios'
 import {isDevelopment} from '../../../constants/isDevelopment'
 import Cookies from 'js-cookie'
-import {useState} from 'react'
+import {ReactNode, useState} from 'react'
 
 export default function UserBox({
 	username,
 	profileIcon,
+	actions,
 }: {
 	username: string
 	profileIcon: string
+	actions: {label: ReactNode; icon?: ReactNode; onClick: any}[]
 }) {
 	const history = useHistory()
 	const [posting, setPosting] = useState(false)
@@ -34,15 +36,13 @@ export default function UserBox({
 		setPosting(true)
 		axios({
 			method: 'POST',
-			baseURL: process.env.REACT_APP_API_HOST,
+			baseURL: process.env.REACT_APP_AUTH_HOST,
 			url: '/auth/logout',
 		})
 			.then((res) => {
-				setPosting(false)
 				window.location.href = '/'
 			})
 			.catch((err) => {
-				setPosting(false)
 				axiosErrorToast('Unable To Logout.')
 			})
 	}
@@ -66,25 +66,7 @@ export default function UserBox({
 					)}
 				</Box>
 			}
-			menu={[
-				{
-					label: 'Profile',
-					icon: <PermIdentityOutlined />,
-					onClick: () => {
-						history.push('/profile')
-					},
-				},
-				{
-					label: 'Change Password',
-					icon: <HttpsOutlined />,
-					onClick: () => {},
-				},
-				{
-					label: 'Logout',
-					icon: <ExitToAppOutlined />,
-					onClick: logout,
-				},
-			]}
+			menu={actions}
 		/>
 	)
 }

package/src/components/LinearProgress/LinearProgress.tsx

@@ -2,7 +2,8 @@ import {BoxProps, styled, Box, LinearProgress} from '@mui/material'
 import {globalStore} from '../../shared-state/GlobalStore'
 
 export default function LinearIndeterminate() {
-	const loading = globalStore.useState((s) => s).loading
+	// const loading = globalStore.useState((s) => s).loading
+	const loading = false
 
 	if (!loading) return null
 	return <StyledLinearProgress />

package/src/config/axios.ts

@@ -31,48 +31,48 @@ let axios = Axios.create({
 axios.interceptors.request.use(
 	function (config) {
 		const params = formatParams(config?.params)
-		globalStore.update((s) => {
-			s.loading = true
-			s.error.message = ''
-			s.error.statusCode = null
-			s.error.description = ''
-		})
+		// globalStore.update((s) => {
+		// 	s.loading = true
+		// 	s.error.message = ''
+		// 	s.error.statusCode = null
+		// 	s.error.description = ''
+		// })
 		return {...config, params}
 	},
 	function (error) {
-		globalStore.update((s) => {
-			s.loading = true
-		})
+		// globalStore.update((s) => {
+		// 	s.loading = true
+		// })
 		return Promise.reject(error)
 	}
 )
 
 axios.interceptors.response.use(
 	function (response) {
-		globalStore.update((s) => {
-			s.loading = false
-		})
+		// globalStore.update((s) => {
+		// 	s.loading = false
+		// })
 		return response
 	},
 	function (err) {
-		globalStore.update((s) => {
-			s.loading = false
-		})
+		// globalStore.update((s) => {
+		// 	s.loading = false
+		// })
 
-		if (err.message == 'Network Error') {
-			globalStore.update((s) => {
-				s.error = {
-					message: err.message,
-					statusCode: 999,
-					description: 'Please check your network connection',
-				}
-			})
-		} else {
-			const method = err.response.config.method
-			if (method === 'get' || method === 'GET') {
-				// setError(err.response.status, err.response.data.message)
-			}
-		}
+		// if (err.message == 'Network Error') {
+		// 	// globalStore.update((s) => {
+		// 	// 	s.error = {
+		// 	// 		message: err.message,
+		// 	// 		statusCode: 999,
+		// 	// 		description: 'Please check your network connection',
+		// 	// 	}
+		// 	// })
+		// } else {
+		// 	// const method = err.response.config.method
+		// 	// if (method === 'get' || method === 'GET') {
+		// 	// 	// setError(err.response.status, err.response.data.message)
+		// 	// }
+		// }
 
 		return Promise.reject(err)
 	}

package/src/permissions/PageWithPermission.tsx

@@ -17,24 +17,23 @@ export default function PageWithPermission({
 	component?: any
 	children?: any
 }) {
-	const history = useHistory()
-	const errorState = globalStore.useState((s) => s.error)
+	// const history = useHistory()
+	// const errorState = globalStore.useState((s) => s.error)
 
 	const permissions = PermissionsStore.useState((s) => s).permissions
 	const hasAccess = permissionKey ? permissions[permissionKey] : accessIfNoKey
 
-	useEffect(() => {
-		globalStore.update((s) => {
-			s.error = {
-				message: '',
-				statusCode: null,
-				description: '',
-			}
-		})
-	}, [history])
-
-	if (errorState.statusCode) return <ErrorPage />
+	// useEffect(() => {
+	// 	globalStore.update((s) => {
+	// 		s.error = {
+	// 			message: '',
+	// 			statusCode: null,
+	// 			description: '',
+	// 		}
+	// 	})
+	// }, [history])
 
+	// if (errorState.statusCode) return <ErrorPage />
 	// if (hasAccess) return Component
 	if (hasAccess) return children
 	return <PermissionDeniedPage />