zet-lib 1.4.16 → 1.4.18

package/lib/zAppRouter.js

@@ -2008,19 +2008,14 @@ router.post("/zdropbox/:table/:field", handleTokenRefresh, async (req, res) => {
 router.post("/zdropbox-attributes", handleTokenRefresh, async (req, res) => {
   try {
     let userId = res.locals.userId;
-    let dir = `${dirRoot}/public/zdropzone/${userId}`;
-    if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true });
-    }
     let body = req.body;
+    console.log(body);
     let category = body.category;
     let name = `dropbox__${userId}__${body.table}__${body.field}__${body.type}`;
-    //dropzone__${res.locals.userId}__${table}__${key}__create
     let arr = myCache.has(name) ? myCache.get(name) : [];
     if (category === "add") {
       arr.push(body.file);
     } else {
-      name = `dropzone__${userId}__${body.table}__${body.field}__${body.type}`;
       if (myCache.has(name)) {
         arr = myCache.get(name);
       }
@@ -2035,51 +2030,77 @@ router.post("/zdropbox-attributes", handleTokenRefresh, async (req, res) => {
 });
 
 //get all files and meta in dropbox
-router.post("/zdropbox-files", handleTokenRefresh, async (req, res) => {
+router.post("/zdropbox-files", async (req, res) => {
   let datas = [];
   const room = res.locals.token;
   try {
     const { files, table, field } = req.body;
     let dir = `/${table}/${field}`;
     for (file of files) {
-      let pathFile = `${dir}/${file.fileName}`;
-      //console.log(pathFile)
+      let fileName = file.fileName;
+      let ext = Util.fileExtension(fileName);
+      const mockFile = {
+        name: fileName,
+        id: fileName,
+        path: "/img/dropbox.png",
+        link: "/img/dropbox.png",
+        isImage: ext.image ? ["image"] : null,
+        size: 1234,
+        modified: "324234",
+        accepted: true,
+      };
+      datas.push(mockFile);
+    }
+  } catch (e) {
+    console.log(e);
+    res.status(500).send(e + "");
+  }
+  res.json(datas);
+});
+router.post("/zdropbox-file/:index", handleTokenRefresh, async (req, res) => {
+  let datas = {};
+  const room = res.locals.token;
+  try {
+    const { fileName, table, field } = req.body;
+    let dir = `/${table}/${field}`;
+    let pathFile = `${dir}/${fileName}`;
+    //console.log(pathFile)
+    try {
+      const metadata = await dbx.filesGetMetadata({
+        path: pathFile,
+      });
+      let link = ``;
       try {
-        const metadata = await dbx.filesGetMetadata({
+        const response = await dbx.filesGetTemporaryLink({
           path: pathFile,
         });
-        let link = ``;
-        try {
-          const response = await dbx.filesGetTemporaryLink({
-            path: pathFile,
-          });
-          link = response.result.link;
-        } catch (error) {
-          console.error("Error getting temporary link:", error);
-          io.to(room).emit(
-            "errormessage",
-            `Error getting temporary link:  ${error.message}`
-          );
-        }
-        const mockFile = {
-          name: metadata.result.name,
-          id: metadata.result,
-          path: metadata.result.path_display,
-          link: link,
-          isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
-          size: metadata.result.size,
-          modified: metadata.result.server_modified,
-          accepted: true,
-        };
-        //console.log(mockFile)
-        datas.push(mockFile);
-      } catch (e) {
-        console.log(e);
+        link = response.result.link;
+      } catch (error) {
+        console.error("Error getting temporary link:", error);
         io.to(room).emit(
           "errormessage",
-          `${e.message} Error ${pathFile} not exist in dropbox`
+          `Error getting temporary link:  ${error.message}`
         );
       }
+      const mockFile = {
+        name: metadata.result.name,
+        id: metadata.result,
+        path: metadata.result.path_display,
+        link: link,
+        isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
+        size: metadata.result.size,
+        modified: metadata.result.server_modified,
+        accepted: true,
+        index: req.params.index,
+      };
+      //console.log(mockFile)
+      datas = mockFile;
+    } catch (e) {
+      console.log(e);
+      io.to(room).emit(
+        "errormessage",
+        `${e.message} Error ${pathFile} not exist in dropbox, Please reload your browser !!`
+      );
     }
   } catch (e) {
     console.log(e);
@@ -2088,32 +2109,16 @@ router.post("/zdropbox-files", handleTokenRefresh, async (req, res) => {
   res.json(datas);
 });
 
-/*
-let userId = res.locals.userId;
-    let cacheName = req.body.cname.replace("ZUSER___ID", userId);
-    let dir = `${dirRoot}/public/zdropzone/${userId}`;
-    if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true });
-    }
-    let filename = `${dirRoot}/public/zdropzone/${userId}/${req.body.file}`;
-    if (Util.fileExist(filename)) {
-      await fs.unlink(filename);
-      if (myCache.has(cacheName)) {
-        arr = myCache.get(name);
-      }
-      arr = Util.arrayDelete(arr, body.file);
-      myCache.set(name, arr);
-    }
-    res.json("ok");
- */
-// Delete file dropbox
+// Delete file dicache dulu kemudian submit delete dropbox file
 router.post("/zdropbox-remove/", handleTokenRefresh, async (req, res) => {
   try {
     let body = req.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);
     let splits = cname.split("__");
     let table = splits[2];
     let field = splits[3];
@@ -2122,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

@@ -3123,7 +3123,7 @@ zRoute.forms = (
               dropbox_data_arr.push({ fileName: item, size: fileSizeInBytes });
             });
             myCache.set(
-              `dropbox_${res.locals.userId}__${MYMODEL.table}__${key}__${data.id}`,
+              `dropbox__${res.locals.userId}__${MYMODEL.table}__${key}__${data.id}`,
               obj.value
             );
           }
@@ -4330,10 +4330,17 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
                     imageElement.setAttribute('data-name', mockFile.name);
                     imageElement.setAttribute('data-link', mockFile.link);
                     $(imageElement).attr('id', mockFile.id.content_hash);
-                    $(imageElement).css('z-index',9999)
+                    $(imageElement).css('z-index',9999);
+                    ajaxPost('/zdropbox-file/' +index,{fileName:mockFile.name,table:"${MYMODEL.table}",field:"${item}"}, function(result) {
+                        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)) {
+                            modaldropbox();
+                        }
+                    })
                 })
-                let time = datas.length <10 ? 2000 : 4000;
-                setTimeout(function(){
+                function modaldropbox() {
                     $(".divzdropbox").each(function () {
                         let ext = $(this).attr('data-ext');
                         if (ext == "gif" || ext == "png" || ext == "jpeg" || ext == "jpg" || ext == "bmp" || ext == "webp" || ext == "jiff" || ext == "svg" || ext == "avif") {
@@ -4349,7 +4356,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
                             })
                         }
                     })
-                },time);
+                }
             })
          }
     }
@@ -4745,11 +4752,6 @@ zRoute.insertSQL = async (req, res, table, data) => {
                   from_path: `${path_src}/${item}`,
                   to_path: `${path_dest}/${newItem}`,
                 });
-                /*await dbx.filesMoveV2({
-                                  from_path: `${path_src}/${item}`,
-                                  to_path: `${path_dest}/${newItem}`,
-                                  autorename: true
-                                });*/
                 newArr.push(newItem);
               } catch (e) {
                 console.log(e);
@@ -4814,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] = [];
@@ -4855,8 +4858,102 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
           });
           data[key] = Util.array_to_jsonb(newArr);
         }
+      } else if (MYMODEL.widgets[key].name === "dropbox") {
+        // Initialize Dropbox client
+        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,
+        });
+        //console.log('has dropbox')
+        let dir1 = `/${MYMODEL.table}/${key}`;
+        let dir2 = `/temps/${MYMODEL.table}/${key}/${userId}`;
+        try {
+          await dbx.filesCreateFolderV2({
+            path: dir1,
+            autorename: false,
+          });
+        } catch (error) {
+          if (error.status !== 409) {
+            // 409 means folder already exists
+            //throw error;
+          }
+        }
+        let name = `dropbox__${userId}__${MYMODEL.table}__${key}__${whereData.id}`;
+        if (myCache.has(name)) {
+          let arr = myCache.get(name) || [];
+          let newArr = [];
+          let time = new Date().getTime();
+          for (const item of arr) {
+            try {
+              //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);
+              }
+            }
+          }
+          data[key] = Util.array_to_jsonb(newArr);
+        }
+        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 {
+                await dbx.filesDeleteV2({
+                  path: `${dir2}/${item}`,
+                });
+              } catch (e) {
+                console.log(e);
+              }
+            }
+          }
+        }
       }
     }
+
+    //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.16",
+  "version": "1.4.18",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"