zet-lib 1.3.24 → 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/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.24",
+  "version": "1.3.25",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"