zet-lib 1.3.23 → 1.3.25

package/lib/Util.js

@@ -1176,10 +1176,10 @@ Util.userAvatar = (img = '') => {
 }
 
 /*
- MYSQL HELPER
+ SQL HELPER
  */
 Util.selectParser = (fields = [], MYMODEL = {}) => {
-  //fields = fields.filter((e) => e !== 'actionColumn')
+  let table = MYMODEL.table
   let virtuals = []
   let select = ''
   for (var key in MYMODEL.widgets) {
@@ -1190,19 +1190,40 @@ Util.selectParser = (fields = [], MYMODEL = {}) => {
   let arr = []
   fields.forEach((item) => {
     if (virtuals.includes(item)) {
-      select += MYMODEL.widgets[item].fields + ','
+      select += `${MYMODEL.widgets[item].fields},`
     } else if (item === 'no') {
-      arr.push('id')
+      arr.push(`${table}.id`)
     } else if (item === 'actionColumn') {
-      arr.push('lock')
+      arr.push(`${table}.lock`)
     } else {
-      arr.push(item)
+      arr.push(Util.fieldWithTable(item, MYMODEL))
     }
   })
-  select += `"${arr.join('","')}"`
+  //select += `"${arr.join('","')}"`
+  select += arr.join(',')
   return select
 }
 
+Util.fieldWithTable = (field, MYMODEL) => {
+  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}`
+    } else {
+      name = `${MYMODEL.table}.${field}`
+    }
+  } else {
+    name = `${MYMODEL.table}.${field}`
+  }
+  return name
+}
+
+Util.tableWithJoin = (MYMODEL) => {
+  return MYMODEL.joins && MYMODEL.joins.list.length > 0 ? MYMODEL.joins.sql : []
+}
+
 Util.selectMysql = (fields = [], relations = {}) => {
   let obj = {}
   let arr = []

package/lib/connection.js

@@ -353,6 +353,26 @@ connection.constraintList = (table, schema = 'public') => {
        WHERE nsp.nspname = '${schema}' AND rel.relname = '${table}'; `
 }
 
+//find foreign key
+connection.foreignKeyList = (table) => {
+  return `SELECT
+    tc.table_schema, 
+    tc.constraint_name, 
+    tc.table_name, 
+    kcu.column_name, 
+    ccu.table_schema AS foreign_table_schema,
+    ccu.table_name AS foreign_table_name,
+    ccu.column_name AS foreign_column_name 
+FROM information_schema.table_constraints AS tc 
+JOIN information_schema.key_column_usage AS kcu
+    ON tc.constraint_name = kcu.constraint_name
+    AND tc.table_schema = kcu.table_schema
+JOIN information_schema.constraint_column_usage AS ccu
+    ON ccu.constraint_name = tc.constraint_name
+WHERE tc.constraint_type = 'FOREIGN KEY'
+    AND tc.table_name='${table}';`
+}
+
 var toNumber = function (num) {
   num = num + ''
   var t = replaceAll(num, '.', '')

package/lib/zGeneratorRouter.js

@@ -418,7 +418,6 @@ const generate = async (req, res) => {
       //console.log(JSON.stringify(filesKey.modelObj))
       //check if has chains here
       MYMODEL = filesKey.modelObj
-
       //delete/clean zgrid after changes
       await connection.delete({
         table: 'zgrid',
@@ -503,7 +502,7 @@ const generate = async (req, res) => {
         fs.writeFileSync(`${dirRoot}/models/${filesKey.filename}`, newModel)
       }
       //check model if it has select relation in concat
-      await scanning(MYMODEL)
+      await scanning(MYMODEL, result)
     }
     //generate views
     let DIR_VIEW = `${dirRoot}/views/${table}`
@@ -662,6 +661,113 @@ router.post('/savetabs', async (req, res) => {
   res.send(json)
 })
 
+const buildJoin = async (MYMODEL, result) => {
+  let joins = result.joins || {}
+  let table = MYMODEL.table
+  let table_joins = []
+  let join_list = []
+
+  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] || []
+      table_joins.push(key)
+      if (arr.length > 0) {
+        arr.map((item) => {
+          //console.log(item)
+          //console.log(typeof item)
+          const originKey = key.replace(`${key}___`, '')
+          newDataObj[item.key] = item.value
+          MYMODEL.keys.push(item.key)
+          MYMODEL.keysExcel.push(item.key)
+          MYMODEL.labels[item.key] = item.value
+          MYMODEL.fields[item.key] = THEIR_MODEL.fields[originKey]
+          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];
+          join_list.push(item.key)
+        })
+      }
+    }
+
+    let sql = []
+    //get all foreign key
+    let rows = await connection.query(connection.foreignKeyList(table))
+    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}.${row.column_name} `
+    })
+
+    //step by step
+    let table_steps = []
+    table_joins.map((item) => {
+      if (foreignTables.includes(item)) {
+        sql.push(foreign_table_name[item])
+        table_steps.push(item)
+      }
+    })
+
+    if (table_steps.length > 0) {
+      for (let table_steps_item of table_steps) {
+        let rows = await connection.query(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} `
+        })
+        console.log(foreignTables)
+        table_joins.map((item) => {
+          if (!table_steps.includes(item)) {
+            if (foreignTables.includes(item)) {
+              sql.push(foreign_table_name[item])
+              table_steps.push(item)
+            }
+          }
+        })
+      }
+    }
+
+    if (table_steps.length > 0) {
+      for (let table_steps_item of table_steps) {
+        let rows = await connection.query(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} `
+        })
+        console.log(foreignTables)
+        table_joins.map((item) => {
+          if (!table_steps.includes(item)) {
+            if (foreignTables.includes(item)) {
+              sql.push(foreign_table_name[item])
+              table_steps.push(item)
+            }
+          }
+        })
+      }
+    }
+
+    //add join
+    let JOINS_DATA = {}
+    JOINS_DATA.tables = table_joins
+    JOINS_DATA.list = join_list
+    JOINS_DATA.data = joins
+    JOINS_DATA.sql = sql
+
+    MYMODEL.joins = JOINS_DATA
+  }
+  return MYMODEL
+}
+
 const columnLR = (items, dataName) => {
   return `<div class="col-md-6"><ol class="mydragable divboxlittle" data-name="${dataName}">${items}</ol></div>`
 }
@@ -1074,13 +1180,15 @@ var saveToZFields = async (body) => {
     data.joins = JSON.stringify(joinsTables)
   }
 
-  await connection.update({
+  let result = await connection.update({
     table: 'zfields',
     data: data,
     where: {
       table: table,
     },
   })
+
+  return result
 }
 
 //drop down chains effect
@@ -1218,16 +1326,15 @@ router.post('/import', async (req, res) => {
 /*
 Scanning relation id to name
  */
-const scanning = async (MYMODEL) => {
+const scanning = async (MYMODEL, result) => {
   //let MYMODEL = require(`${dirRoot}/models/${table}`);
-  //console.log(JSON.stringify(MYMODEL))
   let table = MYMODEL.table
   const widgets = MYMODEL.widgets
   const not_scanning = ['created_by', 'updated_by']
   const concat_bracket = /(?<=\().+?(?=\))/g
   let changeWidgets = {}
   let changes = []
-  for (let key in widgets) {
+  /*for (let key in widgets) {
     if (widgets[key].name == 'relation' || widgets[key].name == 'dropdown_multi' || widgets[key].name == 'typeahead') {
       if (!Util.in_array(key, not_scanning)) {
         let fields = widgets[key].fields
@@ -1262,7 +1369,7 @@ const scanning = async (MYMODEL) => {
         }
       }
     }
-  }
+  }*/
 
   if (changes.length) {
     //rewrite model
@@ -1274,6 +1381,18 @@ const scanning = async (MYMODEL) => {
     fs.writeFileSync(`${dirRoot}/models/${MYMODEL.table}.js`, newModel)
   }
 
+  //check if has join
+  //build join
+  //console.log(JSON.stringify(MYMODEL))
+  MYMODEL = await buildJoin(MYMODEL, result)
+  //console.log(JSON.stringify(MYMODEL))
+
+  let newModel = `module.exports = {  ${Util.newLine}`
+  newModel += zRoute.buildFileModel(MYMODEL)
+  newModel += `${Util.newLine}`
+  newModel += `}`
+  fs.writeFileSync(`${dirRoot}/models/${MYMODEL.table}.js`, newModel)
+
   //return MYMODEL;
 }
 
@@ -1430,7 +1549,7 @@ router.post('/joins', async (req, res) => {
       },
     })
     let resultJoins = result.joins || {}
-    resultJoins[table_join] = {}
+    resultJoins[table_join] = []
     let myzfield = await connection.update({
       table: 'zfields',
       data: {

package/lib/zRoute.js

@@ -1901,12 +1901,14 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   try {
     const body = req.body
     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)
     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 = []
     const asJSONb = []
+    const asArray = []
     for (let key in MYMODEL.widgets) {
       if (MYMODEL.widgets[key].name == 'datetime') {
         asDate.push(key)
@@ -1917,16 +1919,23 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
       if (MYMODEL.widgets[key].name == 'dropdown_multi') {
         asJSONb.push(key)
       }
+      if (MYMODEL.widgets[key].name == 'dragdrop') {
+        asJSONb.push(key)
+      }
       if (MYMODEL.widgets[key].name == 'dropdown_checkbox') {
         asJSONb.push(key)
       }
+      if (MYMODEL.widgets[key].name == 'json_array' || MYMODEL.widgets[key].name == 'array' || MYMODEL.widgets[key].name == 'dropzone') {
+        asArray.push(key)
+      }
     }
     let whereArray = []
     if (objData.hasOwnProperty('whereArray')) {
       whereArray = objData['whereArray']
     }
+
     whereArray.push({
-      field: 'company_id',
+      field: `${table}.company_id`,
       option: '=',
       value: res.locals.companyId,
       operator: 'AND',
@@ -1941,17 +1950,28 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
         if (asJSONb.includes(fields[item.data])) {
           astype = 'jsonb'
         }
+        if (asArray.includes(fields[item.data])) {
+          astype = 'array'
+        }
         if (astype === 'jsonb') {
           whereArray.push({
-            field: fields[item.data],
+            field: Util.fieldWithTable(fields[item.data], MYMODEL),
             option: ' ',
             value: ` @> '["${item.search.value}"]'`,
             operator: 'AND',
             type: 'inline',
           })
+        } else if (astype === 'array') {
+          whereArray.push({
+            field: '',
+            option: '',
+            value: ` ${Util.fieldWithTable(fields[item.data], MYMODEL)}::text ILIKE  '${item.search.value}' `,
+            operator: 'AND',
+            type: 'inline',
+          })
         } else {
           whereArray.push({
-            field: fields[item.data],
+            field: Util.fieldWithTable(fields[item.data], MYMODEL),
             option: MYMODEL.options[fields[item.data]],
             value: item.search.value,
             operator: 'AND',
@@ -1960,20 +1980,31 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
         }
       }
     })
-    const orderColumn = fields[body.order[0].column] == 'actionColumn' ? 'id' : fields[body.order[0].column] == 'no' ? 'id' : fields[body.order[0].column] == 'actionColum' ? 'id' : fields[body.order[0].column]
-    const rows = await connection.results({
+
+    const orderColumn = fields[body.order[0].column] == 'actionColumn' ? `${table}.id` : fields[body.order[0].column] == 'no' ? `${table}.id` : fields[body.order[0].column] == 'actionColum' ? `${table}.id` : fields[body.order[0].column]
+    let gridData = {
       select: select,
       table: MYMODEL.table,
       whereArray: whereArray,
       limit: body.length,
       offset: body.start,
-      orderBy: [orderColumn, body.order[0].dir],
-    })
-    const count = await connection.result({
-      select: 'count(id) as count',
+      order_by: [`${orderColumn} ${body.order[0].dir}`],
+    }
+    let joins = Util.tableWithJoin(MYMODEL)
+    if (joins.length > 0) {
+      gridData.joins = joins
+    }
+    const rows = await connection.results(gridData)
+    let gridCount = {
+      select: `count(${table}.id) as count`,
       table: MYMODEL.table,
       whereArray: whereArray,
-    })
+    }
+    if (joins.length > 0) {
+      gridCount.joins = joins
+    }
+    const count = await connection.result(gridCount)
+
     let datas = []
     const zRole = objData.zRole || require('./zRole')
     const levels = objData.hasOwnProperty('levels') ? objData.levels : zRole.myLevel(req, res, MYMODEL.table)
@@ -2014,6 +2045,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
 
 zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   const room = res.locals.token || 'aa'
+  const table = MYMODEL.table
   try {
     actionButtonsFn = actionButtonsFn || function () {}
     const relations = await zRoute.relations(req, res, MYMODEL.table)
@@ -2040,7 +2072,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
       if (MYMODEL.widgets[key].name == 'dropdown_checkbox') {
         asJSONb.push(key)
       }
-      if (MYMODEL.widgets[key].name == 'json_array' || MYMODEL.widgets[key].name == 'array') {
+      if (MYMODEL.widgets[key].name == 'json_array' || MYMODEL.widgets[key].name == 'array' || MYMODEL.widgets[key].name == 'dropzone') {
         asArray.push(key)
       }
     }
@@ -2048,7 +2080,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
     const columns = body.columns
     if (MYMODEL.keys.includes('company_id')) {
       whereArray.push({
-        field: 'company_id',
+        field: `${table}.company_id`,
         option: '=',
         value: res.locals.companyId,
         operator: 'AND',
@@ -2068,7 +2100,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
         }
         if (astype === 'jsonb') {
           whereArray.push({
-            field: fields[item.data],
+            field: Util.fieldWithTable(fields[item.data], MYMODEL),
             option: ' ',
             value: ` @> '["${item.search.value}"]'`,
             operator: 'AND',
@@ -2078,13 +2110,13 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
           whereArray.push({
             field: '',
             option: '',
-            value: ` ${fields[item.data]}::text ILIKE  '${item.search.value}' `,
+            value: ` ${Util.fieldWithTable(fields[item.data], MYMODEL)}::text ILIKE  '${item.search.value}' `,
             operator: 'AND',
             type: 'inline',
           })
         } else {
           whereArray.push({
-            field: fields[item.data],
+            field: Util.fieldWithTable(fields[item.data], MYMODEL),
             option: MYMODEL.options[fields[item.data]],
             value: item.search.value,
             operator: 'AND',
@@ -2093,20 +2125,30 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
         }
       }
     })
-    const orderColumn = fields[body.order[0].column] == 'actionColumn' ? 'id' : fields[body.order[0].column] == 'no' ? 'id' : fields[body.order[0].column] == 'actionColum' ? 'id' : fields[body.order[0].column]
-    const rows = await connection.results({
+
+    const orderColumn = fields[body.order[0].column] == 'actionColumn' ? `${table}.id` : fields[body.order[0].column] == 'no' ? `${table}.id` : fields[body.order[0].column] == 'actionColum' ? `${table}.id` : fields[body.order[0].column]
+    let gridData = {
       select: select,
       table: MYMODEL.table,
       whereArray: whereArray,
       limit: body.length,
       offset: body.start,
-      orderBy: [orderColumn, body.order[0].dir],
-    })
-    const count = await connection.result({
-      select: 'count(id) as count',
+      order_by: [`${orderColumn} ${body.order[0].dir}`],
+    }
+    let joins = Util.tableWithJoin(MYMODEL)
+    if (joins.length > 0) {
+      gridData.joins = joins
+    }
+    const rows = await connection.results(gridData)
+    let gridCount = {
+      select: `count(${table}.id) as count`,
       table: MYMODEL.table,
       whereArray: whereArray,
-    })
+    }
+    if (joins.length > 0) {
+      gridCount.joins = joins
+    }
+    const count = await connection.result(gridCount)
     let datas = []
     const levels = zRole.myLevel(req, res, MYMODEL.table)
     rows.forEach(function (row, index) {

package/package.json

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