zet-lib 3.2.2 → 3.2.3

package/lib/Model.js

@@ -1,8 +1,3 @@
-/**
- * Universal class Model
- * Created by sintret dev on 9/23/2021.
- */
-
 const Util = require('./Util');
 
 /*
@@ -2389,6 +2384,7 @@ Model.relation = {
         "table",
         "name",
         "concat",
+        "where",
         "please_select",
         "isChain",
         "isAttributes",
@@ -2407,6 +2403,7 @@ Model.relation = {
         table: "Module Name",
         name: "Label",
         concat: "Concat",
+        where: "Where SQL",
         isChain: "is Chain",
         isAttributes: "With Attributes",
         information: "Additional Information",
@@ -2425,6 +2422,7 @@ Model.relation = {
         table: "user",
         name: "username",
         concat: "CONCAT(fullname, ' ',email)",
+        where:"",
         isChain: false,
         isAttributes: false,
         information: "",
@@ -2461,6 +2459,10 @@ Model.relation = {
             tag: "input",
             type: "text",
         },
+        where: {
+            tag: "input",
+            type: "text",
+        },
         isChain: {
             tag: "input",
             type: "checkbox",
@@ -2542,6 +2544,7 @@ Model.typeahead = {
         "table",
         "name",
         "concat",
+        "where",
         "information",
         "order_by",
         "import_field",
@@ -2553,6 +2556,7 @@ Model.typeahead = {
         table: "Module Name",
         name: "Label",
         concat: "Concat",
+        where:"Where SQL",
         information: "Additional Information",
         order_by : "Order By",
         import_field :"Default Import Field (id)",
@@ -2563,6 +2567,7 @@ Model.typeahead = {
         tabindex: 1,
         table: "user",
         concat: "CONCAT(fullname, ' ',email)",
+        where:"",
         information: "",
         order_by : "",
         import_field :"id"
@@ -2592,6 +2597,10 @@ Model.typeahead = {
             tag: "input",
             type: "text",
         },
+        where: {
+            tag: "input",
+            type: "text",
+        },
         information: {
             tag: "input",
             type: "text",
@@ -2702,6 +2711,7 @@ Model.dropdown_multi = {
         "table",
         "name",
         "concat",
+        "where",
         "information",
         "order_by",
         "import_field",
@@ -2713,6 +2723,7 @@ Model.dropdown_multi = {
         table: "Module Name",
         name: "Name",
         concat: "Concat",
+        where: "Where SQL",
         information: "Additional Information",
         order_by : "Order By",
         import_field :"Default Import Field (id)",
@@ -2724,6 +2735,7 @@ Model.dropdown_multi = {
         table: "user",
         name: "username",
         concat: "CONCAT(fullname, ' ',email)",
+        where: "",
         information: "",
         order_by : "",
         import_field :"id"
@@ -2753,6 +2765,10 @@ Model.dropdown_multi = {
             tag: "input",
             type: "text",
         },
+        where: {
+            tag: "input",
+            type: "text",
+        },
         information: {
             tag: "input",
             type: "text",

package/lib/generatorModel.js

@@ -333,6 +333,10 @@ me.prepare = (MYMODEL) => {
         if (Object.prototype.hasOwnProperty.call(property.values, "readonly")) {
             widgets[key].readonly = property.values.readonly ? true : false;
         }
+        if (Object.prototype.hasOwnProperty.call(property.values, "where")) {
+            widgets[key].where = property.values.where || "";
+            console.log(widgets[key].where)
+        }
 
         switch (type) {
             case "image":

package/lib/zGeneratorRouter.js

@@ -342,6 +342,8 @@ router.post("/save_and_generate", csrfProtection, async (req, res) => {
     if (nots.includes(req.body.table)) {
       return res.json(Util.flashError("Table is locked"));
     }
+    let dir = `${dirRoot}/public/temp`
+    Util.dirExist(dir, true);
     //console.log(JSON.stringify(req.body))
     const json = await generate(req, res);
     res.json(json);

package/lib/zRoute.js

@@ -5880,6 +5880,7 @@ cache models in so it's no need call database repeatly
 zRoute.modelsCache = async () => {
   let obj = {};
   let orderBy = {};
+  let whereKeys = {}
   let dragdropsObj = {};
   if (process.env.APP_IS_CACHE == 1) {
     let models = zRoute.MYMODELS() || {};
@@ -5903,18 +5904,35 @@ zRoute.modelsCache = async () => {
               obj[table] = {};
             }
             if (!Util.in_array(key, nots)) {
-              obj[table][
-                  `${keys}___${key}`
-                  ] = `${widgets[key].fields[1]} as ${key}_${models[keys].table}`;
-              if (
-                  Object.prototype.hasOwnProperty.call(models[keys].widgets, key)
-              ) {
-                if (
-                    Object.prototype.hasOwnProperty.call(
-                        models[keys].widgets[key],
-                        "order_by"
-                    )
-                ) {
+              obj[table][`${keys}___${key}`] = `${widgets[key].fields[1]} as ${key}_${models[keys].table}`;
+              if (widgets[key].where) {
+                if (!whereKeys[table]) {
+                  whereKeys[table] = {};
+                }
+                let whereWidget = (widgets[key].where || "").trim();
+                if (whereWidget) {
+                  let whereObj = {};
+                  if (whereWidget.includes(",")) {
+                    let splits = whereWidget.split(",");
+                    splits.forEach((item) => {
+                      let parts = item.trim().split("=");
+                      if (parts.length >= 2) {
+                        whereObj[parts[0].trim()] = parts.slice(1).join("=").trim();
+                      }
+                    });
+                  } else {
+                    let parts = whereWidget.split("=");
+                    if (parts.length >= 2) {
+                      whereObj[parts[0].trim()] = parts.slice(1).join("=").trim();
+                    }
+                  }
+                  if (Object.keys(whereObj).length) {
+                    whereKeys[table][`${keys}___${key}`] = whereObj;
+                  }
+                }
+              }
+              if (Object.prototype.hasOwnProperty.call(models[keys].widgets, key)) {
+                if (Object.prototype.hasOwnProperty.call(models[keys].widgets[key],"order_by")) {
                   if (models[keys].widgets[key].order_by) {
                     orderBy[table] = models[keys].widgets[key].order_by;
                   }
@@ -5944,27 +5962,67 @@ zRoute.modelsCache = async () => {
         );
         if (checks[0].oke) {
           if (!Util.in_array(keys, zRoute.tableHasNoCompanyId)) {
-            let selects = ``;
+            let keysWithoutWhere = [];
+            let keysWithWhere = [];
             for (let key in obj[keys]) {
-              selects += `${obj[keys][key]},`;
+              if (whereKeys[keys] && whereKeys[keys][key]) {
+                keysWithWhere.push(key);
+              } else {
+                keysWithoutWhere.push(key);
+              }
             }
-            selects += `id, company_id`;
             for (const company of companies) {
-              //console.log('selects : '+ selects + ' table : '+keys + ' ')
-              let objectSQL = {
-                table: keys,
-                select: selects,
-                where: {
-                  company_id: company.id,
-                },
-              };
-              //console.log(keys)
-              if (orderBy[keys]) {
-                objectSQL.order_by = [`${orderBy[keys]}`];
+              let wheres = {};
+              wheres['company_id'] = company.id;
+              if (keysWithoutWhere.length > 0) {
+                let selects = ``;
+                for (let key of keysWithoutWhere) {
+                  selects += `${obj[keys][key]},`;
+                }
+                selects += `id, company_id`;
+                let objectSQL = {
+                  table: keys,
+                  select: selects,
+                  where: wheres,
+                };
+                if (orderBy[keys]) {
+                  objectSQL.order_by = [`${orderBy[keys]}`];
+                }
+                const results = await connection.results(objectSQL);
+                for (let key of keysWithoutWhere) {
+                  const splits = key.split("___") || [];
+                  let item = splits.length > 1 ? splits[1] : key;
+                  let arr = [];
+                  for (const result of results) {
+                    if (result[`${item}_${splits[0]}`]) {
+                      arr.push({
+                        id: result.id,
+                        zname: result[`${item}_${splits[0]}`],
+                      });
+                    } else {
+                      arr.push({ id: result.id, zname: result[item] });
+                    }
+                  }
+                  if (orderBy[keys]) {
+                    myCache.set(`${keys}_${key}_${company.id}`, arr);
+                  } else {
+                    const myarray = Util.sortArray(arr, "zname");
+                    myCache.set(`${keys}_${key}_${company.id}`, myarray);
+                  }
+                }
               }
-              const results = await connection.results(objectSQL);
-              for (let key in obj[keys]) {
-                //console.log('key : '+ key + ' obj[keys] : '+ JSON.stringify(obj[keys]) + ' ')
+              for (let key of keysWithWhere) {
+                let whereMerge = { ...wheres, ...whereKeys[keys][key] };
+                let selectOne = `${obj[keys][key]}`;
+                let objectSQL = {
+                  table: keys,
+                  select: `${selectOne}, id, company_id`,
+                  where: whereMerge,
+                };
+                if (orderBy[keys]) {
+                  objectSQL.order_by = [`${orderBy[keys]}`];
+                }
+                const results = await connection.results(objectSQL);
                 const splits = key.split("___") || [];
                 let item = splits.length > 1 ? splits[1] : key;
                 let arr = [];
@@ -5982,7 +6040,6 @@ zRoute.modelsCache = async () => {
                   myCache.set(`${keys}_${key}_${company.id}`, arr);
                 } else {
                   const myarray = Util.sortArray(arr, "zname");
-                  //console.log(`${keys}_${key}_${company.id}`)
                   myCache.set(`${keys}_${key}_${company.id}`, myarray);
                 }
               }

package/package.json

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