.

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

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/frontend/src/components/BCDataGrid/components/Filters/BCSelectFloatingFilter.jsx b/frontend/src/components/BCDataGrid/components/Filters/BCSelectFloatingFilter.jsx
@@ -83,19 +83,31 @@ export const BCSelectFloatingFilter = ({
   }, [model, initialSelectedValues])
 
   return (
-    <div style={{ position: 'relative', width: '100%' }}>
+    <div
+      style={{ position: 'relative', width: '100%' }}
+      role="group"
+      aria-labelledby="select-filter-label"
+    >
       <div
         className="select-container"
         style={{
           maxHeight: ITEM_HEIGHT * 4.5 + ITEM_PADDING_TOP
         }}
+        role="combobox"
+        aria-expanded={selectedValues.length > 0}
+        aria-controls="select-filter"
       >
         <select
           id="select-filter"
           multiple={multiple}
           value={selectedValues}
           onChange={handleChange}
           disabled={disabled || isLoading}
+          aria-multiselectable={multiple}
+          aria-disabled={disabled || isLoading}
+          aria-describedby={
+            isError ? 'select-filter-error' : 'select-filter-description'
+          }
           style={{
             color: selectedValues.length > 0 ? '#999' : '#000'
           }}

diff --git a/frontend/src/views/Organizations/ViewOrganization/_schema.js b/frontend/src/views/Organizations/ViewOrganization/_schema.js
@@ -54,7 +54,8 @@ export const organizationsColDefs = (t) => [
       labelKey: 'status',
       optionsQuery: useOrganizationStatuses
     },
-    suppressHeaderMenuButton: true
+    suppressFloatingFilterButton: true,
+    suppressHeaderFilterButton: true
   }
 ]