zet-lib 1.4.17 → 1.4.18

package/lib/zAppRouter.js

@@ -2113,12 +2113,12 @@ router.post("/zdropbox-file/:index", handleTokenRefresh, async (req, res) => {
 router.post("/zdropbox-remove/", handleTokenRefresh, async (req, res) => {
   try {
     let body = req.body;
-    console.log(body);
+    //console.log(body);
     const userId = res.locals.userId;
     const fileName = body.file;
     let cname = body.cname.replace("ZUSER___ID", userId);
     let cacheName = cname;
-    console.log(cacheName);
+    //console.log(cacheName);
     let splits = cname.split("__");
     let table = splits[2];
     let field = splits[3];
@@ -2127,19 +2127,27 @@ router.post("/zdropbox-remove/", handleTokenRefresh, async (req, res) => {
     await ensureFolder(dir);
     const filePath = `${dir}/${fileName}`;
     let arr = [];
+    if (type != "create") {
+      cacheName = cacheName + "__remove";
+    }
     if (myCache.has(cacheName)) {
       arr = myCache.get(cacheName);
     }
-    try {
-      /* await dbx.filesDeleteV2({
-        path: filePath,
-      });*/
-      arr = Util.arrayDelete(arr, body.file);
+    //console.log(cacheName)
+    if (type == "create") {
+      try {
+        await dbx.filesDeleteV2({
+          path: filePath,
+        });
+        arr = Util.arrayDelete(arr, body.file);
+        myCache.set(cacheName, arr);
+      } catch (e) {
+        console.log(e);
+      }
+    } else {
+      arr.push(body.file);
       myCache.set(cacheName, arr);
-    } catch (e) {
-      console.log(e);
     }
-
     res.json({ success: true });
   } catch (error) {
     console.error("Error deleting file:", error);

package/lib/zRoute.js

@@ -4335,7 +4335,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
                         imageElement.setAttribute('data-link', result.link);
                         $(imageElement).attr('id', result.id.content_hash);
                         $(imageElement).find("img").attr("src", result.link);
-                        if(+result.index == (dropbox_${item}_data.length - 1) ) {
+                        if(+result.index == (dropbox_${item}_data.length - 1)) {
                             modaldropbox();
                         }
                     })
@@ -4816,6 +4816,7 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
     let hasImages = false;
     let tables = [];
     let tableFields = {};
+    let movDropboxArr = [];
     for (let key in MYMODEL.widgets) {
       if (MYMODEL.widgets[key].name == "table") {
         tableFields[key] = [];
@@ -4858,10 +4859,6 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
           data[key] = Util.array_to_jsonb(newArr);
         }
       } else if (MYMODEL.widgets[key].name === "dropbox") {
-        //console.log('has dropbox')
-        let path_src = `/temps/${MYMODEL.table}/${key}/${userId}`;
-        let path_dest = `/${MYMODEL.table}/${key}`;
-
         // Initialize Dropbox client
         let dbx = new Dropbox({
           accessToken: process.env.DROPBOX_ACCESS_TOKEN,
@@ -4870,16 +4867,18 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
           clientSecret: process.env.DROPBOX_CLIENT_SECRET,
           fetch: fetch,
         });
-
+        //console.log('has dropbox')
+        let dir1 = `/${MYMODEL.table}/${key}`;
+        let dir2 = `/temps/${MYMODEL.table}/${key}/${userId}`;
         try {
           await dbx.filesCreateFolderV2({
-            path: path_dest,
+            path: dir1,
             autorename: false,
           });
         } catch (error) {
           if (error.status !== 409) {
             // 409 means folder already exists
-            throw error;
+            //throw error;
           }
         }
         let name = `dropbox__${userId}__${MYMODEL.table}__${key}__${whereData.id}`;
@@ -4887,49 +4886,74 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
           let arr = myCache.get(name) || [];
           let newArr = [];
           let time = new Date().getTime();
-          arr.map((item) => {
-            //todo
-            //jika item tidak ada di dropbox
+          for (const item of arr) {
             try {
-            } catch (e) {}
-            if (!Util.fileExist(path_dest + item)) {
-              let newItem = time + item;
-              newArr.push(newItem);
-              if (Util.fileExist(path_src + item)) {
-                fs.rename(path_src + item, path_dest + newItem);
+              //check in dir1
+              let filepath1 = `${dir1}/${item}`;
+              // Get the file metadata to ensure we have the correct path
+              const metadata = await dbx.filesGetMetadata({
+                path: filepath1,
+              });
+              const finalPath = metadata.result.path_display;
+              if (finalPath) {
+                newArr.push(item);
+              }
+            } catch (e) {
+              //check in dir2 temp folder
+              try {
+                let filepath2 = `${dir2}/${item}`;
+                const metadata = await dbx.filesGetMetadata({
+                  path: filepath2,
+                });
+                const finalPath = metadata.result.path_display;
+                if (finalPath) {
+                  let newItem = Util.cleanString(time + item);
+                  newArr.push(newItem);
+                  movDropboxArr.push({
+                    from_path: `${dir2}/${item}`,
+                    to_path: `${dir1}/${newItem}`,
+                  });
+                }
+              } catch (e) {
+                console.log(e);
               }
-            } else {
-              newArr.push(item);
             }
-          });
+          }
           data[key] = Util.array_to_jsonb(newArr);
         }
-        /////
-        /*let name = `dropbox__${res.locals.userId}__${table}__${key}__create`;
-        if (myCache.has(name)) {
-          let arr = myCache.get(name);
-          let newArr = [];
-          if (arr.length > 0) {
-            let time = new Date().getTime();
-            arr.map(async (item) => {
-              //check
+        myCache.del(name);
+
+        let removeName = name + "__remove";
+        if (myCache.has(removeName)) {
+          let removesArr = myCache.get(removeName) || [];
+          for (const item of removesArr) {
+            //hapus item di folder dir1 atau dir2
+            try {
+              await dbx.filesDeleteV2({
+                path: `${dir1}/${item}`,
+              });
+            } catch (e) {
+              console.log(e);
               try {
-                let newItem = Util.cleanString(time + item);
-                movDropboxArr.push({
-                  from_path: `${path_src}/${item}`,
-                  to_path: `${path_dest}/${newItem}`,
+                await dbx.filesDeleteV2({
+                  path: `${dir2}/${item}`,
                 });
-                newArr.push(newItem);
               } catch (e) {
                 console.log(e);
               }
-            });
-            data[key] = Util.array_to_jsonb(newArr);
+            }
           }
-        }*/
-        myCache.del(name);
+        }
       }
     }
+
+    //dropbox
+    if (movDropboxArr.length > 0) {
+      setTimeout(function () {
+        zRoute.moveDropbox(movDropboxArr);
+      }, 3000);
+    }
+
     let result = await connection.result({
       table: MYMODEL.table,
       where: whereData,

package/package.json

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