.

bcgov · Jan 2, 2025 · bc10b05 · bc10b05
1 parent 59cd3d7
commit bc10b05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/frontend/src/components/BCDataGrid/components/Filters/BCDateFloatingFilter.jsx b/frontend/src/components/BCDataGrid/components/Filters/BCDateFloatingFilter.jsx
@@ -6,7 +6,6 @@ import {
 } from '@mui/icons-material'
 import { DatePicker } from '@mui/x-date-pickers'
 import { format, isValid } from 'date-fns'
-import { getDateFromDateSections } from '@mui/x-date-pickers/internals/hooks/useField/useField.utils'
 
 export const BCDateFloatingFilter = ({
   model,
@@ -64,6 +63,8 @@ export const BCDateFloatingFilter = ({
       className="bc-column-date-filter"
       fullWidth
       size="small"
+      role="group"
+      aria-labelledby="date-picker-label"
       sx={{
         border: 'none',
         '& .MuiOutlinedInput-root': { p: 0 },
@@ -75,6 +76,9 @@ export const BCDateFloatingFilter = ({
       }}
     >
       <DatePicker
+        id="date-picker"
+        aria-label="Date Picker"
+        aria-describedby="date-picker-description"
         sx={{ border: 'none', borderBottom: '2px solid #495057' }}
         value={selectedDate}
         onChange={handleChange}
@@ -94,6 +98,7 @@ export const BCDateFloatingFilter = ({
                     size="small"
                     edge="start"
                     onClick={() => setOpen(true)}
+                    aria-label="Open calendar"
                   >
                     <CalendarIcon fontSize="small" />
                   </IconButton>
@@ -106,6 +111,7 @@ export const BCDateFloatingFilter = ({
                     onClick={handleClear}
                     onMouseDown={(event) => event.stopPropagation()}
                     edge="end"
+                    aria-label="Clear date"
                   >
                     <ClearIcon fontSize="small" />
                   </IconButton>

diff --git a/frontend/src/views/Transactions/_schema.js b/frontend/src/views/Transactions/_schema.js
@@ -106,9 +106,10 @@ export const transactionsColDefs = (t) => [
     floatingFilterComponentParams: {
       valueKey: 'status',
       labelKey: 'status',
-      optionsQuery: useTransactionStatuses,
+      optionsQuery: useTransactionStatuses
     },
-    suppressHeaderMenuButton: true,
+    suppressFloatingFilterButton: true,
+    suppressHeaderFilterButton: true,
     minWidth: 180,
     width: 250
   },