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

package/package.json

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

package/src/components/ApplicationProfile/ApplicationProfile.tsx

@@ -11,6 +11,10 @@ import { useEffect, useState } from 'react'
 import { useMutation, useQuery } from 'react-query'
 import { toast } from 'react-toastify'
 import { useImmer } from 'use-immer'
+import { PageContent } from '../PageContent'
+import PageHeader from '../PageHeader'
+import useConfirm from '../PopupConfirm/useConfirm'
+import Spinner from '../Spinner'
 import UserProfileRelation from './UserProfileRelation'
 import {
   defaultFilterObj,
@@ -18,20 +22,16 @@ import {
   fetchProfiles,
   removeUserApplicationProfile,
   updateUserApplicationProfile,
-} from './Service'
-import useConfirm from '../PopupConfirm/useConfirm'
-import Spinner from '../Spinner'
-import PageHeader from '../PageHeader'
-import { PageContent } from '../PageContent'
+} from './services'
 
-import { SingleSelect } from '../Input'
-import ActionButton from '../ActionButton'
 import { axiosErrorToast } from '../../config/axios'
-import { DialogButton } from '../ModalButtons'
-import SearchBar from '../FilterComponents/SearchBar'
-import Table from '../Tables/BasicTable/Table'
 import { ValidateAccess } from '../../permissions'
 import { Permission, PermissionsStore } from '../../shared-state'
+import ActionButton from '../ActionButton'
+import SearchBar from '../FilterComponents/SearchBar'
+import { SingleSelect } from '../Input'
+import { DialogButton } from '../ModalButtons'
+import Table from '../Tables/BasicTable/Table'
 
 interface ApplicationProfileProps {
   application: 'exams' | 'square' | 'payments' | 'enroll_x' | 'hostels'
@@ -44,14 +44,14 @@ interface ApplicationProfileProps {
   }
 }
 function ApplicationProfile({
-  application = 'exams',
+  application,
   title,
   permissions,
 }: ApplicationProfileProps) {
   const { isConfirmed } = useConfirm()
   const [filters, setFilters] = useImmer(defaultFilterObj)
   const { data, isLoading, refetch } = useQuery(
-    ['application-users', ...Object.keys(filters)?.map((key) => filters[key])],
+    ['application-users', filters],
     () => fetchApplicationUsers({ application, ...filters }),
   )
 
@@ -100,8 +100,8 @@ function ApplicationProfile({
     },
     {
       title: 'Actions',
-      key: '',
-      dataIndex: '',
+      key: 'actions',
+      dataIndex: 'actions',
       render: (_, row) => (
         <ValidateAccess
           accessKey={
@@ -133,16 +133,15 @@ function ApplicationProfile({
       s.offset = value * s.limit - s.limit
     })
   }
-  if (profilesLoading) {
-    return <Spinner />
-  }
+
+  if (profilesLoading) return <Spinner />
   return (
     <>
       <PageHeader
         title={title}
         actions={[
           <ValidateAccess
-            key={0}
+            key={1}
             accessKey={
               permissions
                 ? Permission[permissions.add]
@@ -150,7 +149,6 @@ function ApplicationProfile({
             }
           >
             <DialogButton
-              key={0}
               title={'Add User Profile Relation'}
               anchor={({ open }) => (
                 <ActionButton onClick={open}>
@@ -185,7 +183,7 @@ function ApplicationProfile({
           />
           <Table
             columns={columns}
-            dataSource={data?.users ?? []}
+            dataSource={data?.result ?? []}
             loading={isLoading || removingUserProfile}
             pagination={{
               limit: filters.limit,
@@ -213,17 +211,19 @@ export const RenderProfileDropDown = ({
   const CanEdit = permissions
     ? permissionState.permissions[Permission[permissions.edit]]
     : permissionState.permissions['can_dashboard_view']
+
   const [state, setState] = useState({
-    userId: data.id,
-    profileId: data.profiles[0].id,
+    userId: null,
+    profileId: null,
   })
 
   useEffect(() => {
     setState((pre) => ({
       userId: data.id,
-      profileId: data.profiles[0].id,
+      profileId: data?.profiles?.find((p) => p.application === application)?.id,
     }))
   }, [data])
+
   const { mutate, isLoading } = useMutation(updateUserApplicationProfile, {
     onSuccess: (res) => {
       refetchFn()
@@ -246,6 +246,8 @@ export const RenderProfileDropDown = ({
       application: application,
     })
   }
+
+  if (!data) return null
   return (
     <>
       <StyledDropDownContainer>

package/src/components/ApplicationProfile/UserProfileRelation.tsx

@@ -1,5 +1,5 @@
 import { yupResolver } from '@hookform/resolvers/yup'
-import { Popper, Stack, styled } from '@mui/material'
+import { Stack } from '@mui/material'
 import { useForm } from 'react-hook-form'
 import { useMutation, useQueryClient } from 'react-query'
 import { toast } from 'react-toastify'
@@ -11,7 +11,7 @@ import {
   createApplicationUserProfile,
   fetchUsers,
   userProfileSchema,
-} from './Service'
+} from './services'
 interface UserProps {
   options: {
     label: any
@@ -52,7 +52,7 @@ function UserProfileRelation({ close, application, profiles }) {
     {
       onSuccess: (res) => {
         setState((s) => {
-          s.options = res.users?.map((item) => ({
+          s.options = res.result?.map((item) => ({
             label: item.fullName,
             value: item.id,
           }))
@@ -128,41 +128,3 @@ function UserProfileRelation({ close, application, profiles }) {
   )
 }
 export default UserProfileRelation
-
-const StyledPopper = styled(Popper)(({ theme }) => ({
-  '& .MuiPaper-root': {
-    borderRadius: '10px',
-    borderTopRightRadius: 0,
-    borderTopLeftRadius: 0,
-    boxShadow: '0px 4px 16px #0000000F',
-    marginTop: '1px',
-    '& .MuiAutocomplete-listbox': {
-      minWidth: '240px',
-      padding: '10px',
-      '& .MuiAutocomplete-option': {
-        padding: '10px',
-        background: 'none',
-        '&.Mui-focused': {
-          background: 'none',
-        },
-      },
-      '& .MuiCheckbox-root': {
-        padding: 0,
-        marginRight: '10px',
-      },
-    },
-    '&::-webkit-scrollbar': {
-      width: '0.5em',
-      height: '0.5em',
-    },
-
-    '&::-webkit-scrollbar-thumb': {
-      backgroundColor: 'rgba(0, 0, 0, 0.15)',
-      borderRadius: '3px',
-
-      '&:hover': {
-        background: 'rgba(0, 0, 0, 0.2)',
-      },
-    },
-  },
-}))

package/src/constants/UIConstants.ts

@@ -1,4 +1,4 @@
-export const batchOptions = Array.from({ length: 11 }, (_, i) => {
+export const batchOptions = Array.from({ length: 12 }, (_, i) => {
   return `${2012 + i} - ${2012 + i + 1}`
 }).reverse()