@xuda.io/xuda-dbs-plugin-xuda 1.0.190 → 1.0.192

package/package.json

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

@@ -254,7 +254,19 @@ const get_opt = function (e, table_obj) {
     opt.sort = sort;
   }
 
-  if (e?.sortModel?.length) {
+  // if (e?.sortModel?.length) {
+  //   opt.sort = JSON.parse(e.sortModel);
+  //   if (opt.sort) {
+  //     for (const [key, val] of Object.entries(opt.sort)) {
+  //       var field_name = val.colId;
+  //       opt.sort[key] = {
+  //         ["udfData.data." + field_name]: val.sort,
+  //       };
+  //     }
+  //   }
+  // }
+
+  if (e?.sortModel && JSON.parse(e.sortModel).length) {
     opt.sort = JSON.parse(e.sortModel);
     if (opt.sort) {
       for (const [key, val] of Object.entries(opt.sort)) {
@@ -478,6 +490,50 @@ const get_opt = function (e, table_obj) {
 
   var selector_new = {};
 
+  function replaceKeysInQuery(query) {
+    const keys_to_replace = table_obj.tableFields.map((e) => {
+      return e.id;
+    });
+
+    // Helper function to recursively process the query object
+    function recursiveReplace(obj) {
+      if (typeof obj === "object" && obj !== null) {
+        // Create a new object to store the modified query
+        let newObj = Array.isArray(obj) ? [] : {};
+
+        // Traverse through the object
+        for (let key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            // If the key is in the keys_to_replace array, replace it
+            let newKey = keys_to_replace.includes(key)
+              ? `udfData.data.${key}`
+              : key;
+
+            // Recursively process nested objects
+            newObj[newKey] = recursiveReplace(obj[key]);
+          }
+        }
+
+        return newObj;
+      } else {
+        // If it's not an object or array, return the value as is
+        return obj;
+      }
+    }
+
+    // Start the recursive replacement
+    return recursiveReplace(query);
+  }
+
+  if (e.filterModelMongo) {
+    selector_new["$and"] = [replaceKeysInQuery(e.filterModelMongo)];
+  }
+  if (e.filterModelUserMongo) {
+    if (!selector_new["$and"]) {
+      selector_new["$and"] = [];
+    }
+    selector_new["$and"] = [replaceKeysInQuery(e.filterModelUserMongo)];
+  }
   for (const [key, val] of Object.entries(opt.selector)) {
     selector_new["udfData.data." + key] = val;
   }

package/studio.mjs

@@ -509,13 +509,13 @@ const get_opt = function (e, table_obj) {
 
   var selector_new = {};
 
-  for (const [key, val] of Object.entries(opt.selector)) {
-    if (key.substring(0, 1) === "$") {
-      selector_new[key] = val;
-      continue;
-    }
-    selector_new["udfData.data." + key] = val;
-  }
+  // for (const [key, val] of Object.entries(opt.selector)) {
+  //   if (key.substring(0, 1) === "$") {
+  //     selector_new[key] = val;
+  //     continue;
+  //   }
+  //   selector_new["udfData.data." + key] = val;
+  // }
 
   // if (e.viewDbQuery) {
   //   for (const [key, val] of Object.entries(table_obj.tableFields)) {