zet-lib 1.3.25 → 1.3.26

package/lib/Util.js

@@ -1204,13 +1204,17 @@ Util.selectParser = (fields = [], MYMODEL = {}) => {
   return select
 }
 
-Util.fieldWithTable = (field, MYMODEL) => {
+Util.fieldWithTable = (field, MYMODEL, isWhere = false) => {
   let name = ''
   let joinList = MYMODEL.joins && MYMODEL.joins.list.length > 0 ? MYMODEL.joins.list : []
   if (joinList.length > 0) {
     if (joinList.includes(field)) {
       let split = field.split('___')
-      name = `${split[0]}.${split[1]} as ${field}`
+      if (isWhere) {
+        name = `${split[0]}.${split[1]}`
+      } else {
+        name = `${split[0]}.${split[1]} as ${field}`
+      }
     } else {
       name = `${MYMODEL.table}.${field}`
     }

package/lib/zGeneratorRouter.js

@@ -670,8 +670,6 @@ const buildJoin = async (MYMODEL, result) => {
   if (result.joins && Object.keys(joins).length > 0) {
     let newDataObj = {}
     for (let key in joins) {
-      //find relation
-      //sql.push(` LEFT JOIN ${key} ON ${key}.id = ${table}.${key}_id `)
       let THEIR_MODEL = require(`${dirRoot}/models/${key}`)
       //console.log(THEIR_MODEL)
       let arr = joins[key] || []
@@ -680,7 +678,8 @@ const buildJoin = async (MYMODEL, result) => {
         arr.map((item) => {
           //console.log(item)
           //console.log(typeof item)
-          const originKey = key.replace(`${key}___`, '')
+          const originKey = item.key.replace(`${key}___`, '')
+          console.log(originKey)
           newDataObj[item.key] = item.value
           MYMODEL.keys.push(item.key)
           MYMODEL.keysExcel.push(item.key)
@@ -689,7 +688,7 @@ const buildJoin = async (MYMODEL, result) => {
           MYMODEL.options[item.key] = THEIR_MODEL.options[originKey]
           MYMODEL.grids.invisibles.push(item.key)
           MYMODEL.datas[item.key] = THEIR_MODEL.datas[originKey]
-          //MYMODEL.widgets[item.key] = THEIR_MODEL.widgets[originKey];
+          MYMODEL.widgets[item.key] = THEIR_MODEL.widgets[originKey]
           join_list.push(item.key)
         })
       }
@@ -744,7 +743,7 @@ const buildJoin = async (MYMODEL, result) => {
           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} `
         })
-        console.log(foreignTables)
+        //console.log(foreignTables)
         table_joins.map((item) => {
           if (!table_steps.includes(item)) {
             if (foreignTables.includes(item)) {
@@ -1392,7 +1391,6 @@ const scanning = async (MYMODEL, result) => {
   newModel += `${Util.newLine}`
   newModel += `}`
   fs.writeFileSync(`${dirRoot}/models/${MYMODEL.table}.js`, newModel)
-
   //return MYMODEL;
 }
 

package/lib/zRoute.js

@@ -512,7 +512,7 @@ zRoute.selectData = (MYMODEL) => {
   return data
 }
 
-zRoute.relations = async (req, res, table) => {
+zRoute.relationTable = async (req, res, table) => {
   try {
     const MYMODELS = myCache.get('MYMODELS')
     const MYMODEL = MYMODELS[table]
@@ -523,7 +523,7 @@ zRoute.relations = async (req, res, table) => {
     let hasAttributes = false
     let zattributes = {}
     let company_id = res.locals.companyId
-    //f0r widgets
+    //widgets
     for (let key in MYMODEL.widgets) {
       const keyRow = key + 'Row'
       const keyFields = key + 'Fields'
@@ -717,7 +717,6 @@ zRoute.relations = async (req, res, table) => {
       }
     }
     //console.log(relations);
-
     let selectZvirtuals = ''
     for (let key in relations['zvirtuals']) {
       selectZvirtuals += `${relations['zvirtuals'][key]} , `
@@ -733,6 +732,51 @@ zRoute.relations = async (req, res, table) => {
   }
 }
 
+zRoute.relations = async (req, res, table) => {
+  try {
+    const MYMODELS = myCache.get('MYMODELS')
+    const MYMODEL = MYMODELS[table]
+    let relation = await zRoute.relationTable(req, res, table)
+    let relations = {}
+    if (MYMODEL.joins && MYMODEL.joins.list) {
+      let joinOfTables = MYMODEL.joins.tables
+      for (let key of joinOfTables) {
+        relations[key] = await zRoute.relationTable(req, res, key)
+      }
+      let listData = MYMODEL.joins.list || []
+      listData.map((item) => {
+        let split = item.split('___')
+        let mytable = split[0]
+        let key = split[1]
+        const itemRow = item + 'Row'
+        const itemFields = item + 'Fields'
+        const itemObject = item + 'Object'
+        const keyRow = key + 'Row'
+        const keyFields = key + 'Fields'
+        const keyObject = key + 'Object'
+
+        let relName = relations[mytable]
+        if (relName[key]) {
+          relation[item] = relName[key]
+        }
+        if (relName[keyRow]) {
+          relation[itemRow] = relName[keyRow]
+        }
+        if (relName[keyFields]) {
+          relation[itemFields] = relName[keyFields]
+        }
+        if (relName[keyObject]) {
+          relation[itemObject] = relName[keyObject]
+        }
+      })
+    }
+
+    return relation
+  } catch (e) {
+    console.log(e)
+  }
+}
+
 /*
  Function to create filter elements on  data table grid
  */
@@ -1903,7 +1947,9 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
     const MYMODEL = objData.MYMODEL || {}
     const table = MYMODEL.table
     const fields = Object.prototype.hasOwnProperty.call(objData, 'fields') ? objData.fields : req.body.fields
-    const relations = await zRoute.relations(req, res, MYMODEL.table)
+    let relations = await zRoute.relations(req, res, MYMODEL.table)
+    //find relation with joins
+
     const select = Object.prototype.hasOwnProperty.call(objData, 'select') ? objData.select : Util.selectParser(fields, MYMODEL)
     const columns = Object.prototype.hasOwnProperty.call(objData, 'columns') ? objData.columns : body.columns
     const asDate = []
@@ -1955,7 +2001,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
         }
         if (astype === 'jsonb') {
           whereArray.push({
-            field: Util.fieldWithTable(fields[item.data], MYMODEL),
+            field: Util.fieldWithTable(fields[item.data], MYMODEL, true),
             option: ' ',
             value: ` @> '["${item.search.value}"]'`,
             operator: 'AND',
@@ -1965,13 +2011,13 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
           whereArray.push({
             field: '',
             option: '',
-            value: ` ${Util.fieldWithTable(fields[item.data], MYMODEL)}::text ILIKE  '${item.search.value}' `,
+            value: ` ${Util.fieldWithTable(fields[item.data], MYMODEL, true)}::text ILIKE  '${item.search.value}' `,
             operator: 'AND',
             type: 'inline',
           })
         } else {
           whereArray.push({
-            field: Util.fieldWithTable(fields[item.data], MYMODEL),
+            field: Util.fieldWithTable(fields[item.data], MYMODEL, true),
             option: MYMODEL.options[fields[item.data]],
             value: item.search.value,
             operator: 'AND',
@@ -2086,6 +2132,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
         operator: 'AND',
       })
     }
+
     columns.forEach(function (item) {
       if (item.search.value) {
         let astype = 'text'
@@ -2100,7 +2147,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
         }
         if (astype === 'jsonb') {
           whereArray.push({
-            field: Util.fieldWithTable(fields[item.data], MYMODEL),
+            field: Util.fieldWithTable(fields[item.data], MYMODEL, true),
             option: ' ',
             value: ` @> '["${item.search.value}"]'`,
             operator: 'AND',
@@ -2110,13 +2157,13 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
           whereArray.push({
             field: '',
             option: '',
-            value: ` ${Util.fieldWithTable(fields[item.data], MYMODEL)}::text ILIKE  '${item.search.value}' `,
+            value: ` ${Util.fieldWithTable(fields[item.data], MYMODEL, true)}::text ILIKE  '${item.search.value}' `,
             operator: 'AND',
             type: 'inline',
           })
         } else {
           whereArray.push({
-            field: Util.fieldWithTable(fields[item.data], MYMODEL),
+            field: Util.fieldWithTable(fields[item.data], MYMODEL, true),
             option: MYMODEL.options[fields[item.data]],
             value: item.search.value,
             operator: 'AND',
@@ -3258,70 +3305,76 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
   let lexicals = []
   let mapKey = ''
   let hasAttributes = []
+  let joinsFields = []
+  if (MYMODEL.joins) {
+    joinsFields = MYMODEL.joins.list
+  }
   for (let key in widgets) {
-    if (widgets[key].name == 'datepicker') {
-      hasDatePicker = true
-    } else if (widgets[key].name == 'number') {
-      hasNumber = true
-    } else if (widgets[key].name == 'clockpicker') {
-      hasClockPicker = true
-    } else if (widgets[key].name == 'editor') {
-      hasEditor = true
-    } else if (widgets[key].name == 'ide_editor') {
-      hasIde = true
-    } else if (widgets[key].name == 'switch') {
-      let switchObj = moduleLib.switch(req, res, `#${key}`, widgets[key].fields)
-      scriptForm += switchObj.script
-      headObj.switch = switchObj.head
-      endObj.switch = switchObj.end
-    } else if (widgets[key].name == 'typeahead') {
-      let typeaheadObj = moduleLib.typeahead(req, res, MYMODEL.table, `#${key}Typeahead`)
-      scriptForm += typeaheadObj.script
-      headObj.typeahead = typeaheadObj.head
-      endObj.typeahead = typeaheadObj.end
-    } else if (widgets[key].name == 'location') {
-      let locationObj = moduleLib.location(req, res, key)
-      scriptForm += locationObj.script
-      endObj.location = locationObj.end
-      hasLocation = true
-      mapKey = key
-    } else if (widgets[key].name == 'dragdrop') {
-      let dragdropObj = moduleLib.dragdrop(req, res, key)
-      scriptForm += dragdropObj.script
-      headObj.dragdrop = dragdropObj.head
-      endObj.dragdrop = dragdropObj.end
-    } else if (widgets[key].name == 'datetime') {
-      hasDateTimePicker = true
-    } else if (widgets[key].name == 'table') {
-      hasTable = true
-      hasDateTimePicker = true
-      hasClockPicker = true
-      hasDatePicker = true
-    } else if (widgets[key].name == 'tags') {
-      hasTags = true
-    } else if (widgets[key].name == 'lexical') {
-      let lexicalObj = moduleLib.lexical(req, res, `#${key}`)
-      hasLexical = true
-      headObj.lexical = lexicalObj.head
-      endObj.lexical = lexicalObj.end
-      lexicals.push(key)
-    } else if (widgets[key].name == 'tinymce') {
-      hasTinymce = true
-    } else if (widgets[key].name == 'dropzone') {
-      hasDropzone = true
-      dropzones.push(key)
-    }
-    // has chains
-    if (widgets[key].name == 'relation') {
-      if (widgets[key].isChain) {
-        if (widgets[key].chains.length) {
-          chainsObj[key] = widgets[key].chains
-          hasChain = true
-        }
+    if (!joinsFields.includes(key)) {
+      if (widgets[key].name == 'datepicker') {
+        hasDatePicker = true
+      } else if (widgets[key].name == 'number') {
+        hasNumber = true
+      } else if (widgets[key].name == 'clockpicker') {
+        hasClockPicker = true
+      } else if (widgets[key].name == 'editor') {
+        hasEditor = true
+      } else if (widgets[key].name == 'ide_editor') {
+        hasIde = true
+      } else if (widgets[key].name == 'switch') {
+        let switchObj = moduleLib.switch(req, res, `#${key}`, widgets[key].fields)
+        scriptForm += switchObj.script
+        headObj.switch = switchObj.head
+        endObj.switch = switchObj.end
+      } else if (widgets[key].name == 'typeahead') {
+        let typeaheadObj = moduleLib.typeahead(req, res, MYMODEL.table, `#${key}Typeahead`)
+        scriptForm += typeaheadObj.script
+        headObj.typeahead = typeaheadObj.head
+        endObj.typeahead = typeaheadObj.end
+      } else if (widgets[key].name == 'location') {
+        let locationObj = moduleLib.location(req, res, key)
+        scriptForm += locationObj.script
+        endObj.location = locationObj.end
+        hasLocation = true
+        mapKey = key
+      } else if (widgets[key].name == 'dragdrop') {
+        let dragdropObj = moduleLib.dragdrop(req, res, key)
+        scriptForm += dragdropObj.script
+        headObj.dragdrop = dragdropObj.head
+        endObj.dragdrop = dragdropObj.end
+      } else if (widgets[key].name == 'datetime') {
+        hasDateTimePicker = true
+      } else if (widgets[key].name == 'table') {
+        hasTable = true
+        hasDateTimePicker = true
+        hasClockPicker = true
+        hasDatePicker = true
+      } else if (widgets[key].name == 'tags') {
+        hasTags = true
+      } else if (widgets[key].name == 'lexical') {
+        let lexicalObj = moduleLib.lexical(req, res, `#${key}`)
+        hasLexical = true
+        headObj.lexical = lexicalObj.head
+        endObj.lexical = lexicalObj.end
+        lexicals.push(key)
+      } else if (widgets[key].name == 'tinymce') {
+        hasTinymce = true
+      } else if (widgets[key].name == 'dropzone') {
+        hasDropzone = true
+        dropzones.push(key)
       }
-      //relation_all_attributes
-      if (widgets[key].isAttributes) {
-        hasAttributes.push(key)
+      // has chains
+      if (widgets[key].name == 'relation') {
+        if (widgets[key].isChain) {
+          if (widgets[key].chains.length) {
+            chainsObj[key] = widgets[key].chains
+            hasChain = true
+          }
+        }
+        //relation_all_attributes
+        if (widgets[key].isAttributes) {
+          hasAttributes.push(key)
+        }
       }
     }
   }
@@ -3559,10 +3612,11 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
     });`
 
   for (let keys in widgets) {
-    let widgetName = widgets[keys].name
-    switch (widgetName) {
-      case 'multi_line_editor':
-        scriptForm += `$(".text-toggle").on("click", function(){
+    if (!joinsFields.includes(keys)) {
+      let widgetName = widgets[keys].name
+      switch (widgetName) {
+        case 'multi_line_editor':
+          scriptForm += `$(".text-toggle").on("click", function(){
                 let editorId = $(this).data("id");
                 $("#"+editorId).attr("type","text");
                 $("#a_"+editorId).hide();
@@ -3578,10 +3632,10 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
                         }
                     }
                 });`
-        break
+          break
 
-      case 'dropdown_multi':
-        scriptForm += ` $("#dropdownadd${keys}").on("click", function () {
+        case 'dropdown_multi':
+          scriptForm += ` $("#dropdownadd${keys}").on("click", function () {
         var val = $("#${keys}").val();
         if(val == ""){
             alert("Please select data");
@@ -3592,25 +3646,25 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
         $("#dropdownbox${keys}").append(data);
         $("#${keys}").val("");
     });${Util.newLine}`
-        break
+          break
 
-      case 'table':
-        let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`)
-        //let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table);
-        //relations[key + "TABLE"]
-        let RELATIONS_MODEL_TABLE = relations && relations.hasOwnProperty(keys + 'TABLE') ? relations[keys + 'TABLE'] : {}
-        let zForm = zRoute.formField(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE)
-        zRoute.moduleLib(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE, zForms)
-        let trash = `trash_${keys}_${MYMODEL.widgets[keys].table}`
-        let subname = MYMODEL.table + '_' + keys
-        let relationsWithKeys = relations ? relations[keys] : {}
-        let dropdownMultis = []
-
-        for (let qq in MODEL_TABLE.widgets) {
-          //check if have dropdown_multi
-          if (MODEL_TABLE.widgets[qq].name == 'dropdown_multi') {
-            dropdownMultis.push(qq)
-            scriptForm += `$("#body-${keys}").on("click", "#dropdownadd${qq}",function () {
+        case 'table':
+          let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`)
+          //let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table);
+          //relations[key + "TABLE"]
+          let RELATIONS_MODEL_TABLE = relations && relations.hasOwnProperty(keys + 'TABLE') ? relations[keys + 'TABLE'] : {}
+          let zForm = zRoute.formField(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE)
+          zRoute.moduleLib(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE, zForms)
+          let trash = `trash_${keys}_${MYMODEL.widgets[keys].table}`
+          let subname = MYMODEL.table + '_' + keys
+          let relationsWithKeys = relations ? relations[keys] : {}
+          let dropdownMultis = []
+
+          for (let qq in MODEL_TABLE.widgets) {
+            //check if have dropdown_multi
+            if (MODEL_TABLE.widgets[qq].name == 'dropdown_multi') {
+              dropdownMultis.push(qq)
+              scriptForm += `$("#body-${keys}").on("click", "#dropdownadd${qq}",function () {
         let elm =  $(this).siblings("#${qq}");
         var val = elm.val();
         if(val == ""){
@@ -3624,13 +3678,13 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
         $(this).parent().parent().find("#dropdownbox${qq}").append(data);
         $(this).siblings("#${qq}").val("");
     });${Util.newLine}`
+            }
           }
-        }
 
-        scriptForm += `var append${keys} = (increment, callback) => { buildform(increment,'${MYMODEL.table}','${keys}','${JSON.stringify(relationsWithKeys)}', (data) => callback(data)) } `
-        scriptForm += Util.newLine
-        scriptForm += `var append${keys}Max = $('tbody#body-${keys}>tr').length;${Util.newLine}`
-        scriptForm += `function ${keys}Handler(){ 
+          scriptForm += `var append${keys} = (increment, callback) => { buildform(increment,'${MYMODEL.table}','${keys}','${JSON.stringify(relationsWithKeys)}', (data) => callback(data)) } `
+          scriptForm += Util.newLine
+          scriptForm += `var append${keys}Max = $('tbody#body-${keys}>tr').length;${Util.newLine}`
+          scriptForm += `function ${keys}Handler(){ 
  var index = $("#body-${keys}>tr").length || 0; 
 $("#body-${keys}>tr").each(function (index, tr) {
             let dataname = $(tr).data("name") || "";
@@ -3670,12 +3724,12 @@ $("#body-${keys}>tr").each(function (index, tr) {
           
         }); ${Util.newLine}};${Util.newLine}`
 
-        scriptForm += `   $('#add${keys}').on('click',function(){
+          scriptForm += `   $('#add${keys}').on('click',function(){
             append${keys}(append${keys}Max, (data) => $('#body-${keys}').append(data));
             append${keys}Max++;
             ${keys}Handler();
         }); ${Util.newLine}`
-        scriptForm += `function set${keys}value(index,myobj) {
+          scriptForm += `function set${keys}value(index,myobj) {
         for(var key in myobj){
                           if($(".${subname}_" + key).eq(index).attr("type") == "checkbox" && myobj[key] == 1){
                               $(".${subname}_" + key).eq(index).prop("checked", true);
@@ -3708,7 +3762,7 @@ $("#body-${keys}>tr").each(function (index, tr) {
         }
 `
 
-        scriptForm += `function build${keys}form(index, myobj) {
+          scriptForm += `function build${keys}form(index, myobj) {
          append${keys}(index, (data) => {
                       $("#body-${keys}").append(data);
                       ${keys}Handler();
@@ -3720,24 +3774,24 @@ $("#body-${keys}>tr").each(function (index, tr) {
         }
         `
 
-        /*  scriptForm += ` $(function () {
+          /*  scriptForm += ` $(function () {
 var ${keys} = $("#body-${keys}").data("value") ? $("#body-${keys}").data("value") : [];
 ${keys}.forEach(function (myobj, index) {
   build${keys}form(index, myobj);
   });  
 });${Util.newLine}`*/
 
-        break
+          break
 
-      case 'ide_editor':
-        //var additionalScripts = `if (!!session.$worker) {session.$worker.send("setOptions", [{"esversion": 9,"esnext": false,}]);}`;
-        let script_annotaions = ''
-        let script_enabled = ''
-        let script_looping = ''
-        if (widgets[keys].language == 'javascript') {
-          script_annotaions = `editor_${keys}.session.setOption("useWorker", true);`
-          script_enabled = `editor_${keys}.session.setOption("useWorker", true);`
-          script_looping = `
+        case 'ide_editor':
+          //var additionalScripts = `if (!!session.$worker) {session.$worker.send("setOptions", [{"esversion": 9,"esnext": false,}]);}`;
+          let script_annotaions = ''
+          let script_enabled = ''
+          let script_looping = ''
+          if (widgets[keys].language == 'javascript') {
+            script_annotaions = `editor_${keys}.session.setOption("useWorker", true);`
+            script_enabled = `editor_${keys}.session.setOption("useWorker", true);`
+            script_looping = `
                     var errors = editor_${keys}.getSession().getAnnotations().filter(a=>a.type==='error');
                     arr = [];
                     errors.forEach(function(erItem) {
@@ -3749,8 +3803,8 @@ ${keys}.forEach(function (myobj, index) {
                     editor_${keys}.getSession().setAnnotations(arr);
                     editor_${keys}.session.setOption("useWorker", true);
                     `
-        }
-        scriptForm += `var editor_${keys} = ace.edit("editor_${keys}");
+          }
+          scriptForm += `var editor_${keys} = ace.edit("editor_${keys}");
     editor_${keys}.getSession().setMode("ace/mode/${widgets[keys].language}");
     editor_${keys}.setValue(ace_value(ide_editor_${keys}));
     $("#${keys}").text(ace_value(ide_editor_${keys}));
@@ -3761,7 +3815,8 @@ ${keys}.forEach(function (myobj, index) {
     });
     `
 
-        break
+          break
+      }
     }
   }
 

package/package.json

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