minor fixes

bcgov · Jan 2, 2025 · c432d04 · c432d04
1 parent 779e793
commit c432d04
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/frontend/src/themes/base/globals.js b/frontend/src/themes/base/globals.js
@@ -129,8 +129,8 @@ const globals = {
     transition: 'border-color 0.3s ease-in-out, box-shadow 0.3s ease-in-out'
   },
   '.select-container:focus-within': {
-    borderColor: '2px solid #495057',
-    border: '0.01rem solid #495057',
+    border: '2px solid #495057',
+    borderWidth: '0px 0.01rem'
   },
   '.select-container #select-filter': {
     width: '100%',

diff --git a/frontend/src/views/Admin/AdminMenu/components/_schema.js b/frontend/src/views/Admin/AdminMenu/components/_schema.js
@@ -48,6 +48,8 @@ export const usersColumnDefs = (t) => [
       suppressFilterButton: true
     },
     floatingFilterComponent: BCSelectFloatingFilter,
+    suppressFloatingFilterButton: true,
+    suppressHeaderFilterButton: true,
     floatingFilterComponentParams: {
       optionsQuery: useRoleList,
       params: 'government_roles_only=true',
@@ -98,7 +100,8 @@ export const usersColumnDefs = (t) => [
       labelKey: 'name'
     },
     minWidth: 120,
-    suppressHeaderMenuButton: false
+    suppressFloatingFilterButton: true,
+    suppressHeaderFilterButton: true
   },
   {
     colId: 'organizationId',
@@ -170,13 +173,6 @@ export const userLoginHistoryColDefs = (t) => [
       buttons: ['clear']
     }
   },
-  {
-    field: 'createDate',
-    headerName: t('admin:userLoginHistoryColLabels.createDate'),
-    cellDataType: 'dateString',
-    valueFormatter: timezoneFormatter,
-    floatingFilterComponent: BCDateFloatingFilter
-  },
   {
     field: 'keycloakEmail',
     headerName: t('admin:userLoginHistoryColLabels.keycloakEmail'),
@@ -201,6 +197,12 @@ export const userLoginHistoryColDefs = (t) => [
     field: 'loginErrorMessage',
     headerName: t('admin:userLoginHistoryColLabels.loginErrorMessage'),
     cellDataType: 'string'
+  },
+  {
+    field: 'createDate',
+    headerName: t('admin:userLoginHistoryColLabels.createDate'),
+    cellDataType: 'dateString',
+    valueFormatter: timezoneFormatter
   }
 ]