@xuda.io/xuda-dbs-plugin-xuda 1.0.303 → 1.0.305

package/package.json

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

@@ -285,7 +285,12 @@ 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 || !JSON.parse(e.sortModel).length) {
+
+  const _sort_model =
+    typeof e.sortModel === "string" ? JSON.parse(e.sortModel) : e.sortModel;
+
+  // if (!e?.sortModel || !JSON.parse(e.sortModel).length) {
+  if (!_sort_model.length) {
     // added 2021 09 10
     if (opt.sort) {
       for (const [key, val] of Object.entries(opt.sort)) {
@@ -372,14 +377,18 @@ const get_opt = function (e, table_obj) {
       replaceRegexOptions(replaceKeysInQuery(JSON.parse(e.filterModelMongo))),
     ];
   }
-  if (e.filterModelUserMongo) {
+
+  const _filterModelUserMongo =
+    typeof e.filterModelUserMongo === "string"
+      ? JSON.parse(e.filterModelUserMongo)
+      : e.filterModelUserMongo;
+
+  if (!_.isEmpty(_filterModelUserMongo)) {
     if (!selector_new["$and"]) {
       selector_new["$and"] = [];
     }
     selector_new["$and"].push(
-      replaceRegexOptions(
-        replaceKeysInQuery(JSON.parse(e.filterModelUserMongo))
-      )
+      replaceRegexOptions(replaceKeysInQuery(_filterModelUserMongo))
     );
   }