Merge pull request #1993 from kobotoolbox/issue-1918

More table view column filters
kobotoolbox · Sep 22, 2018 · 98affdb · 98affdb
2 parents ba0257b + 08dcc47
commit 98affdb
Showing 1 changed file with 35 additions and 5 deletions.
diff --git a/jsapp/js/components/table.es6 b/jsapp/js/components/table.es6
@@ -72,7 +72,11 @@ export class DataTable extends React.Component {
     if (filter.length) {
       filterQuery = '&query={';
       filter.forEach(function(f, i) {
-        filterQuery += `"${f.id}":{"$regex":"${f.value}"}`;
+        if (f.id === '_id') {
+          filterQuery += `"${f.id}":{"$in":[${f.value}]}`;
+        } else {
+          filterQuery += `"${f.id}":{"$regex":"${f.value}","$options":"i"}`;
+        }
         if (i < filter.length - 1)
           filterQuery += ',';
       });
@@ -108,7 +112,7 @@ export class DataTable extends React.Component {
             loading: false
           });
           // TODO: debounce the queries and then enable this notification
-          notify(t('The query did not return any results.'));
+          alertify.warning(t('The query did not return any results.'));
         } else {
           this.setState({error: t('Error: could not load data.'), loading: false});
         }
@@ -401,8 +405,30 @@ export class DataTable extends React.Component {
     })
 
     let selectedColumns = false,
-        frozenColumn = false,
-        textFilterQuestionTypes = ['text', 'integer', 'decimal'];
+        frozenColumn = false;
+    const textFilterQuestionTypes = [
+      'text',
+      'integer',
+      'decimal',
+      'select_multiple',
+      'date',
+      'time',
+      'datetime',
+      'start',
+      'end',
+      'username',
+      'simserial',
+      'subscriberid',
+      'deviceid',
+      'phonenumber',
+      'today'
+    ];
+    const textFilterQuestionIds = [
+      '__version__',
+      '_id',
+      '_uuid',
+      '_submission_time'
+    ]
 
     if (settings['data-table'] && settings['data-table']['frozen-column']) {
       frozenColumn = settings['data-table']['frozen-column'];
@@ -424,10 +450,14 @@ export class DataTable extends React.Component {
             })}
           </select>;
       }
-      if (col.question && textFilterQuestionTypes.includes(col.question.type)) {
+      if (
+        (col.question && textFilterQuestionTypes.includes(col.question.type))
+        || textFilterQuestionIds.includes(col.id)
+      ) {
         col.filterable = true;
         col.Filter = ({ filter, onChange }) =>
           <DebounceInput
+            value={filter ? filter.value : undefined}
             debounceTimeout={750}
             onChange={event => onChange(event.target.value)}
             style={{ width: '100%' }}/>;