zet-lib 1.5.9 → 1.5.11

package/lib/Util.js

@@ -1238,16 +1238,22 @@ Util.userAvatar = (img = "") => {
 Util.selectParser = (fields = [], MYMODEL = {}) => {
   let table = MYMODEL.table;
   let virtuals = [];
+  let typeaheads = [];
   let select = "";
   for (var key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key].name === "virtual") {
       virtuals.push(key);
     }
+    if (MYMODEL.widgets[key].name === "typeahead") {
+      typeaheads.push(key);
+    }
   }
   let arr = [];
   fields.forEach((item) => {
     if (virtuals.includes(item)) {
       select += `${MYMODEL.widgets[item].fields},`;
+    } else if (typeaheads.includes(item)) {
+      select += `(select ${MYMODEL.widgets[item].fields[1]} from ${MYMODEL.widgets[item].table} WHERE ${MYMODEL.widgets[item].table}.id = ${MYMODEL.table}.${item} LIMIT 1  ) as ${item},`;
     } else if (item === "no") {
       arr.push(`${table}.id`);
     } else if (item === "actionColumn") {

package/lib/zRoute.js

@@ -551,13 +551,13 @@ zRoute.relationTable = async (req, res, table, visiblesColumns = []) => {
     let hasAttributes = false;
     let zattributes = {};
     let company_id = res.locals.companyId;
-    let widgets = {}
-    if(visiblesColumns.length == 0){
-      widgets = MYMODEL.widgets
+    let widgets = {};
+    if (visiblesColumns.length == 0) {
+      widgets = MYMODEL.widgets;
     } else {
       visiblesColumns.map((item) => {
-        widgets[item] = MYMODEL.widgets[item]
-      })
+        widgets[item] = MYMODEL.widgets[item];
+      });
     }
 
     //widgets
@@ -718,7 +718,9 @@ zRoute.relationTable = async (req, res, table, visiblesColumns = []) => {
           "id",
           "zname"
         );
-      } else if (widgetName == "typeahead") {
+      } else if (widgetName == "switch") {
+
+      /* else if (widgetName == "typeahead") {
         const cacheKey = `${widget.table}_${MYMODEL.table}___${key}_${company_id}`;
         let results;
         if (myCache.has(cacheKey)) {
@@ -746,7 +748,7 @@ zRoute.relationTable = async (req, res, table, visiblesColumns = []) => {
           "zname"
         );
         relations[keyFields] = widget.fields;
-      } else if (widgetName == "switch") {
+      } */
         relations[key] = Util.modulesSwitch(widget.fields);
         relations[keyFields] = widget.fields;
       } else if (widgetName == "virtual") {
@@ -1228,10 +1230,6 @@ zRoute.dataTableData = (
             myvalue = relations[keyFields][value] || "";
             break;
 
-          case "typeahead":
-            myvalue = relations[keyObject][value] || "";
-            break;
-
           case "datetime":
             myvalue = Util.timeSql(value);
             break;
@@ -2396,7 +2394,12 @@ zRoute.listDataTable = async (req, res, objData = {}, visibleColumns = []) => {
     const fields = Object.prototype.hasOwnProperty.call(objData, "fields")
       ? objData.fields
       : req.body.fields;
-    let relations = await zRoute.relations(req, res, MYMODEL.table, visibleColumns);
+    let relations = await zRoute.relations(
+      req,
+      res,
+      MYMODEL.table,
+      visibleColumns
+    );
     //find relation with joins
     const select = Object.prototype.hasOwnProperty.call(objData, "select")
       ? objData.select
@@ -2961,7 +2964,7 @@ zRoute.formField = (req, res, MYMODEL, relations, data = {}) => {
 };
 
 zRoute.formsFieldSync = async (req, res, MYMODEL, data = {}) => {
-  const relations = await zRoute.relations(req, res, MYMODEL.table);
+  let relations = await zRoute.relations(req, res, MYMODEL.table);
   let tableRelations = {};
   for (let key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key].name == "table") {
@@ -2971,6 +2974,23 @@ zRoute.formsFieldSync = async (req, res, MYMODEL, data = {}) => {
         MYMODEL.widgets[key].table
       );
       //console.log("tabelrelations", JSON.stringify(tableRelations[key]))
+    } else if (MYMODEL.widgets[key].name == "typeahead") {
+      relations[key] = "";
+      relations[key + "Data"] = [{ id: "", zname: "" }];
+      if (data[key]) {
+        let resultkey = await connection.results({
+          table: MYMODEL.widgets[key].table,
+          select: `id,${MYMODEL.widgets[key].fields[1]} as zname`,
+          where: {
+            id: data[key],
+          },
+        });
+        relations[key] = resultkey.length > 0 ? resultkey[0].zname : "";
+        relations[key + "Data"] = [
+          Util.arrayUnShift(["id", "zname"]),
+          ...resultkey,
+        ];
+      }
     }
   }
   let forms = zRoute.forms(req, res, MYMODEL, relations, data, tableRelations);
@@ -3198,10 +3218,12 @@ zRoute.forms = (
             fields[key].title,
             fields[key].required
           );
-          obj.data = relations[key];
-          obj.typeaheadvalue = !data[key]
+          //obj.data = relations[key];
+          /*obj.typeaheadvalue = !data[key]
             ? ""
-            : relations[key + "Object"][data[key]];
+            : relations[key + "Object"][data[key]];*/
+          obj.data = relations[key + "Data"];
+          obj.typeaheadvalue = relations[key];
           break;
         case "dropdown_chain":
           obj.type = "select";
@@ -3354,8 +3376,7 @@ zRoute.viewFormPlainText = (req, res, MYMODEL, relations, data = {}) => {
 
 zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
   const MYMODELS = myCache.get("MYMODELS");
-  const relations = await zRoute.relations(req, res, MYMODEL.table);
-  let forms = zRoute.viewForm(req, res, MYMODEL, relations, data);
+  let relations = await zRoute.relations(req, res, MYMODEL.table);
   let hasEditors = false;
   let hasLocation = false;
   let hasDropbox = false;
@@ -3371,6 +3392,24 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
     if (MYMODEL.widgets[key].name == "dropbox") {
       hasDropbox = true;
     }
+    if (MYMODEL.widgets[key].name == "typeahead") {
+      relations[key] = "";
+      relations[key + "Data"] = [{ id: "", zname: "" }];
+      if (data[key]) {
+        let resultkey = await connection.results({
+          table: MYMODEL.widgets[key].table,
+          select: `id,${MYMODEL.widgets[key].fields[1]} as zname`,
+          where: {
+            id: data[key],
+          },
+        });
+        relations[key] = resultkey.length > 0 ? resultkey[0].zname : "";
+        relations[key + "Data"] = [
+          Util.arrayUnShift(["id", "zname"]),
+          ...resultkey,
+        ];
+      }
+    }
   }
   if (hasEditors) {
     moduleLib.build(req, res, moduleLib.editor(req, res));
@@ -3417,6 +3456,9 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
     moduleLib.addScript(req, res, script);
   }
 
+  //build form
+  let forms = zRoute.viewForm(req, res, MYMODEL, relations, data);
+
   let tables = [];
   for (let key in forms.obj) {
     if (forms.obj[key].type == "table") {
@@ -3646,7 +3688,7 @@ zRoute.viewForm = (
           break;
         case "typeahead":
           obj[key].type = "text";
-          obj[key].value = relations[key + "Object"][data[key]] || "";
+          obj[key].value = relations[key];
           break;
 
         case "dropzone":
@@ -4778,7 +4820,7 @@ zRoute.insertSQL = async (req, res, table, data) => {
       }
     }
     //dropbox
-    console.log(JSON.stringify(movDropboxArr));
+    //console.log(JSON.stringify(movDropboxArr));
     if (movDropboxArr.length > 0) {
       setTimeout(() => {
         zRoute.moveDropbox(movDropboxArr).then(function (et) {
@@ -5610,12 +5652,7 @@ zRoute.modelsCache = async () => {
     delete models.zrole;
     delete models.zuser_company;
     let companies;
-    let mustCaches = [
-      "relation",
-      "typeahead",
-      "multi_line_editor",
-      "dropdown_multi",
-    ];
+    let mustCaches = ["relation", "multi_line_editor", "dropdown_multi"];
     let nots = ["created_by", "updated_by"];
     for (let keys in models) {
       let widgets = models[keys].widgets;
@@ -5888,7 +5925,7 @@ zRoute.typeahead = async (req, res) => {
     let WIDGET = MYMODEL.widgets;
     let query = req.query.query;
     let name = `${MYMODEL.widgets[keys].table}_${MYMODEL.table}___${keys}_${res.locals.companyId}`;
-    let sql = `select id,${MYMODEL.widgets[keys].fields[1]} as zname from ${MYMODEL.widgets[keys].table} where ${MYMODEL.widgets[keys].fields[1]} ILIKE '%${query}%' limit 50`
+    let sql = `select id,${MYMODEL.widgets[keys].fields[1]} as zname from ${MYMODEL.widgets[keys].table} where ${MYMODEL.widgets[keys].fields[1]} ILIKE '%${query}%' limit 50`;
     let results = await connection.query(sql);
     res.json(results);
   } catch (e) {

package/package.json

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