zet-lib 3.2.3 → 3.3.0

package/lib/Form.js

@@ -4,6 +4,7 @@
  */
 
 const Util = require("./Util");
+const path = require('path');
 
 const Form = {};
 // Menghitung jumlah tanda "[" dalam str
@@ -550,7 +551,12 @@ Form.field = (obj) => {
       break;
 
     case "html":
-      displayForm = obj.code;
+      let obj_code = typeof obj.code === 'string' ? obj.code : '';
+      if (!obj_code && obj.code) {
+        const dir = path.join(dirRoot,'public','runtime','html',obj.routeName,obj.id+'.txt')
+        obj_code = Util.readFile(dir);
+      }
+      displayForm = obj_code;
       break;
 
     case "location":
@@ -1038,7 +1044,7 @@ Form.build = (obj) => {
   }
 
   if(obj.type == "html") {
-    html = obj.code;
+    html = Form.field(obj)
   }
   return html;
 };

package/lib/Mail.js

@@ -1,4 +1,5 @@
 require("dotenv").config();
+const path = require('path');
 const nodemailer = require('nodemailer')
 const ejs = require('ejs')
 const Util = require('./Util')
@@ -47,7 +48,7 @@ MAIL.send = function (options = {}, transporter = null) {
 }
 
 MAIL.forgotPassword = (datas = {}, options = {}) => {
-  ejs.renderFile(`${dirRoot}/views/layouts/email/forgot_password.ejs`, { data: datas, Util: Util }, function (err, data) {
+  ejs.renderFile(path.join(dirRoot, 'views', 'layouts', 'email', 'forgot_password.ejs'), { data: datas, Util: Util }, function (err, data) {
     let option = Object.assign(mailOptions, options)
     option.html = data
     if (err) {
@@ -59,7 +60,7 @@ MAIL.forgotPassword = (datas = {}, options = {}) => {
 }
 
 MAIL.register = (datas = {}, options = {}) => {
-  ejs.renderFile(`${dirRoot}/views/layouts/email/register.ejs`, { data: datas, Util: Util }, function (err, data) {
+  ejs.renderFile(path.join(dirRoot, 'views', 'layouts', 'email', 'register.ejs'), { data: datas, Util: Util }, function (err, data) {
     let option = Object.assign(mailOptions, options)
     option.html = data
     if (err) {
@@ -88,7 +89,7 @@ MAIL.approval = (req, res, data, email) => {
   });
 
   ejs.renderFile(
-      dirRoot + "/views/layouts/email/approval.ejs",
+      path.join(dirRoot, 'views', 'layouts', 'email', 'approval.ejs'),
       { data: data, Util: Util },
       function (err, html) {
         if (err) {

package/lib/Model.js

@@ -2387,14 +2387,15 @@ Model.relation = {
         "where",
         "please_select",
         "isChain",
-        "isAttributes",
+        "onChange",
         "information",
         "defaultValue",
         "hidden",
         "isSearch",
         "order_by",
         "import_field",
-        "relation_info"
+        "relation_info",
+        "isAttributes",
     ],
     labels: {
         required: "Required",
@@ -2405,7 +2406,7 @@ Model.relation = {
         concat: "Concat",
         where: "Where SQL",
         isChain: "is Chain",
-        isAttributes: "With Attributes",
+        onChange: "On Change (return data)",
         information: "Additional Information",
         please_select: "Please Select (Labeling)",
         defaultValue: "Default Value",
@@ -2413,7 +2414,8 @@ Model.relation = {
         isSearch:"Auto complete Search",
         order_by : "Order By",
         import_field :"Default Import Field (id)",
-        relation_info : "Relation Data"
+        relation_info : "Relation Data",
+        isAttributes:"Show all attributes data",
     },
     defaultValues: {
         required: false,
@@ -2423,8 +2425,9 @@ Model.relation = {
         name: "username",
         concat: "CONCAT(fullname, ' ',email)",
         where:"",
+        isAttributes:false,
         isChain: false,
-        isAttributes: false,
+        onChange: "",
         information: "",
         please_select: "",
         defaultValue: null,
@@ -2463,14 +2466,17 @@ Model.relation = {
             tag: "input",
             type: "text",
         },
-        isChain: {
+        isAttributes: {
             tag: "input",
             type: "checkbox",
         },
-        isAttributes: {
+        isChain: {
             tag: "input",
             type: "checkbox",
         },
+        onChange: {
+            tag: "textarea",
+        },
         information: {
             tag: "input",
             type: "text",

package/lib/generatorApp.js

@@ -34,7 +34,7 @@ generatorApp.CREATE_MODEL_API = async (columns, constraintList, MYMODEL) => {
 generatorApp.CREATE_ROUTER = async (MYMODEL, zFields) => {
     let CONTENT =
         zFields.router ||
-        fs.readFileSync(generatorApp.DIRECTORY + "/routerApp.ejs", "utf-8");
+        fs.readFileSync(path.join(generatorApp.DIRECTORY, "routerApp.ejs"), "utf-8");
     const zfields = await connection.result({
         table: "zfields",
         where: { table: MYMODEL.table },
@@ -58,7 +58,7 @@ generatorApp.CREATE_ROUTER = async (MYMODEL, zFields) => {
     }
 
     fs.writeFileSync(
-        generatorApp.DIRECTORY_ROUTES + "/" + MYMODEL.table + ".js",
+        path.join(generatorApp.DIRECTORY_ROUTES, MYMODEL.table + ".js"),
         CONTENT,
         "utf-8"
     );
@@ -67,7 +67,7 @@ generatorApp.CREATE_ROUTER = async (MYMODEL, zFields) => {
 generatorApp.CREATE_ROUTER_API = (MYMODEL, zfields) => {
     let CONTENT =
         zfields.router ||
-        fs.readFileSync(generatorApp.DIRECTORY + "/routerApp.ejs", "utf-8");
+        fs.readFileSync(path.join(generatorApp.DIRECTORY, "routerApp.ejs"), "utf-8");
     //var zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
     const ADDITIONAL_FIELDS = generatorApp.ADDITIONAL_FIELDS(MYMODEL);
     const OBJ = {
@@ -86,7 +86,7 @@ generatorApp.CREATE_ROUTER_API = (MYMODEL, zfields) => {
     for (let KEY in OBJ) {
         CONTENT = Util.replaceAll(CONTENT, "[[[" + KEY + "]]]", OBJ[KEY]);
     }
-    //fs.writeFileSync(generatorApp.DIRECTORY_ROUTES + "/" + MYMODEL.table + ".js", CONTENT, 'utf-8');
+    //fs.writeFileSync(path.join(generatorApp.DIRECTORY_ROUTES, MYMODEL.table + ".js"), CONTENT, 'utf-8');
     return {
         filename: MYMODEL.table + ".js",
         content: CONTENT,
@@ -123,7 +123,7 @@ generatorApp.CREATE_VIEWS = async (MYMODEL, zFields) => {
         "[[[GENERATE_VIEW]]]": GENERATE_VIEW,
     };
 
-    const DIR_VIEW = generatorApp.DIRECTORY_VIEWS + "/" + MYMODEL.table;
+    const DIR_VIEW = path.join(generatorApp.DIRECTORY_VIEWS, MYMODEL.table);
     if (!fs.existsSync(DIR_VIEW)) {
         fs.mkdirSync(DIR_VIEW);
     }
@@ -133,16 +133,16 @@ generatorApp.CREATE_VIEWS = async (MYMODEL, zFields) => {
         name = name.replace(".", "_");
         let source = zFields[name];
         if (source) {
-            fs.writeFileSync(DIR_VIEW + "/" + item, source);
+            fs.writeFileSync(path.join(DIR_VIEW, item), source);
         } else {
-            source = generatorApp.DIRECTORY_GENERATOR_VIEWS + "/" + item;
-            fs.copySync(source, DIR_VIEW + "/" + item);
+            source = path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item);
+            fs.copySync(source, path.join(DIR_VIEW, item));
         }
-        console.log(DIR_VIEW + "/" + item);
+        console.log(path.join(DIR_VIEW, item));
         for (let KEY in OBJ) {
             generatorApp.MODIFIY(
-                DIR_VIEW + "/" + item,
-                DIR_VIEW + "/" + item,
+                path.join(DIR_VIEW, item),
+                path.join(DIR_VIEW, item),
                 KEY,
                 OBJ[KEY]
             );
@@ -183,7 +183,7 @@ generatorApp.CREATE_VIEWS_API = (MYMODEL, zFields) => {
         "[[[GENERATE_VIEW]]]": GENERATE_VIEW,
     };
 
-    const DIR_VIEW = `${dirRoot}/public/temp/${token}`;
+    const DIR_VIEW = path.join(dirRoot, "public", "temp", token);
     if (!fs.existsSync(DIR_VIEW)) {
         fs.mkdirSync(DIR_VIEW);
     }
@@ -194,23 +194,23 @@ generatorApp.CREATE_VIEWS_API = (MYMODEL, zFields) => {
         name = name.replace(".", "_");
         let source = zFields.hasOwnProperty(name)
             ? zFields[name]
-            : fs.readFileSync(generatorApp.DIRECTORY_GENERATOR_VIEWS + "/" + item, {
+            : fs.readFileSync(path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item), {
                 encoding: "utf8",
                 flag: "r",
             });
         if (source) {
-            fs.writeFileSync(DIR_VIEW + "/" + item, source);
+            fs.writeFileSync(path.join(DIR_VIEW, item), source);
         } else {
             source = fs.readFileSync(
-                generatorApp.DIRECTORY_GENERATOR_VIEWS + "/" + item,
+                path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item),
                 { encoding: "utf8", flag: "r" }
             );
-            fs.copySync(source, DIR_VIEW + "/" + item);
+            fs.copySync(source, path.join(DIR_VIEW, item));
         }
         for (let KEY in OBJ) {
             generatorApp.MODIFIY(
-                DIR_VIEW + "/" + item,
-                DIR_VIEW + "/" + item,
+                path.join(DIR_VIEW, item),
+                path.join(DIR_VIEW, item),
                 KEY,
                 OBJ[KEY]
             );
@@ -218,7 +218,7 @@ generatorApp.CREATE_VIEWS_API = (MYMODEL, zFields) => {
     }
     for (let i = 0; i < views.length; i++) {
         const item = views[i];
-        datas[item] = fs.readFileSync(`${DIR_VIEW}/${item}`, {
+        datas[item] = fs.readFileSync(path.join(DIR_VIEW, item), {
             encoding: "utf8",
             flag: "r",
         });

package/lib/generatorModel.js

@@ -1,6 +1,7 @@
 /**
  * Created by sintret dev on 10/1/2021.
  */
+const path = require("path");
 const configGenerator = require("./config_generator");
 const Model = require("./Model");
 const fs = require("fs-extra");
@@ -277,23 +278,22 @@ me.prepare = (MYMODEL) => {
         };
 
         widgets[key].hasInputGroup = false;
-        if (
-            Object.prototype.hasOwnProperty.call(property.values, "inputGroupLeft") &&
-            property.values.inputGroupLeft
-        ) {
+        if (Object.prototype.hasOwnProperty.call(property.values, "inputGroupLeft") && property.values.inputGroupLeft) {
             widgets[key].inputGroupLeft = property.values.inputGroupLeft;
             widgets[key].hasInputGroup = true;
         }
-        if (
-            Object.prototype.hasOwnProperty.call(
-                property.values,
-                "inputGroupRight"
-            ) &&
-            property.values.inputGroupRight
-        ) {
+        if (Object.prototype.hasOwnProperty.call(property.values,"inputGroupRight") && property.values.inputGroupRight) {
             widgets[key].inputGroupRight = property.values.inputGroupRight;
             widgets[key].hasInputGroup = true;
         }
+        widgets[key].isAttributes = false;
+        if (Object.prototype.hasOwnProperty.call(property.values,"isAttributes") && property.values.isAttributes) {
+            widgets[key].isAttributes = true;
+        }
+        widgets[key].onChange = false;
+        if (Object.prototype.hasOwnProperty.call(property.values,"onChange") && property.values.onChange.length > 4) {
+            widgets[key].onChange = true;
+        }
 
         if (property.values.information) {
             widgets[key].information = JSON.stringify(property.values.information);
@@ -335,7 +335,6 @@ me.prepare = (MYMODEL) => {
         }
         if (Object.prototype.hasOwnProperty.call(property.values, "where")) {
             widgets[key].where = property.values.where || "";
-            console.log(widgets[key].where)
         }
 
         switch (type) {
@@ -399,12 +398,21 @@ me.prepare = (MYMODEL) => {
                 widgets[key].relation_info = property.values.relation_info ? true : false;
                 if(widgets[key].relation_info) {
                     //create file info to runtime
-                    let dirInfo = `${dirRoot}/public/runtime/info/${MYMODEL.table}`
-                    //Util.writeFile(`${dirRoot}/runtime/info/${MYMODEL.tab}`)
+                    let dirInfo = path.join(dirRoot, "public", "runtime", "info", MYMODEL.table);
+                    //Util.writeFile(path.join(dirRoot, "runtime", "info", MYMODEL.tab))
+                    if(!fs.existsSync(dirInfo)) {
+                        fs.mkdirSync(dirInfo, { recursive: true });
+                    }
+                    fs.writeFileSync(path.join(dirInfo, key + ".txt"), property.values.relation_info);
+                }
+                if(widgets[key].onChange) {
+                    //create file info to runtime
+                    let dirInfo = path.join(dirRoot, "public", "runtime", "onchange", MYMODEL.table);
+                    //Util.writeFile(path.join(dirRoot, "runtime", "info", MYMODEL.tab))
                     if(!fs.existsSync(dirInfo)) {
                         fs.mkdirSync(dirInfo, { recursive: true });
                     }
-                    fs.writeFileSync(`${dirInfo}/${key}.txt`, property.values.relation_info);
+                    fs.writeFileSync(path.join(dirInfo, key + ".txt"), property.values.onChange);
                 }
                 break;
             case "dragdrop":
@@ -464,7 +472,16 @@ me.prepare = (MYMODEL) => {
                     : property.values.height;
                 break;
             case "html":
-                widgets[key].code = property.values.code || "";
+                widgets[key].code = property.values.code ? true : false;
+                if(widgets[key].code) {
+                    //create file info to runtime
+                    let dirInfo = path.join(dirRoot, "public", "runtime", "html", MYMODEL.table);
+                    //Util.writeFile(path.join(dirRoot, "runtime", "info", MYMODEL.tab))
+                    if(!fs.existsSync(dirInfo)) {
+                        fs.mkdirSync(dirInfo, { recursive: true });
+                    }
+                    fs.writeFileSync(path.join(dirInfo, key + ".txt"), property.values.code);
+                }
                 break;
 
             case "money":
@@ -516,7 +533,7 @@ me.create = async (ZFIELDS) => {
     const JSON_MODEL = me.prepare(ZFIELDS);
     jsonText += me.build(JSON_MODEL);
     jsonText += `}`;
-    const filename = `${dirRoot}/models/${ZFIELDS.table}.js`;
+    const filename = path.join(dirRoot, "models", ZFIELDS.table + ".js");
     fs.writeFile(filename, jsonText, function (err) {
         if (err) {
             return console.log(err.toString());

package/lib/io.js

@@ -1,6 +1,5 @@
 const { Server } = require('socket.io');
-const io = new Server(); // TANPA listen/attach di sini
-//room = token
+const io = new Server();
 let socketArray = [];
 
 io.on('connection', function (socket) {
@@ -11,26 +10,15 @@ io.on('connection', function (socket) {
         socket.handshake.session.user = {
             username: 'OSK'
         };
-        //console.log('socket.handshake session data is %j.', socket.handshake.session);
-
-        // socket.handshake.session.save();
-        //emit logged_in for debugging purposes of this example
         socket.emit('logged_in', socket.handshake.session);
     });
     // Unset session data via socket
     socket.on('checksession', function() {
-        // console.log('Received checksession message');
-        // console.log('socket.handshake session data is %j.', socket.handshake.session);
         socket.emit('checksession', socket.handshake.session);
     });
-    // Unset session data via socket
     socket.on('logout', function() {
         console.log('Received logout message');
         delete socket.handshake.session.user;
-        // socket.handshake.session.save();
-        //emit logged_out for debugging purposes of this example
-        //console.log('socket.handshake session data is %j.', socket.handshake.session);
-
         socket.emit('logged_out', socket.handshake.session);
     });
 

package/lib/zAppRouter.js

@@ -161,7 +161,7 @@ router.post("/profile-sign", access, async (req, res) => {
     },
   });
   fs.writeFile(
-      dirRoot + "/public/uploads/zuser/" + filename,
+      path.join(dirRoot, "public", "uploads", "zuser", filename),
       base64Image,
       { encoding: "base64" },
       function (err) {}
@@ -1337,8 +1337,8 @@ router.post('/get_approval_comments', async(req,res) => {
 
 router.get("/zdownload/zgenerator/:table", async (req, res) => {
   var table = req.params.table;
-  var path = `${dirRoot}/public/uploads/zgenerator/${table}.json`;
-  res.download(path, function (err) {
+  var filePath = path.join(dirRoot, "public", "uploads", "zgenerator", table + ".json");
+  res.download(filePath, function (err) {
     if (err) {
       //console.log(err);
     }
@@ -1592,12 +1592,12 @@ router.post("/zdropzone", async (req, res) => {
   try {
     let userId = res.locals.userId;
     if (userId) {
-      let dir = `${dirRoot}/public/zdropzone/${userId}`;
+      let dir = path.join(dirRoot, "public", "zdropzone", userId);
       if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
       }
       let filename = req.files.file.name;
-      req.files.file.mv(dir + "/" + filename, function (err) {
+      req.files.file.mv(path.join(dir, filename), function (err) {
         if (err) {
           return res.status(500).send(err + "");
         }
@@ -1615,11 +1615,11 @@ router.post("/zdropzone-remove", async (req, res) => {
   try {
     let userId = res.locals.userId;
     let cacheName = req.body.cname.replace("ZUSER___ID", userId);
-    let dir = `${dirRoot}/public/zdropzone/${userId}`;
+    let dir = path.join(dirRoot, "public", "zdropzone", userId);
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
-    let filename = `${dirRoot}/public/zdropzone/${userId}/${req.body.file}`;
+    let filename = path.join(dirRoot, "public", "zdropzone", userId, req.body.file);
     let arr = [];
     if (Util.fileExist(filename)) {
       await fs.unlink(filename);
@@ -1639,7 +1639,7 @@ router.post("/zdropzone-remove", async (req, res) => {
 router.post("/zdropzone-attributes", async (req, res) => {
   try {
     let userId = res.locals.userId;
-    let dir = `${dirRoot}/public/zdropzone/${userId}`;
+    let dir = path.join(dirRoot, "public", "zdropzone", userId);
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
@@ -1726,13 +1726,14 @@ router.get("/zdownloads-dropzone/:table/:field/:id", async (req, res) => {
         id: id,
       },
     });
-    let dir = `${dirRoot}/public/uploads/${table}/${field}/`;
+    let dir = path.join(dirRoot, "public", "uploads", table, field);
     let arr = [];
     let files = result[field];
     for (const file of files) {
-      if (Util.fileExist(dir + file)) {
+      let fullPath = path.join(dir, file);
+      if (Util.fileExist(fullPath)) {
         let filename = file.substring(13);
-        arr.push({ path: dir + file, name: filename });
+        arr.push({ path: fullPath, name: filename });
         //io.to(room).emit('message', `Zip file ${filename}`)
       }
     }
@@ -1792,14 +1793,14 @@ router.post("/zcompress-dropzone", async (req, res) => {
       if (!fs.existsSync(tempDir)) {
         fs.mkdirSync(tempDir);
       }
-      //let dir = `${dirRoot}/public/uploads/${table}/${field}/`;
+      //let dir = path.join(dirRoot, "public", "uploads", table, field);
       let arr = [];
       let files = result[field];
       const count = files.length;
       let i = 0;
       for (const file of files) {
         let filename = file.substring(13);
-        let attributes = Util.fileAttribute(dir + file);
+        let attributes = Util.fileAttribute(path.join(dir, file));
         if (attributes.type == "image") {
           const filePath = path.join(dir, file);
           const tempPath = path.join(tempDir, file);
@@ -2098,7 +2099,7 @@ router.get("/zdownloads-dropbox/:table/:field/:id", async (req, res) => {
         id: id,
       },
     });
-    let dir = `${dirRoot}/public/uploads/${table}/${field}/`;
+    let dir = path.join(dirRoot, "public", "uploads", table, field);
     let arr = [];
     let files = result[field];
     const jsZip = new JSZip();
@@ -2273,7 +2274,7 @@ router.post('/zcall-information_info', async(req,res) => {
   let data = ''
   try {
     const {table, elementId, myvalue} = req.body;
-    let content = Util.readFile(`${dirRoot}/public/runtime/info/${table}/${elementId}.txt`)
+    let content = Util.readFile(path.join(dirRoot, "public", "runtime", "info", table, elementId + ".txt"))
     data = content;
 
     // Fungsi untuk mengekstrak semua field dari template
@@ -2325,7 +2326,6 @@ router.post('/zcall-information_info', async(req,res) => {
       for(let key in others){
         dataReplace[key] = others[key];
       }
-      console.log(dataReplace);
 
       //saya ingin replace data dengan dataReplace
       // Fungsi untuk mendapatkan nilai dari path nested object