Merge pull request #569 from FlowzPlatform/issue-504-n4

filter-search

Author: nikitam747

client/src/components/SchemaView.vue

@@ -313,7 +313,8 @@ export default {
         $limit: this.limit,
         '_currentStatus': true,
         '_state': this.$route.params.stateid,
-        'id[$search]': '^' + query.text
+        // 'id[$search]': '^' + query.text
+        '$search': query.text
       }, heads)
       .then(res => {
         this.isFlowzLoaded = true
@@ -375,6 +376,7 @@ export default {
       // })
     },
     sortData (object) {
+      // console.log('object')
     },
     emailService (item) {
       this.isEmailDone = true

service/src/services/dflowzdata/dflowzdata.hooks.js

@@ -60,11 +60,23 @@ let beforeFind = function (hook) {
     const query = hook.service.service.createQuery(hook.params.query);
     hook.params.rethinkdb = query.group(value)
   }
+  if (query.$search !== undefined) {
+    hook.service.service.options.name = hook.params.headers.ftablename;
+    hook.service.service.table = hook.service.rDB.table(hook.params.headers.ftablename);
+    let value = hook.params.query.$search
+    delete hook.params.query.$search
+    const query = hook.service.service.createQuery(hook.params.query);
+    // hook.params.rethinkdb = query.group(value)
+    hook.params.rethinkdb = query.filter(function(doc) {
+      return doc.coerceTo('string').match('(?i)' + value);
+    })
+    // console.log('hook.params.rethinkdb', hook.params.rethinkdb)
+  }
 }
 
 function beforeCreate (hook) {
   try {
-    console.log('before create ================================', hook.params)
+    // console.log('before create ================================', hook.params)
     hook.params.done = true
     if (hook.params.headers.ftablename !== undefined && hook.data._state !== undefined) {
       let regex = /_/g