zet-lib 1.4.24 → 1.4.26

package/lib/Util.js

@@ -1442,26 +1442,30 @@ Util.tableShowInGrid = (arr, qey, MYMODEL, myCache, companyId) => {
       arr.map((item) => {
         html += `<tr>`;
         for (let key in item) {
-          var keyFields = key + "Fields";
-          var keyObject = key + "Object";
-          let value = item[key];
-          if (mywidget[key].name == "select") {
-            value = mywidget[key].fields[value] || "";
-          } else if (mywidget[key].name == "relation") {
-            value = value
-              ? Util.array_id_to_zname(
-                  myCache.get(
-                    `${mywidget[key].table}_${MYMODEL.widgets[qey].table}___${key}_${companyId}`
-                  )
-                )[value]
-              : "";
-          } else {
-            if (Util.isNumeric(value)) {
-              value = Util.formatNumber(value, ".");
+          if (mywidget[key]) {
+            if (!mywidget[key].hidden) {
+              var keyFields = key + "Fields";
+              var keyObject = key + "Object";
+              let value = item[key];
+              if (mywidget[key].name == "select") {
+                value = value ? mywidget[key].fields[value] : "";
+              } else if (mywidget[key].name == "relation") {
+                value = value
+                  ? Util.array_id_to_zname(
+                      myCache.get(
+                        `${mywidget[key].table}_${MYMODEL.widgets[qey].table}___${key}_${companyId}`
+                      )
+                    )[value]
+                  : "";
+              } else {
+                if (Util.isNumeric(value)) {
+                  value = Util.formatNumber(value, ".");
+                }
+              }
+
+              html += `<td>${value}</td>`;
             }
           }
-
-          html += `<td>${value}</td>`;
         }
         html += `</tr>`;
       });
@@ -1469,6 +1473,7 @@ Util.tableShowInGrid = (arr, qey, MYMODEL, myCache, companyId) => {
     }
     return html;
   } catch (e) {
+    console.log(e);
     return e + "";
   }
 };

package/lib/zRoute.js

@@ -5059,7 +5059,7 @@ zRoute.deleteSQL = async (table, id, company_id) => {
         throw Error("Data is locked");
       } else {
         //delete all files
-        zRoute.deleteFiles(table, results[0]);
+        await zRoute.deleteFiles(table, results[0]);
         await connection.delete({ table: table, where: where });
         zRoute.modelsCacheRenew(table, company_id);
       }
@@ -5072,7 +5072,7 @@ zRoute.deleteSQL = async (table, id, company_id) => {
   }
 };
 
-zRoute.deleteFiles = (table, result) => {
+zRoute.deleteFiles = async (table, result) => {
   try {
     //check if has files then remove it
     const MYMODELS = myCache.get("MYMODELS");
@@ -5093,6 +5093,29 @@ zRoute.deleteFiles = (table, result) => {
           fs.remove(dir + result[key], () => {});
         }
       }
+      if (widgets[key].name == "dropbox") {
+        if (result[key]) {
+          let dbx = new Dropbox({
+            accessToken: process.env.DROPBOX_ACCESS_TOKEN,
+            refreshToken: process.env.DROPBOX_REFRESH_TOKEN,
+            clientId: process.env.DROPBOX_CLIENT_ID,
+            clientSecret: process.env.DROPBOX_CLIENT_SECRET,
+            fetch: fetch,
+          });
+          const files = result[key];
+          const dropboxPath = `/${table}/${key}`;
+          for (const file of files) {
+            let filePath = `${dropboxPath}/${file}`;
+            try {
+              await dbx.filesDeleteV2({
+                path: filePath,
+              });
+            } catch (e) {
+              console.log(e);
+            }
+          }
+        }
+      }
     }
   } catch (e) {
     console.log(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.4.24",
+  "version": "1.4.26",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"