remove unwanted filter

HenriRabalais · Aug 10, 2020 · fac72ed · fac72ed
1 parent 49585a5
commit fac72ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/modules/conflict_resolver/jsx/resolved_filterabledatatable.js b/modules/conflict_resolver/jsx/resolved_filterabledatatable.js
@@ -88,10 +88,7 @@ class ResolvedFilterableDataTable extends Component {
     const options = this.state.data.fieldOptions;
 
     const fields = [
-      {label: 'Resolved ID', show: false, filter: {
-        name: 'ResolvedID',
-        type: 'text',
-      }},
+      {label: 'Resolved ID', show: false},
       {label: 'Project', show: true, filter: {
         name: 'Project',
         type: 'select',

diff --git a/modules/conflict_resolver/jsx/unresolved_filterabledatatable.js b/modules/conflict_resolver/jsx/unresolved_filterabledatatable.js
@@ -92,10 +92,7 @@ class UnresolvedFilterableDataTable extends Component {
     const options = this.state.data.fieldOptions;
 
     const fields = [
-      {label: 'Conflict ID', show: false, filter: {
-        name: 'ConflictID',
-        type: 'text',
-      }},
+      {label: 'Conflict ID', show: false},
       {label: 'Project', show: true, filter: {
         name: 'Project',
         type: 'select',