@xuda.io/xuda-dbs-plugin-xuda 1.0.148 → 1.0.150

package/package.json

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

@@ -501,6 +501,7 @@ const get_opt = function (e, table_obj) {
 
   opt.selector = selector_new;
   opt.selector["udfData.udffileid"] = e.table_id;
+  opt.selector["docType"] = "database";
   opt.selector.stat = e.archived ? 4 : 3;
 
   opt.fields.push("_id");
@@ -744,16 +745,19 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
           mango_index_obj = {
             index: {
-              fields: Object.keys(
-                _.reduce(
-                  opt.sort,
-                  (ret, val) => {
-                    ret[Object.keys(val)[0]] = val;
-                    return ret;
-                  },
-                  opt.selector
-                )
-              ),
+              fields: [
+                ...Object.keys(
+                  _.reduce(
+                    opt.sort,
+                    (ret, val) => {
+                      ret[Object.keys(val)[0]] = val;
+                      return ret;
+                    },
+                    opt.selector
+                  )
+                ),
+                ...["docType", "stat"],
+              ],
             },
             name: index_name,
             ddoc: `mango_index_table_${e.table_id}`,

package/studio.mjs

@@ -515,6 +515,7 @@ const get_opt = function (e, table_obj) {
 
   opt.selector = selector_new;
   opt.selector["udfData.udffileid"] = e.table_id;
+  opt.selector["docType"] = "database";
   opt.selector.stat = e.archived ? 4 : 3;
 
   opt.fields.push("_id");
@@ -763,16 +764,19 @@ const query_db = async function (e, db, table_obj) {
 
           mango_index_obj = {
             index: {
-              fields: Object.keys(
-                _.reduce(
-                  opt.sort,
-                  (ret, val) => {
-                    ret[Object.keys(val)[0]] = val;
-                    return ret;
-                  },
-                  opt.selector
-                )
-              ),
+              fields: [
+                ...Object.keys(
+                  _.reduce(
+                    opt.sort,
+                    (ret, val) => {
+                      ret[Object.keys(val)[0]] = val;
+                      return ret;
+                    },
+                    opt.selector
+                  )
+                ),
+                ...["docType", "stat"],
+              ],
             },
             name: index_name,
             ddoc: `mango_index_table_${e.table_id}`,
@@ -1161,16 +1165,11 @@ export const del = async (params, resolve, reject) => {
   const e = params.e;
   const db = params.db;
 
-  const table_obj = params.table_obj;
-  const data = await db.fetch({ keys: e.ids });
-  var docs_to_delete = [];
-
-  for await (var val of data.rows) {
-    var doc = val.doc;
-
-    if (doc && doc._id) {
+  for await (let row_id of e.ids) {
+    try {
+      let doc = await db.get(row_id);
       if (e.permanent) {
-        docs_to_delete.push({
+        await db.put({
           _id: doc._id,
           _rev: doc._rev,
           _deleted: true,
@@ -1178,41 +1177,38 @@ export const del = async (params, resolve, reject) => {
       } else {
         doc.stat = 4;
         doc.ts = Date.now();
-        docs_to_delete.push(doc);
+        await db.put(doc);
       }
+    } catch (err) {
+      return { code: -110, data: err };
     }
   }
-  try {
-    await db.bulk({ docs: docs_to_delete });
-    resolve(docs_to_delete);
-  } catch (error) {
-    return { code: -110, data: error };
-  }
+  resolve(e.ids);
 };
 
-export const restore = async (params, resolve, reject) => {
-  const e = params.e;
-  const db = params.db;
-  var docs_to_restore = [];
-  const data = await db.fetch({ keys: e.ids });
-
-  for await (var val of data.rows) {
-    var doc = val.doc;
-
-    if (doc && doc._id) {
-      doc.stat = 3;
-      doc.ts = Date.now();
-      docs_to_restore.push(doc);
-    }
-  }
-
-  try {
-    await db.bulk({ docs: docs_to_restore });
-    resolve(docs_to_restore);
-  } catch (error) {
-    return reject(error);
-  }
-};
+// export const restore = async (params, resolve, reject) => {
+//   const e = params.e;
+//   const db = params.db;
+//   var docs_to_restore = [];
+//   const data = await db.fetch({ keys: e.ids });
+
+//   for await (var val of data.rows) {
+//     var doc = val.doc;
+
+//     if (doc && doc._id) {
+//       doc.stat = 3;
+//       doc.ts = Date.now();
+//       docs_to_restore.push(doc);
+//     }
+//   }
+
+//   try {
+//     await db.bulk({ docs: docs_to_restore });
+//     resolve(docs_to_restore);
+//   } catch (error) {
+//     return reject(error);
+//   }
+// };
 
 export const create_design = async (params, resolve, reject) => {
   const db = params.db;