fix: user management & profit chart

This commit is contained in:
ferdiansyah783
2025-08-10 15:47:04 +07:00
parent de93de2e6d
commit 48570c018f
23 changed files with 989 additions and 599 deletions
+55 -191
View File
@@ -3,94 +3,50 @@ import { useState } from 'react'
// MUI Imports
import Button from '@mui/material/Button'
import Divider from '@mui/material/Divider'
import Drawer from '@mui/material/Drawer'
import IconButton from '@mui/material/IconButton'
import MenuItem from '@mui/material/MenuItem'
import Typography from '@mui/material/Typography'
import Divider from '@mui/material/Divider'
// Third-party Imports
import { useForm, Controller } from 'react-hook-form'
import { Controller, useForm } from 'react-hook-form'
// Types Imports
import type { UsersType } from '@/types/apps/userTypes'
// Component Imports
import CustomTextField from '@core/components/mui/TextField'
import { UserRequest } from '../../../../types/services/user'
import { Switch } from '@mui/material'
type Props = {
open: boolean
handleClose: () => void
userData?: UsersType[]
setData: (data: UsersType[]) => void
}
type FormValidateType = {
fullName: string
username: string
email: string
role: string
plan: string
status: string
}
type FormNonValidateType = {
company: string
country: string
contact: string
}
// Vars
const initialData = {
company: '',
country: '',
contact: ''
name: '',
email: '',
password: '',
role: '',
permissions: {},
is_active: true,
organization_id: '',
outlet_id: '',
}
const AddUserDrawer = (props: Props) => {
// Props
const { open, handleClose, userData, setData } = props
const { open, handleClose } = props
// States
const [formData, setFormData] = useState<FormNonValidateType>(initialData)
const [formData, setFormData] = useState<UserRequest>(initialData)
// Hooks
const {
control,
reset: resetForm,
handleSubmit,
formState: { errors }
} = useForm<FormValidateType>({
defaultValues: {
fullName: '',
username: '',
email: '',
role: '',
plan: '',
status: ''
}
})
const onSubmit = (data: FormValidateType) => {
const newUser: UsersType = {
id: (userData?.length && userData?.length + 1) || 1,
avatar: `/images/avatars/${Math.floor(Math.random() * 8) + 1}.png`,
fullName: data.fullName,
username: data.username,
email: data.email,
role: data.role,
currentPlan: data.plan,
status: data.status,
company: formData.company,
country: formData.country,
contact: formData.contact,
billing: userData?.[Math.floor(Math.random() * 50) + 1].billing ?? 'Auto Debit'
}
setData([...(userData ?? []), newUser])
const onSubmit = () => {
handleClose()
setFormData(initialData)
resetForm({ fullName: '', username: '', email: '', role: '', plan: '', status: '' })
}
const handleReset = () => {
@@ -98,6 +54,13 @@ const AddUserDrawer = (props: Props) => {
setFormData(initialData)
}
const handleInputChange = (e: any) => {
setFormData({
...formData,
[e.target.name]: e.target.value
})
}
return (
<Drawer
open={open}
@@ -115,144 +78,45 @@ const AddUserDrawer = (props: Props) => {
</div>
<Divider />
<div>
<form onSubmit={handleSubmit(data => onSubmit(data))} className='flex flex-col gap-6 p-6'>
<Controller
name='fullName'
control={control}
rules={{ required: true }}
render={({ field }) => (
<CustomTextField
{...field}
fullWidth
label='Full Name'
placeholder='John Doe'
{...(errors.fullName && { error: true, helperText: 'This field is required.' })}
/>
)}
<form onSubmit={onSubmit} className='flex flex-col gap-6 p-6'>
<CustomTextField
fullWidth
label='Name'
placeholder='John Doe'
name='name'
value={formData.name}
onChange={handleInputChange}
/>
<Controller
name='username'
control={control}
rules={{ required: true }}
render={({ field }) => (
<CustomTextField
{...field}
fullWidth
label='Username'
placeholder='johndoe'
{...(errors.username && { error: true, helperText: 'This field is required.' })}
/>
)}
/>
<Controller
<CustomTextField
fullWidth
type='email'
label='Email'
placeholder='johndoe@email'
name='email'
control={control}
rules={{ required: true }}
render={({ field }) => (
<CustomTextField
{...field}
fullWidth
type='email'
label='Email'
placeholder='johndoe@gmail.com'
{...(errors.email && { error: true, helperText: 'This field is required.' })}
/>
)}
/>
<Controller
name='role'
control={control}
rules={{ required: true }}
render={({ field }) => (
<CustomTextField
select
fullWidth
id='select-role'
label='Select Role'
{...field}
{...(errors.role && { error: true, helperText: 'This field is required.' })}
>
<MenuItem value='admin'>Admin</MenuItem>
<MenuItem value='author'>Author</MenuItem>
<MenuItem value='editor'>Editor</MenuItem>
<MenuItem value='maintainer'>Maintainer</MenuItem>
<MenuItem value='subscriber'>Subscriber</MenuItem>
</CustomTextField>
)}
/>
<Controller
name='plan'
control={control}
rules={{ required: true }}
render={({ field }) => (
<CustomTextField
select
fullWidth
id='select-plan'
label='Select Plan'
{...field}
slotProps={{
htmlInput: { placeholder: 'Select Plan' }
}}
{...(errors.plan && { error: true, helperText: 'This field is required.' })}
>
<MenuItem value='basic'>Basic</MenuItem>
<MenuItem value='company'>Company</MenuItem>
<MenuItem value='enterprise'>Enterprise</MenuItem>
<MenuItem value='team'>Team</MenuItem>
</CustomTextField>
)}
/>
<Controller
name='status'
control={control}
rules={{ required: true }}
render={({ field }) => (
<CustomTextField
select
fullWidth
id='select-status'
label='Select Status'
{...field}
{...(errors.status && { error: true, helperText: 'This field is required.' })}
>
<MenuItem value='pending'>Pending</MenuItem>
<MenuItem value='active'>Active</MenuItem>
<MenuItem value='inactive'>Inactive</MenuItem>
</CustomTextField>
)}
value={formData.email}
onChange={handleInputChange}
/>
<CustomTextField
label='Company'
fullWidth
placeholder='Company PVT LTD'
value={formData.company}
onChange={e => setFormData({ ...formData, company: e.target.value })}
/>
<CustomTextField
select
fullWidth
id='country'
value={formData.country}
onChange={e => setFormData({ ...formData, country: e.target.value })}
label='Select Country'
slotProps={{
htmlInput: { placeholder: 'Country' }
}}
>
<MenuItem value='India'>India</MenuItem>
<MenuItem value='USA'>USA</MenuItem>
<MenuItem value='Australia'>Australia</MenuItem>
<MenuItem value='Germany'>Germany</MenuItem>
</CustomTextField>
<CustomTextField
label='Contact'
type='number'
fullWidth
placeholder='(397) 294-5153'
value={formData.contact}
onChange={e => setFormData({ ...formData, contact: e.target.value })}
type='password'
label='Password'
placeholder='********'
name='password'
value={formData.password}
onChange={handleInputChange}
/>
<div className='flex items-center'>
<div className='flex flex-col items-start gap-1'>
<Typography color='text.primary' className='font-medium'>
Active
</Typography>
</div>
<Switch
checked={formData.is_active}
name='is_active'
onChange={e => setFormData({ ...formData, is_active: e.target.checked })}
/>
</div>
<div className='flex items-center gap-4'>
<Button variant='contained' type='submit'>
Submit
+173 -154
View File
@@ -1,7 +1,7 @@
'use client'
// React Imports
import { useEffect, useMemo, useState } from 'react'
import { useCallback, useEffect, useMemo, useState } from 'react'
// Next Imports
import Link from 'next/link'
@@ -23,31 +23,17 @@ import Typography from '@mui/material/Typography'
import type { RankingInfo } from '@tanstack/match-sorter-utils'
import { rankItem } from '@tanstack/match-sorter-utils'
import type { ColumnDef, FilterFn } from '@tanstack/react-table'
import {
createColumnHelper,
flexRender,
getCoreRowModel,
getFacetedMinMaxValues,
getFacetedRowModel,
getFacetedUniqueValues,
getFilteredRowModel,
getPaginationRowModel,
getSortedRowModel,
useReactTable
} from '@tanstack/react-table'
import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table'
import classnames from 'classnames'
// Type Imports
import type { UsersType } from '@/types/apps/userTypes'
import type { Locale } from '@configs/i18n'
import type { ThemeColor } from '@core/types'
// Component Imports
import CustomAvatar from '@core/components/mui/Avatar'
import CustomTextField from '@core/components/mui/TextField'
import OptionMenu from '@core/components/option-menu'
import AddUserDrawer from './AddUserDrawer'
import TableFilters from './TableFilters'
// Util Imports
import { getInitials } from '@/utils/getInitials'
@@ -55,6 +41,12 @@ import { getLocalizedUrl } from '@/utils/i18n'
// Style Imports
import tableStyles from '@core/styles/table.module.css'
import { Box, CircularProgress, TablePagination } from '@mui/material'
import Loading from '../../../../components/layout/shared/Loading'
import TablePaginationComponent from '../../../../components/TablePaginationComponent'
import { useUsers } from '../../../../services/queries/users'
import { User } from '../../../../types/services/user'
import AddUserDrawer from './AddUserDrawer'
declare module '@tanstack/table-core' {
interface FilterFns {
@@ -65,18 +57,14 @@ declare module '@tanstack/table-core' {
}
}
type UsersTypeWithAction = UsersType & {
action?: string
type UsersTypeWithAction = User & {
actions?: string
}
type UserRoleType = {
[key: string]: { icon: string; color: string }
}
type UserStatusType = {
[key: string]: ThemeColor
}
// Styled Components
const Icon = styled('i')({})
@@ -127,30 +115,54 @@ const userRoleObj: UserRoleType = {
admin: { icon: 'tabler-crown', color: 'error' },
author: { icon: 'tabler-device-desktop', color: 'warning' },
editor: { icon: 'tabler-edit', color: 'info' },
maintainer: { icon: 'tabler-chart-pie', color: 'success' },
cashier: { icon: 'tabler-chart-pie', color: 'success' },
subscriber: { icon: 'tabler-user', color: 'primary' }
}
const userStatusObj: UserStatusType = {
active: 'success',
pending: 'warning',
inactive: 'secondary'
}
// Column Definitions
const columnHelper = createColumnHelper<UsersTypeWithAction>()
const UserListTable = ({ tableData }: { tableData?: UsersType[] }) => {
const UserListTable = () => {
// States
const [addUserOpen, setAddUserOpen] = useState(false)
const [rowSelection, setRowSelection] = useState({})
const [data, setData] = useState(...[tableData])
const [filteredData, setFilteredData] = useState(data)
const [globalFilter, setGlobalFilter] = useState('')
const [currentPage, setCurrentPage] = useState(1)
const [pageSize, setPageSize] = useState(10)
const [openConfirm, setOpenConfirm] = useState(false)
const [customerId, setCustomerId] = useState('')
const [search, setSearch] = useState('')
// Hooks
const { lang: locale } = useParams()
const { data, isLoading, error, isFetching } = useUsers({
page: currentPage,
limit: pageSize,
search
})
// const { deleteCustomer } = useCustomersMutation()
const users = data?.users ?? []
const totalCount = data?.pagination.total_count ?? 0
const handlePageChange = useCallback((event: unknown, newPage: number) => {
setCurrentPage(newPage)
}, [])
// Handle page size change
const handlePageSizeChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
const newPageSize = parseInt(event.target.value, 10)
setPageSize(newPageSize)
setCurrentPage(1) // Reset to first page
}, [])
// const handleDelete = () => {
// deleteCustomer.mutate(customerId, {
// onSuccess: () => setOpenConfirm(false)
// })
// }
const columns = useMemo<ColumnDef<UsersTypeWithAction, any>[]>(
() => [
{
@@ -175,16 +187,15 @@ const UserListTable = ({ tableData }: { tableData?: UsersType[] }) => {
/>
)
},
columnHelper.accessor('fullName', {
columnHelper.accessor('name', {
header: 'User',
cell: ({ row }) => (
<div className='flex items-center gap-4'>
{getAvatar({ avatar: row.original.avatar, fullName: row.original.fullName })}
{getAvatar({ avatar: '', fullName: row.original.name })}
<div className='flex flex-col'>
<Typography color='text.primary' className='font-medium'>
{row.original.fullName}
{row.original.name}
</Typography>
<Typography variant='body2'>{row.original.username}</Typography>
</div>
</div>
)
@@ -203,44 +214,31 @@ const UserListTable = ({ tableData }: { tableData?: UsersType[] }) => {
</div>
)
}),
columnHelper.accessor('currentPlan', {
header: 'Plan',
cell: ({ row }) => (
<Typography className='capitalize' color='text.primary'>
{row.original.currentPlan}
</Typography>
)
columnHelper.accessor('email', {
header: 'Email',
cell: ({ row }) => <Typography>{row.original.email}</Typography>
}),
columnHelper.accessor('billing', {
header: 'Billing',
cell: ({ row }) => <Typography>{row.original.billing}</Typography>
}),
columnHelper.accessor('status', {
columnHelper.accessor('is_active', {
header: 'Status',
cell: ({ row }) => (
<div className='flex items-center gap-3'>
<Chip
variant='tonal'
label={row.original.status}
label={row.original.is_active ? 'Active' : 'Inactive'}
size='small'
color={userStatusObj[row.original.status]}
color={row.original.is_active ? 'success' : 'error'}
className='capitalize'
/>
</div>
)
}),
columnHelper.accessor('action', {
columnHelper.accessor('actions', {
header: 'Action',
cell: ({ row }) => (
<div className='flex items-center'>
<IconButton onClick={() => setData(data?.filter(product => product.id !== row.original.id))}>
<IconButton onClick={() => {}}>
<i className='tabler-trash text-textSecondary' />
</IconButton>
<IconButton>
<Link href={getLocalizedUrl('/apps/user/view', locale as Locale)} className='flex'>
<i className='tabler-eye text-textSecondary' />
</Link>
</IconButton>
<OptionMenu
iconButtonProps={{ size: 'medium' }}
iconClassName='text-textSecondary'
@@ -263,36 +261,28 @@ const UserListTable = ({ tableData }: { tableData?: UsersType[] }) => {
})
],
// eslint-disable-next-line react-hooks/exhaustive-deps
[data, filteredData]
[data]
)
const table = useReactTable({
data: filteredData as UsersType[],
data: users as User[],
columns,
filterFns: {
fuzzy: fuzzyFilter
},
state: {
rowSelection,
globalFilter
},
initialState: {
pagination: {
pageSize: 10
pageIndex: currentPage,
pageSize
}
},
enableRowSelection: true, //enable row selection for all rows
// enableRowSelection: row => row.original.age > 18, // or enable row selection conditionally per row
globalFilterFn: fuzzyFilter,
onRowSelectionChange: setRowSelection,
getCoreRowModel: getCoreRowModel(),
onGlobalFilterChange: setGlobalFilter,
getFilteredRowModel: getFilteredRowModel(),
getSortedRowModel: getSortedRowModel(),
getPaginationRowModel: getPaginationRowModel(),
getFacetedRowModel: getFacetedRowModel(),
getFacetedUniqueValues: getFacetedUniqueValues(),
getFacetedMinMaxValues: getFacetedMinMaxValues()
// Disable client-side pagination since we're handling it server-side
manualPagination: true,
pageCount: Math.ceil(totalCount / pageSize)
})
const getAvatar = (params: Pick<UsersType, 'avatar' | 'fullName'>) => {
@@ -309,25 +299,25 @@ const UserListTable = ({ tableData }: { tableData?: UsersType[] }) => {
<>
<Card>
<CardHeader title='Filters' className='pbe-4' />
<TableFilters setData={setFilteredData} tableData={data} />
{/* <TableFilters setData={setFilteredData} tableData={data} /> */}
<div className='flex justify-between flex-col items-start md:flex-row md:items-center p-6 border-bs gap-4'>
<CustomTextField
select
value={table.getState().pagination.pageSize}
onChange={e => table.setPageSize(Number(e.target.value))}
className='max-sm:is-full sm:is-[70px]'
>
<MenuItem value='10'>10</MenuItem>
<MenuItem value='25'>25</MenuItem>
<MenuItem value='50'>50</MenuItem>
</CustomTextField>
<DebouncedInput
value={search}
onChange={value => setSearch(value as string)}
placeholder='Search User'
className='max-sm:is-full'
/>
<div className='flex flex-col sm:flex-row max-sm:is-full items-start sm:items-center gap-4'>
<DebouncedInput
value={globalFilter ?? ''}
onChange={value => setGlobalFilter(String(value))}
placeholder='Search User'
className='max-sm:is-full'
/>
<CustomTextField
select
value={pageSize}
onChange={handlePageSizeChange}
className='max-sm:is-full sm:is-[70px]'
>
<MenuItem value='10'>10</MenuItem>
<MenuItem value='25'>25</MenuItem>
<MenuItem value='50'>50</MenuItem>
</CustomTextField>
<Button
color='secondary'
variant='tonal'
@@ -347,75 +337,104 @@ const UserListTable = ({ tableData }: { tableData?: UsersType[] }) => {
</div>
</div>
<div className='overflow-x-auto'>
<table className={tableStyles.table}>
<thead>
{table.getHeaderGroups().map(headerGroup => (
<tr key={headerGroup.id}>
{headerGroup.headers.map(header => (
<th key={header.id}>
{header.isPlaceholder ? null : (
<>
<div
className={classnames({
'flex items-center': header.column.getIsSorted(),
'cursor-pointer select-none': header.column.getCanSort()
})}
onClick={header.column.getToggleSortingHandler()}
>
{flexRender(header.column.columnDef.header, header.getContext())}
{{
asc: <i className='tabler-chevron-up text-xl' />,
desc: <i className='tabler-chevron-down text-xl' />
}[header.column.getIsSorted() as 'asc' | 'desc'] ?? null}
</div>
</>
)}
</th>
))}
</tr>
))}
</thead>
{table.getFilteredRowModel().rows.length === 0 ? (
<tbody>
<tr>
<td colSpan={table.getVisibleFlatColumns().length} className='text-center'>
No data available
</td>
</tr>
</tbody>
) : (
<tbody>
{table
.getRowModel()
.rows.slice(0, table.getState().pagination.pageSize)
.map(row => {
return (
<tr key={row.id} className={classnames({ selected: row.getIsSelected() })}>
{row.getVisibleCells().map(cell => (
<td key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</td>
))}
</tr>
)
})}
</tbody>
)}
</table>
{isLoading ? (
<Loading />
) : (
<table className={tableStyles.table}>
<thead>
{table.getHeaderGroups().map(headerGroup => (
<tr key={headerGroup.id}>
{headerGroup.headers.map(header => (
<th key={header.id}>
{header.isPlaceholder ? null : (
<>
<div
className={classnames({
'flex items-center': header.column.getIsSorted(),
'cursor-pointer select-none': header.column.getCanSort()
})}
onClick={header.column.getToggleSortingHandler()}
>
{flexRender(header.column.columnDef.header, header.getContext())}
{{
asc: <i className='tabler-chevron-up text-xl' />,
desc: <i className='tabler-chevron-down text-xl' />
}[header.column.getIsSorted() as 'asc' | 'desc'] ?? null}
</div>
</>
)}
</th>
))}
</tr>
))}
</thead>
{table.getFilteredRowModel().rows.length === 0 ? (
<tbody>
<tr>
<td colSpan={table.getVisibleFlatColumns().length} className='text-center'>
No data available
</td>
</tr>
</tbody>
) : (
<tbody>
{table
.getRowModel()
.rows.slice(0, table.getState().pagination.pageSize)
.map(row => {
return (
<tr key={row.id} className={classnames({ selected: row.getIsSelected() })}>
{row.getVisibleCells().map(cell => (
<td key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</td>
))}
</tr>
)
})}
</tbody>
)}
</table>
)}
{isFetching && !isLoading && (
<Box
position='absolute'
top={0}
left={0}
right={0}
bottom={0}
display='flex'
alignItems='center'
justifyContent='center'
bgcolor='rgba(255,255,255,0.7)'
zIndex={1}
>
<CircularProgress size={24} />
</Box>
)}
</div>
{/* <TablePagination
component={() => <TablePaginationComponent table={table} />}
count={table.getFilteredRowModel().rows.length}
rowsPerPage={table.getState().pagination.pageSize}
page={table.getState().pagination.pageIndex}
onPageChange={(_, page) => {
table.setPageIndex(page)
}}
/> */}
<TablePagination
component={() => (
<TablePaginationComponent
pageIndex={currentPage}
pageSize={pageSize}
totalCount={totalCount}
onPageChange={handlePageChange}
/>
)}
count={totalCount}
rowsPerPage={pageSize}
page={currentPage}
onPageChange={handlePageChange}
onRowsPerPageChange={handlePageSizeChange}
rowsPerPageOptions={[10, 25, 50]}
disabled={isLoading}
/>
</Card>
<AddUserDrawer
open={addUserOpen}
handleClose={() => setAddUserOpen(!addUserOpen)}
userData={data}
setData={setData}
/>
</>
)
+4 -5
View File
@@ -6,16 +6,15 @@ import type { UsersType } from '@/types/apps/userTypes'
// Component Imports
import UserListTable from './UserListTable'
import UserListCards from './UserListCards'
const UserList = ({ userData }: { userData?: UsersType[] }) => {
const UserList = () => {
return (
<Grid container spacing={6}>
<Grid size={{ xs: 12 }}>
{/* <Grid size={{ xs: 12 }}>
<UserListCards />
</Grid>
</Grid> */}
<Grid size={{ xs: 12 }}>
<UserListTable tableData={userData} />
<UserListTable />
</Grid>
</Grid>
)