merge master into raja

This commit is contained in:
Raja Oktafrianto
2025-03-24 10:27:15 +07:00
42 changed files with 1180 additions and 288 deletions

View File

@ -10,7 +10,7 @@ const SucosMaster = () => {
return (
<ManageSucosContextProvider>
<Container>
<h1 className="text-xl font-medium leading-none text-gray-900 mb-3">Sucos</h1>
<h1 className="text-xl font-medium leading-none text-gray-900 mb-5">Sucos</h1>
<Breadcrumbs sx={{ mb: 2 }}>
<Link underline="none" color="inherit" href="/">
<span className="text-sm hover:underline">Dashboard</span>

View File

@ -30,17 +30,17 @@ const ListToolbar = () => {
}
/>
</label>
<DefaultTooltip title={'Filter'} placement={'top'}>
{/* <DefaultTooltip title={'Filter'} placement={'top'}>
<Button
variant="outline"
className="h-7.5 disabled:bg-gray-400"
// disabled={isLoading}
// onClick={handleFilterData}
>
{/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
{loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
<KeenIcon icon="filter" />
</Button>
</DefaultTooltip>
</DefaultTooltip> */}
{/* <Button
variant="outline"
className="h-7.5 text-[0.8rem]"

View File

@ -85,21 +85,6 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
const columns = useMemo<ColumnDef<any>[]>(
() => [
{
accessorKey: 'sucos_id',
id: 'sucos_id',
filterFn: (row, columnId, filterValue) => {
const value = row.getValue<number>(columnId);
console.log('Filtering:', { value, filterValue });
return String(value).includes(String(filterValue));
},
header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
enableSorting: true,
enableHiding: false,
meta: {
headerClassName: 'w-[100px]'
}
},
{
accessorFn: (row) => row.sucos_name,
id: 'sucos_name',