zet-lib 1.4.25 → 1.4.27

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/index.js

@@ -27,6 +27,7 @@ module.exports = {
   zPage: require("./zPage"),
   zTester: require("./zTester"),
   zCache: require("./zCache"),
+  zDropbox: require("./zDropbox"),
   puppeteer: require("puppeteer"),
   moment: require("moment"),
   ejs: require("ejs"),

package/lib/zAppRouter.js

@@ -27,6 +27,7 @@ const path = require("path");
 const { Dropbox } = require("dropbox");
 const fetch = require("isomorphic-fetch");
 const JSZip = require("jszip");
+const zDropbox = require("./zDropbox");
 
 /*
  ajax Post
@@ -711,16 +712,6 @@ router.post("/zzapproval", async (req, res) => {
     }
     if (data.status == 2) {
       //send activity
-      /* await zRoute.insertSQL(req, res, "zactivity", {
-                             user_id: res.locals.userId,
-                             table: MYMODEL.table,
-                             id_data: data.id,
-                             status: data.status,
-                             status_label: MYMODEL.widgets.status.fields[data.status],
-                             title: MYMODEL.widgets.status.fields[data.status],
-                             description: users[res.locals.userId].fname + " " +users[res.locals.userId].lname ,
-                             data: JSON.stringify(data)
-                         });*/
       //if serial
       if (data.type == 2) {
         approvers = [approvers[0]];
@@ -788,41 +779,8 @@ router.post("/zzapproval", async (req, res) => {
           } \r\n \r\n`;
           textWa += "We have some document for you.\r\n";
           textWa += `Please click the link above to view the document.\r\n${link}`;
-
-          /* await whatsapp({
-                                             to: phone,
-                                             text: textWa,
-                                             sections: JSON.stringify(sections),
-                                             buttonText: "Click me for details"
-                                         });*/
         }
-
         //send notification
-        /* await zRoute.insertSQL(req, res, "znotification", {
-                                     user_id: item,
-                                     table: MYMODEL.table,
-                                     id_data: data.id,
-                                     status: 1,
-                                     link: "/za/" + post.token,
-                                     status_label: MYMODEL.widgets.status.fields[1],
-                                     title: `Need Approve`,
-                                     description: data.title,
-                                     token: post.token
-                                 });*/
-
-        //send todolist
-        /* await zRoute.insertSQL(req, res, "ztodolist", {
-                                     user_id: item,
-                                     table: MYMODEL.table,
-                                     id_data: data.id,
-                                     status: 1,
-                                     link: "/za/" + post.token,
-                                     status_label: MYMODEL.widgets.status.fields[1],
-                                     title: `Need Approve`,
-                                     description: data.title,
-                                     users: JSON.stringify(allUsers)
-                                 });*/
-
         //send toastr using socket.io
         io.to(users[item].token).emit("message", "Need Approve " + data.title);
       });
@@ -866,51 +824,7 @@ router.post("/zzapproval", async (req, res) => {
           } \r\n \r\n`;
           textWa += "We have some document for you.\r\n";
           textWa += `Please click the link above to view the document.\r\n${link}`;
-          /*  await whatsapp({
-                                              to: phone,
-                                              text: textWa,
-                                              sections: JSON.stringify(sections),
-                                              buttonText: "Click me for details"
-                                          });*/
         }
-
-        //send activity
-        /*                await cRoute.insertSQL(req, res, "zactivity",{
-                                 user_id:item,
-                                 table:MYMODEL.table,
-                                 id_data:data.id,
-                                 status:7,
-                                 status_label: MYMODEL.widgets.status.fields[7],
-                                 title : MYMODEL.widgets.status.fields[7],
-                                 description: data.title,
-                                 data:JSON.stringify(data)
-                                 });*/
-
-        //send notification
-        /*   await zRoute.insertSQL(req, res, "znotification", {
-                                       user_id: item,
-                                       table: MYMODEL.table,
-                                       id_data: data.id,
-                                       status: 1,
-                                       link: "/za/" + post.token,
-                                       status_label: MYMODEL.widgets.status.fields[1],
-                                       title: `Need Acknowledge`,
-                                       description: data.title,
-                                       token: post.token
-                                   });
-
-                                   //send todolist
-                                   await zRoute.insertSQL(req, res, "ztodolist", {
-                                       user_id: item,
-                                       table: MYMODEL.table,
-                                       id_data: data.id,
-                                       status: 1,
-                                       link: "/za/" + post.token,
-                                       status_label: MYMODEL.widgets.status.fields[1],
-                                       title: `Need Acknowledge`,
-                                       description: data.title,
-                                       users: JSON.stringify(allUsers)
-                                   });*/
         io.to(users[item].token).emit(
           "message",
           "Need Acknowledge " + data.title
@@ -1045,25 +959,6 @@ router.get("/za/:token", csrfProtection, async (req, res) => {
     //send activity
     if (result.mystatus == 7) {
       MYMODEL = MYMODELS["zapprovals"];
-      /* await connection.insert({
-                             table: "zactivity",
-                             data: {
-                                 company_id: result.company_id,
-                                 created_at: Util.now(),
-                                 created_by: result.user_id,
-                                 updated_by: result.user_id,
-                                 user_id: result.user_id,
-                                 table: MYMODEL.table,
-                                 id_data: result.ide,
-                                 status: 6,
-                                 status_label: MYMODEL.widgets.status.fields[6],
-                                 title: `${MYMODEL.widgets.status.fields[6]}`,
-                                 description: `Ok `,
-                                 data: JSON.stringify(data)
-                             }
-                         });
-             */
-
       await connection.update({
         table: "zapprovals_details",
         where: {
@@ -1869,168 +1764,80 @@ router.post("/zcompress-dropzone", async (req, res) => {
   }
 });
 
-//for 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,
-});
-
-// Function to refresh access token
-async function refreshAccessToken() {
-  try {
-    const response = await fetch("https://api.dropbox.com/oauth2/token", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-      },
-      body: new URLSearchParams({
-        grant_type: "refresh_token",
-        refresh_token: process.env.DROPBOX_REFRESH_TOKEN,
-        client_id: process.env.DROPBOX_CLIENT_ID,
-        client_secret: process.env.DROPBOX_CLIENT_SECRET,
-      }),
-    });
-
-    const data = await response.json();
-
-    if (data.access_token) {
-      // Update the access token in the Dropbox client
-      dbx = new Dropbox({
-        accessToken: data.access_token,
-        refreshToken: process.env.DROPBOX_REFRESH_TOKEN,
-        clientId: process.env.DROPBOX_CLIENT_ID,
-        clientSecret: process.env.DROPBOX_CLIENT_SECRET,
-        fetch: fetch,
-      });
-
-      // Update the .env file with the new access token
-      const envContent = fs.readFileSync(`${dirRoot}/.env`, "utf8");
-      const updatedEnv = envContent.replace(
-        /DROPBOX_ACCESS_TOKEN=.*/,
-        `DROPBOX_ACCESS_TOKEN=${data.access_token}`
-      );
-      fs.writeFileSync(`${dirRoot}/.env`, updatedEnv);
-
-      return data.access_token;
-    } else {
-      throw new Error("Failed to refresh access token");
-    }
-  } catch (error) {
-    console.error("Error refreshing access token:", error);
-    throw error;
-  }
-}
-
-// Middleware to handle token refresh
-async function handleTokenRefresh(req, res, next) {
-  try {
-    // Try to make a test API call
-    await dbx.usersGetCurrentAccount();
-    next();
-  } catch (error) {
-    if (error.status === 401) {
-      try {
-        // Token expired, try to refresh it
-        await refreshAccessToken();
-        next();
-      } catch (refreshError) {
-        res
-          .status(401)
-          .json({ error: "Authentication failed. Please re-authenticate." });
-      }
-    } else {
-      next(error);
-    }
-  }
-}
-
-// Serve static files
-//app.use(express.static('public'));
-// Create test folder if it doesn't exist
-//dir = '/test'
-async function ensureFolder(dir) {
-  try {
-    await dbx.filesCreateFolderV2({
-      path: dir,
-      autorename: false,
-    });
-  } catch (error) {
-    if (error.status !== 409) {
-      // 409 means folder already exists
-      throw error;
-    }
-  }
-}
-
 // Function to delay execution
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
+let dbx = zDropbox.dbx;
 // Upload endpoint
-router.post("/zdropbox/:table/:field", handleTokenRefresh, async (req, res) => {
-  try {
-    if (!req.files || !req.files.file) {
-      return res.status(400).json({ error: "No file uploaded" });
-    }
-    const userId = res.locals.userId;
-    const table = req.params.table;
-    const field = req.params.field;
-    const file = req.files.file;
-    const fileName = file.name;
-    //ensure folder
-    const dir = `/temps/${table}/${field}/${userId}`;
-    await ensureFolder(dir);
-    const filePath = `${dir}/${fileName}`;
-    /*console.log("Uploading file to path:", filePath);
+router.post(
+  "/zdropbox/:table/:field",
+  zDropbox.handleTokenRefresh,
+  async (req, res) => {
+    try {
+      if (!req.files || !req.files.file) {
+        return res.status(400).json({ error: "No file uploaded" });
+      }
+      const userId = res.locals.userId;
+      const table = req.params.table;
+      const field = req.params.field;
+      const file = req.files.file;
+      const fileName = file.name;
+      //ensure folder
+      const dir = `/temps/${table}/${field}/${userId}`;
+      await zDropbox.ensureFolder(dir);
+      const filePath = `${dir}/${fileName}`;
+      /*console.log("Uploading file to path:", filePath);
     console.log("File size:", file.size);
     console.log("File name:", fileName);*/
 
-    const response = await dbx.filesUpload({
-      path: filePath,
-      contents: file.data,
-      mode: { ".tag": "add" },
-      autorename: true,
-    });
-    res.json("ok");
-  } catch (error) {
-    console.error("Error details:", {
-      message: error.message,
-      stack: error.stack,
-      response: error.response,
-    });
-    res.status(500).json({
-      error: "Failed to upload file",
-      details: error.message,
-    });
+      const response = await dbx.filesUpload({
+        path: filePath,
+        contents: file.data,
+        mode: { ".tag": "add" },
+        autorename: true,
+      });
+      res.json("ok");
+    } catch (error) {
+      console.error("Error details:", {
+        message: error.message,
+        stack: error.stack,
+        response: error.response,
+      });
+      res.status(500).json({
+        error: "Failed to upload file",
+        details: error.message,
+      });
+    }
   }
-});
+);
 
-router.post("/zdropbox-attributes", handleTokenRefresh, async (req, res) => {
-  try {
-    let userId = res.locals.userId;
-    let body = req.body;
-    console.log(body);
-    let category = body.category;
-    let name = `dropbox__${userId}__${body.table}__${body.field}__${body.type}`;
-    let arr = myCache.has(name) ? myCache.get(name) : [];
-    if (category === "add") {
-      arr.push(body.file);
-    } else {
-      if (myCache.has(name)) {
-        arr = myCache.get(name);
+router.post(
+  "/zdropbox-attributes",
+  zDropbox.handleTokenRefresh,
+  async (req, res) => {
+    try {
+      let userId = res.locals.userId;
+      let body = req.body;
+      console.log(body);
+      let category = body.category;
+      let name = `dropbox__${userId}__${body.table}__${body.field}__${body.type}`;
+      let arr = myCache.has(name) ? myCache.get(name) : [];
+      if (category === "add") {
+        arr.push(body.file);
+      } else {
+        if (myCache.has(name)) {
+          arr = myCache.get(name);
+        }
+        arr = Util.arrayDelete(arr, body.file);
       }
-      arr = Util.arrayDelete(arr, body.file);
+      myCache.set(name, arr);
+      res.json("ok");
+    } catch (e) {
+      console.log(e);
+      res.status(500).send(e + "");
     }
-    myCache.set(name, arr);
-    res.json("ok");
-  } catch (e) {
-    console.log(e);
-    res.status(500).send(e + "");
   }
-});
+);
 
 //get all files and meta in dropbox
 router.post("/zdropbox-files", async (req, res) => {
@@ -2061,14 +1868,16 @@ router.post("/zdropbox-files", async (req, res) => {
   res.json(datas);
 });
 
-router.post("/zdropbox-file/:index", handleTokenRefresh, async (req, res) => {
-  let datas = {};
-  const room = res.locals.token;
-  try {
+router.post(
+  "/zdropbox-file/:index",
+  zDropbox.handleTokenRefresh,
+  async (req, res) => {
+    let datas = {};
+    const room = res.locals.token;
     const { fileName, table, field } = req.body;
     let dir = `/${table}/${field}`;
     let pathFile = `${dir}/${fileName}`;
-    //console.log(pathFile)
+    console.log(pathFile);
     try {
       const metadata = await dbx.filesGetMetadata({
         path: pathFile,
@@ -2129,85 +1938,94 @@ router.post("/zdropbox-file/:index", handleTokenRefresh, async (req, res) => {
         `${e.message} Error ${pathFile} not exist in dropbox, Please reload your browser !!`
       );
     }
-  } catch (e) {
-    console.log(e);
-    res.status(500).send(e + "");
+    res.json(datas);
   }
-  res.json(datas);
-});
+);
 
 // 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];
-    let type = splits[4];
-    const dir = `/temps/${table}/${field}/${userId}`;
-    await ensureFolder(dir);
-    const filePath = `${dir}/${fileName}`;
-    let arr = [];
-    if (type != "create") {
-      cacheName = cacheName + "__remove";
-    }
-    if (myCache.has(cacheName)) {
-      arr = myCache.get(cacheName);
-    }
-    //console.log(cacheName)
-    if (type == "create") {
-      try {
-        await dbx.filesDeleteV2({
-          path: filePath,
-        });
-        arr = Util.arrayDelete(arr, body.file);
+router.post(
+  "/zdropbox-remove/",
+  zDropbox.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];
+      let type = splits[4];
+      const dir = `/temps/${table}/${field}/${userId}`;
+      await zDropbox.ensureFolder(dir);
+      const filePath = `${dir}/${fileName}`;
+      let arr = [];
+      if (type != "create") {
+        cacheName = cacheName + "__remove";
+      }
+      if (myCache.has(cacheName)) {
+        arr = myCache.get(cacheName);
+      }
+      //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);
       }
-    } else {
-      arr.push(body.file);
-      myCache.set(cacheName, arr);
+      res.json({ success: true });
+    } catch (error) {
+      console.error("Error deleting file:", error);
+      res.status(500).json({ error: "Error deleting file" });
     }
-    res.json({ success: true });
-  } catch (error) {
-    console.error("Error deleting file:", error);
-    res.status(500).json({ error: "Error deleting file" });
   }
-});
+);
 
 // Endpoint to check token status
-router.get("/zdropbox-check-token", handleTokenRefresh, async (req, res) => {
-  try {
-    await dbx.usersGetCurrentAccount();
-    res.json({ status: "valid" });
-  } catch (error) {
-    res.status(401).json({ status: "invalid" });
+router.get(
+  "/zdropbox-check-token",
+  zDropbox.handleTokenRefresh,
+  async (req, res) => {
+    try {
+      await dbx.usersGetCurrentAccount();
+      res.json({ status: "valid" });
+    } catch (error) {
+      res.status(401).json({ status: "invalid" });
+    }
   }
-});
+);
 
 // Get temporary link for a file
-router.post("/zdropbox-get-temp-link", handleTokenRefresh, async (req, res) => {
-  try {
-    const response = await dbx.filesGetTemporaryLink({
-      path: req.body.path,
-    });
-    res.json({ link: response.result.link });
-  } catch (error) {
-    console.error("Error getting temporary link:", error);
-    res.status(500).json({ error: "Error getting temporary link" });
+router.post(
+  "/zdropbox-get-temp-link",
+  zDropbox.handleTokenRefresh,
+  async (req, res) => {
+    try {
+      const response = await dbx.filesGetTemporaryLink({
+        path: req.body.path,
+      });
+      res.json({ link: response.result.link });
+    } catch (error) {
+      console.error("Error getting temporary link:", error);
+      res.status(500).json({ error: "Error getting temporary link" });
+    }
   }
-});
+);
 
 router.get(
   "/zdropbox-view/:table/:field/:item",
-  handleTokenRefresh,
+  zDropbox.handleTokenRefresh,
   async (req, res) => {
     try {
       let item = req.params.item;

package/lib/zDropbox.js

@@ -0,0 +1,134 @@
+require("dotenv").config();
+const { Dropbox } = require("dropbox");
+const fetch = require("isomorphic-fetch");
+const Util = require("./Util");
+
+const zDropbox = {};
+
+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,
+});
+
+zDropbox.dbx = dbx;
+
+// Function to refresh access token
+zDropbox.refreshAccessToken = async () => {
+  try {
+    const response = await fetch("https://api.dropbox.com/oauth2/token", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      body: new URLSearchParams({
+        grant_type: "refresh_token",
+        refresh_token: process.env.DROPBOX_REFRESH_TOKEN,
+        client_id: process.env.DROPBOX_CLIENT_ID,
+        client_secret: process.env.DROPBOX_CLIENT_SECRET,
+      }),
+    });
+
+    const data = await response.json();
+
+    if (data.access_token) {
+      // Update the access token in the Dropbox client
+      dbx = new Dropbox({
+        accessToken: data.access_token,
+        refreshToken: process.env.DROPBOX_REFRESH_TOKEN,
+        clientId: process.env.DROPBOX_CLIENT_ID,
+        clientSecret: process.env.DROPBOX_CLIENT_SECRET,
+        fetch: fetch,
+      });
+
+      // Update the .env file with the new access token
+      const envContent = fs.readFileSync(`${dirRoot}/.env`, "utf8");
+      const updatedEnv = envContent.replace(
+        /DROPBOX_ACCESS_TOKEN=.*/,
+        `DROPBOX_ACCESS_TOKEN=${data.access_token}`
+      );
+      fs.writeFileSync(`${dirRoot}/.env`, updatedEnv);
+
+      return data.access_token;
+    } else {
+      throw new Error("Failed to refresh access token");
+    }
+  } catch (error) {
+    console.error("Error refreshing access token:", error);
+    throw error;
+  }
+};
+
+// Middleware to handle token refresh
+zDropbox.handleTokenRefresh = async (req, res, next) => {
+  try {
+    // Try to make a test API call
+    await dbx.usersGetCurrentAccount();
+    next();
+  } catch (error) {
+    if (error.status === 401) {
+      try {
+        // Token expired, try to refresh it
+        await zDropbox.refreshAccessToken();
+        next();
+      } catch (refreshError) {
+        res
+          .status(401)
+          .json({ error: "Authentication failed. Please re-authenticate." });
+      }
+    } else {
+      next(error);
+    }
+  }
+};
+
+zDropbox.ensureFolder = async (dir) => {
+  try {
+    await dbx.filesCreateFolderV2({
+      path: dir,
+      autorename: false,
+    });
+  } catch (error) {
+    if (error.status !== 409) {
+      // 409 means folder already exists
+      console.log(error + "");
+    }
+  }
+};
+
+zDropbox.deleteFolder = async (dir) => {
+  let jsonStatus = Util.flashError("error");
+  try {
+    if (!dir) {
+      return Util.flashError("not folder");
+    }
+    // First check if the path exists and is a folder
+    try {
+      const metadata = await dbx.filesGetMetadata({
+        path: dir,
+      });
+
+      if (metadata.result[".tag"] !== "folder") {
+        return Util.flashError("The specified path is not a folder");
+      }
+    } catch (error) {
+      if (error.status === 409) {
+        return Util.flashError("Folder not found");
+      }
+      //throw error;
+    }
+
+    // Delete the folder
+    await dbx.filesDeleteV2({
+      path: dir,
+    });
+    return Util.jsonSuccess("Folder deleted successfully");
+  } catch (error) {
+    console.error("Delete folder error:", error);
+    return Util.flashError("Failed to delete folder");
+  }
+};
+
+module.exports = zDropbox;

package/lib/zRoute.js

@@ -21,7 +21,8 @@ const debug = require("./debug");
 const moduleLib = require("./moduleLib");
 const cForm = require("./Form");
 const readXlsxFile = require("read-excel-file/node");
-const { Dropbox } = require("dropbox");
+//const { Dropbox } = require("dropbox");
+const zDropbox = require("./zDropbox");
 
 const zRoute = {};
 
@@ -3108,6 +3109,11 @@ zRoute.forms = (
           break;
         case "dropbox":
           let dropbox_data_arr = [];
+          //clear temp folder /temps/estimation/documents/8
+          /*zDropbox.deleteFolder(`/temps/${MYMODEL.table}/${key}/${res.locals.userId}`).then(function (tt) {
+              console.log(tt)
+              zDropbox.ensureFolder(`/temps/${MYMODEL.table}/${key}/${res.locals.userId}`)
+            })*/
           if (obj.value.length > 0) {
             let dropfiles = obj.value || [];
             if (typeof obj.value == "string") {
@@ -4730,25 +4736,8 @@ zRoute.insertSQL = async (req, res, table, data) => {
         let path_dest = `/${MYMODEL.table}/${key}`;
 
         // 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,
-        });
-
-        try {
-          await dbx.filesCreateFolderV2({
-            path: path_dest,
-            autorename: false,
-          });
-        } catch (error) {
-          if (error.status !== 409) {
-            // 409 means folder already exists
-            throw error;
-          }
-        }
+        let dbx = zDropbox.dbx;
+        await zDropbox.ensureFolder(path_dest);
 
         //get all files in folder
         //let files = await
@@ -4765,7 +4754,9 @@ zRoute.insertSQL = async (req, res, table, data) => {
                 let newItem = Util.cleanString(time + item);
                 movDropboxArr.push({
                   from_path: `${path_src}/${item}`,
+                  from_dir: path_src,
                   to_path: `${path_dest}/${newItem}`,
+                  to_dir: path_dest,
                 });
                 newArr.push(newItem);
               } catch (e) {
@@ -4778,14 +4769,17 @@ zRoute.insertSQL = async (req, res, table, data) => {
         myCache.del(name);
       }
     }
-    const result = await connection.insert({ table: table, data: data });
-    zRoute.modelsCacheRenew(table, res.locals.companyId);
     //dropbox
+    console.log(JSON.stringify(movDropboxArr));
     if (movDropboxArr.length > 0) {
-      setTimeout(function () {
-        zRoute.moveDropbox(movDropboxArr);
-      }, 3000);
+      setTimeout(() => {
+        zRoute.moveDropbox(movDropboxArr).then(function (et) {
+          console.log(et);
+        });
+      }, 1000);
     }
+    const result = await connection.insert({ table: table, data: data });
+    zRoute.modelsCacheRenew(table, res.locals.companyId);
     return result;
   } catch (e) {
     throw Error(e + "");
@@ -4794,24 +4788,49 @@ zRoute.insertSQL = async (req, res, table, data) => {
 };
 
 zRoute.moveDropbox = async (items) => {
-  try {
-    // 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,
-    });
-    for (item of items) {
+  // Initialize Dropbox client
+  let dbx = zDropbox.dbx;
+  for (item of items) {
+    //console.log(JSON.stringify(item));
+    try {
+      //const normalizedSourcePath = '/' + item.from_path.replace(/^\/+|\/+$/g, '');
+      //const normalizedDestPath = '/' + item.to_path.replace(/^\/+|\/+$/g, '');
+      try {
+        const sourceMetadata = await dbx.filesGetMetadata({
+          path: item.from_path,
+        });
+        if (sourceMetadata.result[".tag"] !== "file") {
+          console.log("Source path is not a file", normalizedSourcePath);
+          continue;
+        }
+        console.log("Source file found:", sourceMetadata.result);
+      } catch (error) {
+        console.error("Source file check error:", error);
+        continue;
+      }
+      // Check if destination folder exists
+      try {
+        const destMetadata = await dbx.filesGetMetadata({
+          path: item.to_dir,
+        });
+        if (destMetadata.result[".tag"] !== "folder") {
+          console.error("Destination path is not a folder", item.to_dir);
+        }
+        console.log("Destination folder found:", destMetadata.result);
+      } catch (error) {
+        console.error("Destination folder check error:", error);
+        continue;
+      }
+
       await dbx.filesMoveV2({
         from_path: item.from_path,
         to_path: item.to_path,
         autorename: true,
       });
+    } catch (e) {
+      console.log(JSON.stringify(item), "can not move");
+      console.log(e);
     }
-  } catch (e) {
-    console.log(e);
   }
 };
 
@@ -4875,13 +4894,7 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
         }
       } 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,
-        });
+        let dbx = zDropbox.dbx;
         //console.log('has dropbox')
         let dir1 = `/${MYMODEL.table}/${key}`;
         let dir2 = `/temps/${MYMODEL.table}/${key}/${userId}`;
@@ -5095,13 +5108,7 @@ zRoute.deleteFiles = async (table, result) => {
       }
       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,
-          });
+          let dbx = zDropbox.dbx;
           const files = result[key];
           const dropboxPath = `/${table}/${key}`;
           for (const file of files) {

package/package.json

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