fix: allow ISearchOptionSettings to be passed to EnumFilter

bcgov · Apr 27, 2021 · dcc092c · dcc092c
1 parent 518cf12
commit dcc092c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/app/components/FilterableTable/Filters/ApplicationStatusFilter.tsx b/app/components/FilterableTable/Filters/ApplicationStatusFilter.tsx
@@ -9,14 +9,19 @@ export default class ApplicationStatusFilter extends EnumFilter<
   CiipApplicationRevisionStatus | 'NOT_STARTED'
 > {
   constructor(displayName: string, argName: string, nullValueArgName: string) {
-    super(displayName, argName, [
-      'NOT_STARTED',
-      'DRAFT',
-      'SUBMITTED',
-      'REQUESTED_CHANGES',
-      'APPROVED',
-      'REJECTED'
-    ]);
+    super(
+      displayName,
+      argName,
+      [
+        'NOT_STARTED',
+        'DRAFT',
+        'SUBMITTED',
+        'REQUESTED_CHANGES',
+        'APPROVED',
+        'REJECTED'
+      ],
+      {sortable: false}
+    );
     this._nullValueArgName = nullValueArgName;
   }
   _nullValueArgName: string;

diff --git a/app/components/FilterableTable/Filters/EnumFilter.tsx b/app/components/FilterableTable/Filters/EnumFilter.tsx
@@ -1,14 +1,19 @@
 import {getUserFriendlyStatusLabel} from 'lib/text-transforms';
 import React from 'react';
 import {Form} from 'react-bootstrap';
-import TableFilter from './TableFilter';
+import TableFilter, {ISearchOptionSettings} from './TableFilter';
 import {FilterComponent} from './types';
 
 export default class EnumFilter<T> extends TableFilter {
   enumValues: T[];
 
-  constructor(display, argName, enumValues: T[]) {
-    super(display, argName, {sortable: false});
+  constructor(
+    display,
+    argName,
+    enumValues: T[],
+    settings?: ISearchOptionSettings
+  ) {
+    super(display, argName, settings);
     this.enumValues = enumValues;
     this.searchOptionValues = enumValues.map((val) => {
       return {display: String(val), value: val};

diff --git a/app/components/FilterableTable/Filters/TableFilter.tsx b/app/components/FilterableTable/Filters/TableFilter.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import type {FilterComponent} from './types';
 import {Form} from 'react-bootstrap';
 
-interface ISearchOptionSettings {
+export interface ISearchOptionSettings {
   filterable?: boolean;
   sortable?: boolean;
   sortColumnName?: string;