@xuda.io/xuda-dbs-plugin-xuda 1.0.179 → 1.0.181

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.179",
+  "version": "1.0.181",
   "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

@@ -245,9 +245,9 @@ const get_opt = function (e, table_obj) {
 
   var opt = {
     selector,
-    limit: limit,
-    skip: skip,
-    fields: fields,
+    limit,
+    skip,
+    fields,
   };
 
   if (sort.length) {
@@ -465,7 +465,7 @@ const get_opt = function (e, table_obj) {
   for (const [key, val] of Object.entries(opt.fields)) {
     opt.fields[key] = "udfData.data." + val;
   }
-  if (!e?.sortModel?.length) {
+  if (!e?.sortModel || !JSON.parse(e.sortModel).length) {
     // added 2021 09 10
     if (opt.sort) {
       for (const [key, val] of Object.entries(opt.sort)) {
@@ -794,10 +794,10 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     var view_opt = undefined;
     if (key) {
       view_opt = {
-        key: key,
+        key,
         include_docs: !e.ids && view !== "db_index_reduce",
-        limit: limit,
-        skip: skip,
+        limit,
+        skip,
       };
     } else {
       if (e.reduce) {
@@ -815,8 +815,8 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           startkey: e.startkey ? JSON.parse(e.startkey) : "",
           endkey: e.endkey ? JSON.parse(e.endkey) : "",
           include_docs: !e.ids,
-          limit: limit,
-          skip: skip,
+          limit,
+          skip,
           descending: e.desc,
         };
       }

package/studio.mjs

@@ -274,9 +274,9 @@ const get_opt = function (e, table_obj) {
 
   var opt = {
     selector,
-    limit: limit,
-    skip: skip,
-    fields: fields,
+    limit,
+    skip,
+    fields,
   };
 
   if (sort.length) {
@@ -453,18 +453,18 @@ const get_opt = function (e, table_obj) {
               value = val.filter;
           }
         }
-        if (!opt.selector[field_name]) {
-          opt.selector[field_name] = {};
+        if (!opt.selector[condition]) {
+          opt.selector[condition] = {};
         }
-        if (!opt.selector[field_name][condition]) {
-          opt.selector[field_name][condition] = [];
+        if (!opt.selector[condition][field_name]) {
+          opt.selector[condition][field_name] = [];
         }
-        opt.selector[field_name][condition].push({
+        opt.selector[condition][field_name].push({
           [operator]: value,
         });
 
         if (operator_to) {
-          opt.selector[field_name][condition].push({
+          opt.selector[condition][field_name].push({
             [operator_to]: value_to,
           });
         }
@@ -494,7 +494,7 @@ const get_opt = function (e, table_obj) {
   for (const [key, val] of Object.entries(opt.fields)) {
     opt.fields[key] = "udfData.data." + val;
   }
-  if (!e?.sortModel?.length) {
+  if (!e?.sortModel || !JSON.parse(e.sortModel).length) {
     // added 2021 09 10
     if (opt.sort) {
       for (const [key, val] of Object.entries(opt.sort)) {
@@ -535,13 +535,14 @@ const get_opt = function (e, table_obj) {
   opt.selector.stat = e.archived ? 4 : 3;
 
   // fill selector with sort field if not exist
-  for (let val of opt.sort) {
-    let field_id = Object.keys(val)[0];
-    if (!opt.selector[field_id]) {
-      opt.selector[field_id] = { $gt: null };
+  if (opt.sort) {
+    for (let val of opt.sort) {
+      let field_id = Object.keys(val)[0];
+      if (!opt.selector[field_id]) {
+        opt.selector[field_id] = { $gt: null };
+      }
     }
   }
-
   opt.fields.push("_id");
   opt.fields.push("_rev");
 
@@ -863,10 +864,10 @@ const query_db = async function (e, db, table_obj) {
     var view_opt = undefined;
     if (key) {
       view_opt = {
-        key: key,
+        key,
         include_docs: !e.ids && view !== "db_index_reduce",
-        limit: limit,
-        skip: skip,
+        limit,
+        skip,
       };
     } else {
       if (e.reduce) {
@@ -884,8 +885,8 @@ const query_db = async function (e, db, table_obj) {
           startkey: e.startkey ? JSON.parse(e.startkey) : "",
           endkey: e.endkey ? JSON.parse(e.endkey) : "",
           include_docs: !e.ids,
-          limit: limit,
-          skip: skip,
+          limit,
+          skip,
           descending: e.desc,
         };
       }