zet-lib 1.5.29 → 2.0.0

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,22 +44,28 @@ 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")
+    require.resolve(__dirname + "/views/generator.ejs")
 );
 
 router.get("/", csrfProtection, async (req, res) => {
   let table = req.query.table || "",
-    route = "",
-    jsonData = {},
-    zForms = {},
-    relations = {},
-    approvalDatas = { is_approval: false };
+      route = "",
+      jsonData = {},
+      zForms = {},
+      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] || {};
@@ -66,9 +75,9 @@ router.get("/", csrfProtection, async (req, res) => {
   let sorting = "";
   if (table) {
     let contentScript = `var ZFIELDS = ${JSON.stringify(
-      jsonData.rows,
-      null,
-      2
+        jsonData.rows,
+        null,
+        2
     )};`;
     moduleLib.addScript(req, res, contentScript);
     moduleLib.editor(req, res);
@@ -87,15 +96,15 @@ router.get("/", csrfProtection, async (req, res) => {
       approvalDatas.title = approvalJSON.title || "";
       approvalDatas.type = approvalJSON.type || 1;
       approvalDatas.approvers = approvalJSON.approvers
-        ? approvalJSON.approvers
-        : [];
+          ? approvalJSON.approvers
+          : [];
       approvalDatas.knowings = approvalJSON.knowings || [];
       approvalDatas.template = approvalJSON.content || "";
       zForms = await zRoute.formsFieldSync(
-        req,
-        res,
-        MYMODEL_APPROVERS,
-        approvalDatas
+          req,
+          res,
+          MYMODEL_APPROVERS,
+          approvalDatas
       );
     }
   }
@@ -103,12 +112,12 @@ router.get("/", csrfProtection, async (req, res) => {
   const jsonDatas = jsonData.datas;
   const lock = nots.includes(table) ? 1 : 0;
   const jsonDatasJson =
-    jsonDatas.hasOwnProperty("json") && jsonDatas.json ? jsonDatas.json : {};
+      jsonDatas.hasOwnProperty("json") && jsonDatas.json ? jsonDatas.json : {};
   const checkDummy =
-    Object.prototype.hasOwnProperty.call(jsonDatasJson, "dummy") &&
-    jsonDatasJson.dummy
-      ? "checked"
-      : "";
+      Object.prototype.hasOwnProperty.call(jsonDatasJson, "dummy") &&
+      jsonDatasJson.dummy
+          ? "checked"
+          : "";
   const renderData = {
     datas: jsonDatas,
     table: table,
@@ -127,15 +136,15 @@ router.get("/", csrfProtection, async (req, res) => {
 
   const bodyHTML = ejs.render(bodyView, renderData);
   const endHTML = ejs.render(
-    Util.readFile(require.resolve(__dirname + "/views/generatorjs.ejs")),
-    renderData
+      Util.readFile(require.resolve(__dirname + "/views/generatorjs.ejs")),
+      renderData
   );
   let dataRender = renderData;
   dataRender.bodyHTML = bodyHTML;
   dataRender.endHTML = endHTML;
   res.render(
-    require.resolve(__dirname + "/views/generator_layout.ejs"),
-    dataRender
+      require.resolve(__dirname + "/views/generator_layout.ejs"),
+      dataRender
   );
 });
 
@@ -144,8 +153,8 @@ router.post("/fields", async (req, res) => {
     let body = req.body;
     let table = body.table || "";
     let result = {},
-      fields = {},
-      rowsFields = [];
+        fields = {},
+        rowsFields = [];
     if (table) {
       result = await connection.result({
         table: "zfields",
@@ -160,11 +169,21 @@ router.post("/fields", async (req, res) => {
       rowsFields: rowsFields,
       table: table,
     };
-    let datas = await axios.post(
-      `${generatorUrl}/api/generator/modal`,
-      objData
-    );
-    res.json(datas.data);
+    /* let datas = await axios.post(
+        `${generatorUrl}/api/generator/modal`,
+        objData
+    ); */
+    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(
-      `${generatorUrl}/api/generator/create`,
-      req.body
-    );
-    let datas = results.data;
+    /* let results = await axios.post(
+        `${generatorUrl}/api/generator/create`,
+        req.body
+    ); */
+    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(
-        `${generatorUrl}/api/generator/reset`,
-        req.body
-      );
-      let datas = results.data;
+      /* let results = await axios.post(
+          `${generatorUrl}/api/generator/reset`,
+          req.body
+      ); */
+      let body = req.body;
+      let datas = Api.reset(body);
+      //let datas = results.data;
       await connection.update({
         table: "zfields",
         data: datas,
@@ -284,9 +306,9 @@ router.post("/tabs", async (req, res) => {
         let details = {};
         //remove Object in array
         let left = leftOri.filter((item) => typeof item !== "object") || [],
-          right = rightOri.filter((item) => typeof item !== "object") || [],
-          oneColumn =
-            oneColumnOri.filter((item) => typeof item !== "object") || [];
+            right = rightOri.filter((item) => typeof item !== "object") || [],
+            oneColumn =
+                oneColumnOri.filter((item) => typeof item !== "object") || [];
 
         details.notabs = detailOri.notabs;
         tabs.map((item, index) => {
@@ -296,24 +318,24 @@ router.post("/tabs", async (req, res) => {
           details[key] = detailOri[objOri[item]] || [];
           //left
           let objLeft =
-            leftOri[valueIndex] &&
-            leftOri[valueIndex].hasOwnProperty(`arr${arrayOri[item]}`)
-              ? leftOri[valueIndex][`arr${arrayOri[item]}`]
-              : [];
+              leftOri[valueIndex] &&
+              leftOri[valueIndex].hasOwnProperty(`arr${arrayOri[item]}`)
+                  ? leftOri[valueIndex][`arr${arrayOri[item]}`]
+                  : [];
           left.push({ [key]: objLeft });
           //right
           let objRight =
-            rightOri[valueIndex] &&
-            rightOri[valueIndex].hasOwnProperty(`arr${arrayOri[item]}`)
-              ? rightOri[valueIndex][`arr${arrayOri[item]}`]
-              : [];
+              rightOri[valueIndex] &&
+              rightOri[valueIndex].hasOwnProperty(`arr${arrayOri[item]}`)
+                  ? rightOri[valueIndex][`arr${arrayOri[item]}`]
+                  : [];
           right.push({ [key]: objRight });
           //one column
           let objOneColumn =
-            oneColumnOri[valueIndex] &&
-            oneColumnOri[valueIndex].hasOwnProperty(`arr${arrayOri[item]}`)
-              ? oneColumnOri[valueIndex][`arr${arrayOri[item]}`]
-              : [];
+              oneColumnOri[valueIndex] &&
+              oneColumnOri[valueIndex].hasOwnProperty(`arr${arrayOri[item]}`)
+                  ? oneColumnOri[valueIndex][`arr${arrayOri[item]}`]
+                  : [];
           oneColumn.push({ [key]: objOneColumn });
         });
         post.details = JSON.stringify(details);
@@ -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);
@@ -410,8 +433,8 @@ const generate = async (req, res) => {
     },
   });
   let resultJSON = Object.prototype.hasOwnProperty.call(result, "json")
-    ? result.json
-    : {};
+      ? result.json
+      : {};
   if (resultJSON && Object.prototype.hasOwnProperty.call(resultJSON, "dummy")) {
     dummy = resultJSON.dummy == 1 ? true : false;
   }
@@ -420,11 +443,11 @@ const generate = async (req, res) => {
   for (let key in properties) {
     //override
     properties[key].values.required = properties[key].values.required
-      ? true
-      : false;
+        ? true
+        : false;
     properties[key].values.unique = properties[key].values.unique
-      ? true
-      : false;
+        ? true
+        : false;
     var isChain = properties[key].values.isChain ? true : false;
     properties[key].values.isChain = isChain;
     if (isChain) {
@@ -460,11 +483,12 @@ const generate = async (req, res) => {
   //generate file models routes views
   body.columns = await connection.query(connection.describeTable(table));
   body.constraintList = await connection.query(
-    connection.constraintList(table)
+      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];
@@ -508,7 +532,7 @@ const generate = async (req, res) => {
       //check if has chains here
       MYMODEL = filesKey.modelObj;
       //delete/clean zgrid after changes
-       await connection.delete({
+      await connection.delete({
         table: 'zgrid',
         where: {
           route_name: table,
@@ -541,8 +565,8 @@ const generate = async (req, res) => {
       });
 
       fs.writeFileSync(
-        `${dirRoot}/models/${filesKey.filename}`,
-        filesKey.content
+          `${dirRoot}/models/${filesKey.filename}`,
+          filesKey.content
       );
       console.log(`The file model of ${filesKey.filename} is saved!`);
 
@@ -552,8 +576,8 @@ const generate = async (req, res) => {
       let isChain = false;
       for (let key in widgets) {
         let hasChains = widgets[key].hasOwnProperty("isChain")
-          ? widgets[key].isChain
-          : false;
+            ? widgets[key].isChain
+            : false;
         if (hasChains) {
           isChain = true;
           if (widgets[key].hasOwnProperty("table")) {
@@ -580,7 +604,7 @@ const generate = async (req, res) => {
                   name: widgets[objChains[key].key].fields[1],
                 };
                 objChains[model_table.widgets[q].table].changes.push(
-                  objChanges
+                    objChanges
                 );
               }
             }
@@ -617,12 +641,12 @@ const generate = async (req, res) => {
             fs.writeFileSync(`${DIR_VIEW}/${q}`, filesKey[q]);
           } else {
             fs.writeFileSync(
-              `${DIR_VIEW}/${q}`,
-              await minify(filesKey[q], {
-                minifyJS: true,
-                minifyCSS: true,
-                collapseWhitespace: true,
-              })
+                `${DIR_VIEW}/${q}`,
+                await minify(filesKey[q], {
+                  minifyJS: true,
+                  minifyCSS: true,
+                  collapseWhitespace: true,
+                })
             );
           }
           console.log(`The files views of ${q} is saved!`);
@@ -632,8 +656,8 @@ const generate = async (req, res) => {
     if (!dummy) {
       if (key == "route") {
         fs.writeFileSync(
-          `${dirRoot}/routes/${filesKey.filename}`,
-          filesKey.content
+            `${dirRoot}/routes/${filesKey.filename}`,
+            filesKey.content
         );
         console.log(`The files route of ${filesKey.filename} is saved!`);
       }
@@ -687,9 +711,9 @@ router.post("/savetabs", async (req, res) => {
   let table = body.table;
   let details = body.details;
   let left = [],
-    right = [],
-    tabLeft = {},
-    tabRight = {};
+      right = [],
+      tabLeft = {},
+      tabRight = {};
   let json = { status: 0, title: "error", message: "error", url: "" };
   let obj = {};
   obj.notabs = [];
@@ -811,8 +835,8 @@ const buildJoin = async (MYMODEL, result) => {
     rows.map((row) => {
       foreignTables.push(row.foreign_table_name);
       foreign_table_name[
-        row.foreign_table_name
-      ] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table}.${row.column_name} `;
+          row.foreign_table_name
+          ] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table}.${row.column_name} `;
     });
 
     //step by step
@@ -827,15 +851,15 @@ const buildJoin = async (MYMODEL, result) => {
     if (table_steps.length > 0) {
       for (let table_steps_item of table_steps) {
         let rows = await connection.query(
-          connection.foreignKeyList(table_steps_item)
+            connection.foreignKeyList(table_steps_item)
         );
         let foreign_table_name = {};
         let foreignTables = [];
         rows.map((row) => {
           foreignTables.push(row.foreign_table_name);
           foreign_table_name[
-            row.foreign_table_name
-          ] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table_steps_item}.${row.column_name} `;
+              row.foreign_table_name
+              ] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table_steps_item}.${row.column_name} `;
         });
         console.log(foreignTables);
         table_joins.map((item) => {
@@ -852,15 +876,15 @@ const buildJoin = async (MYMODEL, result) => {
     if (table_steps.length > 0) {
       for (let table_steps_item of table_steps) {
         let rows = await connection.query(
-          connection.foreignKeyList(table_steps_item)
+            connection.foreignKeyList(table_steps_item)
         );
         let foreign_table_name = {};
         let foreignTables = [];
         rows.map((row) => {
           foreignTables.push(row.foreign_table_name);
           foreign_table_name[
-            row.foreign_table_name
-          ] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table_steps_item}.${row.column_name} `;
+              row.foreign_table_name
+              ] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table_steps_item}.${row.column_name} `;
         });
         //console.log(foreignTables)
         table_joins.map((item) => {
@@ -955,45 +979,45 @@ router.delete("/delete-table", csrfProtection, async (req, res) => {
 
     let runtimeFile = dirRoot + "/public/runtime/script/" + table;
     fs.rm(
-      runtimeFile,
-      {
-        recursive: true,
-      },
-      (error) => {
-        if (error) {
-          console.log(error);
-        } else {
-          console.log("Recursive: Directories Deleted!");
+        runtimeFile,
+        {
+          recursive: true,
+        },
+        (error) => {
+          if (error) {
+            console.log(error);
+          } else {
+            console.log("Recursive: Directories Deleted!");
+          }
         }
-      }
     );
     let runtimeFileHead = dirRoot + "/public/runtime/head/" + table;
     fs.rm(
-      runtimeFileHead,
-      {
-        recursive: true,
-      },
-      (error) => {
-        if (error) {
-          console.log(error);
-        } else {
-          console.log("Recursive: Directories Deleted!");
+        runtimeFileHead,
+        {
+          recursive: true,
+        },
+        (error) => {
+          if (error) {
+            console.log(error);
+          } else {
+            console.log("Recursive: Directories Deleted!");
+          }
         }
-      }
     );
     let runtimeFileEnd = dirRoot + "/public/runtime/end/" + table;
     fs.rm(
-      runtimeFileEnd,
-      {
-        recursive: true,
-      },
-      (error) => {
-        if (error) {
-          console.log(error);
-        } else {
-          console.log("Recursive: Directories Deleted!");
+        runtimeFileEnd,
+        {
+          recursive: true,
+        },
+        (error) => {
+          if (error) {
+            console.log(error);
+          } else {
+            console.log("Recursive: Directories Deleted!");
+          }
         }
-      }
     );
 
     await connection.delete({
@@ -1003,17 +1027,17 @@ router.delete("/delete-table", csrfProtection, async (req, res) => {
     if (table) {
       const viewsFile = dirRoot + "/views/" + table;
       fs.rm(
-        viewsFile,
-        {
-          recursive: true,
-        },
-        (error) => {
-          if (error) {
-            console.log(error);
-          } else {
-            console.log("Recursive: Directories Deleted!");
+          viewsFile,
+          {
+            recursive: true,
+          },
+          (error) => {
+            if (error) {
+              console.log(error);
+            } else {
+              console.log("Recursive: Directories Deleted!");
+            }
           }
-        }
       );
     }
     await connection.delete({
@@ -1039,11 +1063,11 @@ router.post("/add_field", csrfProtection, async (req, res) => {
       table: "zfields",
       where: { table: table },
     });
-    const results = await axios.post(
-      `${generatorUrl}/api/generator/create_field`,
-      body
-    );
-    const datas = results.data;
+    /* const results = await axios.post(
+        `${generatorUrl}/api/generator/create_field`,
+        body
+    ); */
+    const datas = Api.create_field(body);
     if (datas.status == 1) {
       await connection.update({
         table: "zfields",
@@ -1091,17 +1115,17 @@ router.post("/setting_field", csrfProtection, async (req, res) => {
     table: "zfields",
     where: { table: table },
   });
-  const results = await axios.post(
-    `${generatorUrl}/api/generator/modal_settings`,
-    body
-  );
-  const datas = results.data;
+  /* const results = await axios.post(
+      `${generatorUrl}/api/generator/modal_settings`,
+      body
+  ); */
+  const datas = Api.modal_settings(body);
   res.json(datas.html);
 });
 
 router.post("/save_setting", async (req, res) => {
   const html = "",
-    table = req.query.table || "";
+      table = req.query.table || "";
   let json = Util.jsonSuccess("Success to update");
   try {
     if (nots.includes(req.body.table)) {
@@ -1141,7 +1165,7 @@ router.delete("/delete_field", csrfProtection, async (req, res) => {
       return res.json(Util.flashError("Table is locked"));
     }
     const table = req.body.table,
-      name = req.body.name;
+        name = req.body.name;
     let data = await connection.result({
       table: "zfields",
       where: { table: table },
@@ -1178,7 +1202,7 @@ router.delete("/delete_field", csrfProtection, async (req, res) => {
     //DROP COULUMN
     //ALTER TABLE table_name  DROP COLUMN IF EXISTS column_name;
     await connection.query(
-      `ALTER TABLE "${table}"  DROP COLUMN IF EXISTS  "${name}";`
+        `ALTER TABLE "${table}"  DROP COLUMN IF EXISTS  "${name}";`
     );
   } catch (err) {
     json = Util.flashError(err.toString());
@@ -1190,9 +1214,9 @@ router.delete("/delete_field", csrfProtection, async (req, res) => {
 
 router.post("/tab_rename", csrfProtection, async (req, res) => {
   const html = "",
-    table = req.body.table || "",
-    name = req.body.name || "",
-    id = req.body.id || 0;
+      table = req.body.table || "",
+      name = req.body.name || "",
+      id = req.body.id || 0;
   let json = Util.jsonSuccess("Success to rename");
   try {
     if (table == "") {
@@ -1452,7 +1476,7 @@ router.post("/import", async (req, res) => {
           });
         }
         json = Util.jsonSuccess(
-          "Success to add module, please generate tax to make a file"
+            "Success to add module, please generate tax to make a file"
         );
       }
     }
@@ -1624,7 +1648,7 @@ const viewsMini = async () => {
     }
   } catch (e) {
     notifyObj = Util.flashError(
-      `error in item : ${item} , error str :${e.toString()}`
+        `error in item : ${item} , error str :${e.toString()}`
     );
   }
   return notifyObj;

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.29",
+  "version": "2.0.0",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"