From 4ce257adda52af77e065e1a5c6ff48014138aa24 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 9 Dec 2024 10:09:45 -0800 Subject: [PATCH 1/2] fix: Remove filtering on Date Columns Remove filters from fuel code date columns --- frontend/src/views/FuelCodes/_schema.jsx | 28 ++++-------------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/frontend/src/views/FuelCodes/_schema.jsx b/frontend/src/views/FuelCodes/_schema.jsx index cd805dcb0..6f59ffceb 100644 --- a/frontend/src/views/FuelCodes/_schema.jsx +++ b/frontend/src/views/FuelCodes/_schema.jsx @@ -65,45 +65,25 @@ export const fuelCodeColDefs = (t) => [ { field: 'applicationDate', headerName: t('fuelCode:fuelCodeColLabels.applicationDate'), - filter: 'agDateColumnFilter', - filterParams: { - filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'], - suppressAndOrCondition: true, - maxValidYear: 2400 - }, + filter: false, cellRenderer: TextRenderer }, { field: 'approvalDate', headerName: t('fuelCode:fuelCodeColLabels.approvalDate'), - filter: 'agDateColumnFilter', - filterParams: { - filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'], - suppressAndOrCondition: true, - maxValidYear: 2400 - }, + filter: false, cellRenderer: TextRenderer }, { field: 'effectiveDate', headerName: t('fuelCode:fuelCodeColLabels.effectiveDate'), - filter: 'agDateColumnFilter', - filterParams: { - filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'], - suppressAndOrCondition: true, - maxValidYear: 2400 - }, + filter: false, cellRenderer: TextRenderer }, { field: 'expirationDate', headerName: t('fuelCode:fuelCodeColLabels.expirationDate'), - filter: 'agDateColumnFilter', - filterParams: { - filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'], - suppressAndOrCondition: true, - maxValidYear: 2400 - }, + filter: false, cellRenderer: TextRenderer }, { From d075f667ce5a060c8f91334cd876132f413b907b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 9 Dec 2024 10:28:42 -0800 Subject: [PATCH 2/2] Change back to old date adapter --- frontend/src/main.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx index c6116f53f..acb541131 100644 --- a/frontend/src/main.jsx +++ b/frontend/src/main.jsx @@ -6,8 +6,8 @@ import theme from '@/themes' import './i18n' import { KeycloakProvider } from '@/components/KeycloakProvider' import { getKeycloak } from '@/utils/keycloak' -import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs' import { LocalizationProvider } from '@mui/x-date-pickers' +import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3' const queryClient = new QueryClient() const keycloak = getKeycloak() @@ -19,7 +19,7 @@ if (root) { - +