@xuda.io/xuda-dbs-plugin-xuda 1.0.173 → 1.0.175

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.173",
+  "version": "1.0.175",
   "description": "Xuda Database Socket for Xuda's proprietary structure powered by CouchDB",
   "scripts": {
     "pub": "npm version patch --force && npm publish --access public"

package/server.js

@@ -266,8 +266,9 @@ const get_opt = function (e, table_obj) {
     }
   }
 
-  if (e.grid_filter_info) {
-    for (const [key, val] of Object.entries(e.grid_filter_info)) {
+  if (e.filterModel) {
+    debugger;
+    for (const [key, val] of Object.entries(e.filterModel)) {
       var field_name = key;
       var condition = "$and";
       const make_selector = function (val) {

package/studio.mjs

@@ -295,8 +295,8 @@ const get_opt = function (e, table_obj) {
     }
   }
 
-  if (e.grid_filter_info) {
-    for (const [key, val] of Object.entries(e.grid_filter_info)) {
+  if (e.filterModel) {
+    for (const [key, val] of Object.entries(e.filterModel)) {
       var field_name = key;
       var condition = "$and";
       const make_selector = function (val) {
@@ -785,37 +785,37 @@ const query_db = async function (e, db, table_obj) {
             .valueOf()
             .toString()}`;
 
-          const _selector = _.cloneDeep(opt.selector);
+          // const _selector = _.cloneDeep(opt.selector);
           const _sort = _.cloneDeep(opt.sort);
-          // mango_index_obj = {
-          //   index: {
-          //     fields: [],
-          //   },
-          //   name: index_name,
-          //   ddoc: `mango_index_table_${e.table_id}`,
-          // };
-
-          // for (let val of _sort) {
-          //   let field_id = Object.keys(val)[0];
-          //   mango_index_obj.index.fields.push(field_id);
-          // }
           mango_index_obj = {
             index: {
-              fields: Object.keys(
-                _.reduce(
-                  _sort,
-                  (ret, val) => {
-                    ret[Object.keys(val)[0]] = val;
-                    return ret;
-                  },
-                  _selector
-                )
-              ),
+              fields: [],
             },
             name: index_name,
             ddoc: `mango_index_table_${e.table_id}`,
           };
 
+          for (let val of _sort) {
+            let field_id = Object.keys(val)[0];
+            mango_index_obj.index.fields.push(field_id);
+          }
+          // mango_index_obj = {
+          //   index: {
+          //     fields: Object.keys(
+          //       _.reduce(
+          //         _sort,
+          //         (ret, val) => {
+          //           ret[Object.keys(val)[0]] = val;
+          //           return ret;
+          //         },
+          //         _selector
+          //       )
+          //     ),
+          //   },
+          //   name: index_name,
+          //   ddoc: `mango_index_table_${e.table_id}`,
+          // };
+
           try {
             const result = await db.createIndex(mango_index_obj);
             // const monitor_indexing = async function () {