zet-lib 1.5.30 → 2.0.1

package/lib/zGeneratorRouter.js

@@ -15,6 +15,9 @@ const myCache = require("./cache");
 const ejs = require("ejs");
 var app = express();
 const path = require("path");
+const Api = require('./generatorApi');
+const Model = require('./Model');
+
 
 if (typeof global.dirRoot === 'undefined') {
   global.dirRoot = Util.dirRoot;
@@ -41,7 +44,7 @@ const nots = [
 ];
 //const nots = [];
 //const generatorUrl = 'http://localhost:3005';
-const generatorUrl = "https://generator.cmsqu.com";
+//const generatorUrl = "https://generator.cmsqu.com";
 
 const bodyView = Util.readFile(
     require.resolve(__dirname + "/views/generator.ejs")
@@ -55,8 +58,14 @@ router.get("/", csrfProtection, async (req, res) => {
       relations = {},
       approvalDatas = { is_approval: false };
   const MYMODELS = myCache.get("MYMODELS");
-  let datas = await axios.post(`${generatorUrl}/api/generator/index`);
-  jsonData = datas.data;
+  //let datas = await axios.post(`${generatorUrl}/api/generator/index`);
+  //jsonData = datas.data;
+  jsonData = {
+    datas: {table: '', tabs: [], labels: {}, details: {}, hardcode_grid: ""},
+    table: table,
+    route: table,
+    selects: Model.keys,
+  }
   jsonData.rows = await zfieldsKeys();
   if (table) {
     jsonData.datas = jsonData.rows[table] || {};
@@ -160,11 +169,21 @@ router.post("/fields", async (req, res) => {
       rowsFields: rowsFields,
       table: table,
     };
-    let datas = await axios.post(
+    /* let datas = await axios.post(
         `${generatorUrl}/api/generator/modal`,
         objData
-    );
-    res.json(datas.data);
+    ); */
+    let others = result.others || {};
+    let othersArr = Object.keys(others) || [];
+    let json = {}
+    if(othersArr.length) {
+        console.log('masuk ke container')
+        json = await Api.modalWithContainer(objData);
+    } else {
+        json = await Api.modalClassic(objData);
+    }
+    
+    res.json(json);
   } catch (e) {
     console.log(e);
     res.json(e.toString());
@@ -176,11 +195,12 @@ Create new Module/Table
  */
 router.post("/", csrfProtection, async (req, res) => {
   try {
-    let results = await axios.post(
+    /* let results = await axios.post(
         `${generatorUrl}/api/generator/create`,
         req.body
-    );
-    let datas = results.data;
+    ); */
+    let body = req.body;
+    let datas = Api.createTable(body);
     if (datas.status == 0) {
       res.json(datas);
     } else {
@@ -207,11 +227,13 @@ router.post("/reset", async (req, res) => {
       return res.json(Util.flashError("Table is locked"));
     }
     if (table) {
-      let results = await axios.post(
+      /* let results = await axios.post(
           `${generatorUrl}/api/generator/reset`,
           req.body
-      );
-      let datas = results.data;
+      ); */
+      let body = req.body;
+      let datas = Api.reset(body);
+      //let datas = results.data;
       await connection.update({
         table: "zfields",
         data: datas,
@@ -395,8 +417,9 @@ const generate = async (req, res) => {
     });
   }
   body.others = others;
-  results = await axios.post(`${generatorUrl}/api/generator/properties`, body);
-  datas = results.data;
+  //results = await axios.post(`${generatorUrl}/api/generator/properties`, body);
+  results = await Api.properties(body);
+  datas = results;
   if (datas.create_table.hasOwnProperty("sql")) {
     await connection.query(datas.create_table.sql);
     return generate(body);
@@ -463,8 +486,9 @@ const generate = async (req, res) => {
       connection.constraintList(table)
   );
   body.result = result;
-  results = await axios.post(`${generatorUrl}/api/generator/generate`, body);
-  datas = results.data;
+  //results = await axios.post(`${generatorUrl}/api/generator/generate`, body);
+  results = await Api.generate(body);
+  datas = results;
   let files = datas.files;
   for (let key in files) {
     let filesKey = files[key];
@@ -1039,11 +1063,11 @@ router.post("/add_field", csrfProtection, async (req, res) => {
       table: "zfields",
       where: { table: table },
     });
-    const results = await axios.post(
+    /* const results = await axios.post(
         `${generatorUrl}/api/generator/create_field`,
         body
-    );
-    const datas = results.data;
+    ); */
+    const datas = Api.create_field(body);
     if (datas.status == 1) {
       await connection.update({
         table: "zfields",
@@ -1091,11 +1115,11 @@ router.post("/setting_field", csrfProtection, async (req, res) => {
     table: "zfields",
     where: { table: table },
   });
-  const results = await axios.post(
+  /* const results = await axios.post(
       `${generatorUrl}/api/generator/modal_settings`,
       body
-  );
-  const datas = results.data;
+  ); */
+  const datas = Api.modal_settings(body);
   res.json(datas.html);
 });
 

package/lib/zRoute.js

@@ -547,6 +547,9 @@ zRoute.relationTable = async (req, res, table, visiblesColumns = []) => {
   try {
     const MYMODELS = myCache.get("MYMODELS");
     const MYMODEL = MYMODELS[table];
+    if (!MYMODEL) {
+      return {};
+    }
     let relations = {};
     relations["zattributes"] = {};
     relations["zvirtuals"] = {};
@@ -556,10 +559,12 @@ zRoute.relationTable = async (req, res, table, visiblesColumns = []) => {
     let company_id = res.locals.companyId;
     let widgets = {};
     if (visiblesColumns.length == 0) {
-      widgets = MYMODEL.widgets;
+      widgets = MYMODEL.widgets || {};
     } else {
       visiblesColumns.map((item) => {
-        widgets[item] = MYMODEL.widgets[item];
+        if (MYMODEL.widgets && MYMODEL.widgets[item]) {
+          widgets[item] = MYMODEL.widgets[item];
+        }
       });
     }
 
@@ -819,6 +824,9 @@ zRoute.relations = async (req, res, table, visiblesColumns = []) => {
   try {
     const MYMODELS = myCache.get("MYMODELS");
     const MYMODEL = MYMODELS[table];
+    if (!MYMODEL) {
+      return {};
+    }
     let relation = await zRoute.relationTable(req, res, table, visiblesColumns);
     let relations = {};
     if (MYMODEL.joins && MYMODEL.joins.list) {
@@ -4080,7 +4088,10 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
   }
   let obj = {};
   const MYMODELS = myCache.get("MYMODELS");
-  let widgets = MYMODEL.widgets,
+  if (!MYMODEL) {
+    return { script: "", head: "", end: "" };
+  }
+  let widgets = MYMODEL.widgets || {},
       widgetsArray = Object.keys(widgets) || [];
 
   let hasTabs = MYMODEL.hasOwnProperty("hasTabs") ? MYMODEL.hasTabs : false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.5.30",
+  "version": "2.0.1",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -28,32 +28,38 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "axios": "^1.6.8",
+    "axios": "^1.7.9",
     "convert-excel-to-json": "^1.7.0",
     "csurf": "^1.11.0",
     "dotenv": "^16.5.0",
     "dropbox": "^10.34.0",
-    "ejs": "^3.1.9",
+    "ejs": "^3.1.10",
     "exceljs": "^4.4.0",
     "express-zip": "^3.0.0",
-    "fs-extra": "^11.3.0",
+    "fs-extra": "^11.3.2",
     "html-minifier-terser": "^7.2.0",
     "isomorphic-fetch": "^3.0.0",
-    "js-sha256": "^0.9.0",
+    "js-sha256": "^0.11.1",
     "jszip": "^3.10.1",
     "moment": "^2.30.1",
     "node-cache": "^5.1.2",
     "nodemailer": "^6.9.4",
-    "pg": "^8.11.2",
+    "pg": "^8.16.3",
     "pm2": "^5.3.1",
-    "puppeteer": "^24.7.2",
-    "qs": "^6.11.2",
-    "randomstring": "^1.3.0",
+    "puppeteer": "^24.33.0",
+    "qs": "^6.14.0",
+    "randomstring": "^1.3.1",
     "read-excel-file": "^5.8.0",
     "sharp": "^0.34.1",
-    "socket.io": "^4.8.0",
-    "uglify-js": "^3.17.4",
+    "socket.io": "^4.8.1",
+    "uglify-js": "^3.19.3",
     "uuid": "^9.0.1",
     "xlsx": "^0.18.5"
+  },
+  "overrides": {
+    "unzipper": "^0.12.3",
+    "rimraf": "^6.1.2",
+    "fstream": "^2.0.0",
+    "glob": "^11.0.0"
   }
 }