zet-lib 1.3.26 → 1.3.27

package/lib/zRoute.js

@@ -1384,6 +1384,7 @@ zRoute.selectAllowedField = (req, res, MYMODEL, arr = []) => {
 }
 
 zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
+  const table = MYMODEL.table
   const cacheRole = myCache.get('ROLES')[res.locals.roleId].params
   const levels = cacheRole[MYMODEL.table] || []
   if (!levels.includes('export')) {
@@ -1393,20 +1394,28 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
 
   let virtuals = []
   let customs = []
-  let asDate = []
-  for (var key in MYMODEL.widgets) {
-    if (MYMODEL.widgets[key].name === 'virtual') {
-      virtuals.push(key)
-    }
-    if (MYMODEL.widgets[key].name === 'custom') {
-      customs.push(key)
-    }
+  const asDate = []
+  const asJSONb = []
+  const asArray = []
+  for (let key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key].name == 'datetime') {
       asDate.push(key)
     }
     if (MYMODEL.widgets[key].name == 'datepicker') {
       asDate.push(key)
     }
+    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)
+    }
   }
   //check directory for import not export
   const dir = `${dirRoot}/public/excel/tmp`
@@ -1441,7 +1450,8 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
       let difference = allfields.filter((x) => !fields.includes(x))
       arr = [...fields, ...difference].filter((x) => !virtuals.includes(x))
       arr = arr.filter((item) => !customs.includes(item))
-      select = `"${arr.join('","')}"`
+      //select = `"${arr.join('","')}"`
+      select = Util.selectParser(arr, MYMODEL)
     }
     let whereArray = []
     if (paramsObject.hasOwnProperty('whereArray')) {
@@ -1451,48 +1461,90 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
         whereArray.push(paramsObject.whereArray)
       }
     }
+
+    whereArray.push({
+      field: `${table}.company_id`,
+      option: '=',
+      value: res.locals.companyId,
+      operator: 'AND',
+    })
+
     let columns = body.columns
     columns.forEach(function (item) {
       if (item.search.value) {
         let astype = 'text'
-        if (asDate.includes(body.fields[item.data])) {
+        if (asDate.includes(fields[item.data])) {
           astype = 'date'
         }
-        whereArray.push({
-          field: body.fields[item.data],
-          option: MYMODEL.options[body.fields[item.data]],
-          value: item.search.value,
-          operator: 'AND',
-          type: astype,
-        })
+        if (asJSONb.includes(fields[item.data])) {
+          astype = 'jsonb'
+        }
+        if (asArray.includes(fields[item.data])) {
+          astype = 'array'
+        }
+        if (astype === 'jsonb') {
+          whereArray.push({
+            field: Util.fieldWithTable(fields[item.data], MYMODEL, true),
+            option: ' ',
+            value: ` @> '["${item.search.value}"]'`,
+            operator: 'AND',
+            type: 'inline',
+          })
+        } else if (astype === 'array') {
+          whereArray.push({
+            field: '',
+            option: '',
+            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, true),
+            option: MYMODEL.options[fields[item.data]],
+            value: item.search.value,
+            operator: 'AND',
+            type: astype,
+          })
+        }
       }
     })
-    const orderColumn = body.fields[body.order[0].column] == 'actionColumn' ? 'id' : body.fields[body.order[0].column] == 'no' ? 'id' : body.fields[body.order[0].column] == 'actionColum' ? 'id' : body.fields[body.order[0].column]
+
+    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]
     if (zstandart) {
-      select = '*'
+      select = Util.selectParser(allfields, MYMODEL)
     }
-    const obj = {
+    let gridData = {
       select: select,
-      table: MYMODEL.table,
+      table: table,
       whereArray: whereArray,
-      orderBy: [orderColumn, body.order[0].dir],
+      order_by: [`${orderColumn} ${body.order[0].dir}`],
     }
     if (!zall) {
-      obj.limit = body.length
-      obj.offset = body.start
+      gridData.limit = body.length
+      gridData.offset = body.start
     } else {
-      obj.limit = 50000
-      obj.offset = 0
+      gridData.limit = 5000
+      gridData.offset = 0
+    }
+    let joins = Util.tableWithJoin(MYMODEL)
+    if (joins.length > 0) {
+      gridData.joins = joins
     }
-    rows = await connection.results(obj)
+    rows = await connection.results(gridData)
   } else {
-    rows = await connection.results({
+    let gridData = {
       select: Util.selectParser(fields, MYMODEL),
-      table: MYMODEL.table,
+      table: table,
       limit: reqQuery.pageSize,
       offset: parseInt(reqQuery.pageSize) - 1,
       orderBy: ['id', 'desc'],
-    })
+    }
+    let joins = Util.tableWithJoin(MYMODEL)
+    if (joins.length > 0) {
+      gridData.joins = joins
+    }
+    rows = await connection.results({ gridData })
   }
   if (zall) {
     fields = arr
@@ -1510,13 +1562,24 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
 }
 
 // for excels
-zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
+zRoute.excel = async (req, res, MYMODEL, myfields, rows, callback, fileName) => {
   const cacheRole = myCache.get('ROLES')[res.locals.roleId].params
   const levels = cacheRole[MYMODEL.table] || []
   if (!levels.includes('export')) {
     res.json('no access')
     return false
   }
+  let joins = Util.tableWithJoin(MYMODEL)
+  let notJoins = []
+  if (joins.length > 0) {
+    notJoins = MYMODEL.joins.list || []
+  }
+  let fields = []
+  myfields.map((item) => {
+    if (!notJoins.includes(item)) {
+      fields.push(item)
+    }
+  })
 
   //if any other custom value then callback needed
   callback = callback || function () {}
@@ -1566,18 +1629,20 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
   let selectRelations = ''
   let aliasResults = {}
   for (let key in MYMODEL.widgets) {
-    if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
-      if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
-        aliasResults[key] = Util.arrayToObject(
-          await connection.results({
-            select: `id,  ${MYMODEL.widgets[key].import_field}`,
-            table: MYMODEL.widgets[key].table,
-          }),
-          'id'
-        )
-        //console.log(aliasResults[key])
-        aliasRelations.push(key)
-        selectRelations += `, (select ${MYMODEL.widgets[key].import_field} from "${MYMODEL.widgets[key].table}" where  ${MYMODEL.widgets[key].table}.id = ${MYMODEL.table}.${key} limit 1) as ${key} `
+    if (!notJoins.includes(key)) {
+      if (MYMODEL.widgets[key].name == 'relation' || MYMODEL.widgets[key].name == 'typeahead') {
+        if (MYMODEL.widgets[key].import_field && MYMODEL.widgets[key].import_field != 'id') {
+          aliasResults[key] = Util.arrayToObject(
+            await connection.results({
+              select: `id,  ${MYMODEL.widgets[key].import_field}`,
+              table: MYMODEL.widgets[key].table,
+            }),
+            'id'
+          )
+          //console.log(aliasResults[key])
+          aliasRelations.push(key)
+          selectRelations += `, (select ${MYMODEL.widgets[key].import_field} from "${MYMODEL.widgets[key].table}" where  ${MYMODEL.widgets[key].table}.id = ${MYMODEL.table}.${key} limit 1) as ${key} `
+        }
       }
     }
   }
@@ -1591,20 +1656,22 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
   let usersObj = await zRoute.getUsers()
   if (Object.prototype.hasOwnProperty.call(MYMODEL, 'widgets')) {
     for (let key in MYMODEL.widgets) {
-      let widget = MYMODEL.widgets[key]
-      if (widget.name == 'password') {
-        passwords.push(key)
-      } else if (widget.name == 'select') {
-        tableObj[key] = widget.fields
-      } else if (widget.name == 'switch') {
-        tableObj[key] = widget.fields
-      } else if (widget.name == 'relation' || widget.name == 'typeahead') {
-        var rowsarr = await connection.results({
-          table: widget.table,
-          select: widget.fields[0] + ',' + widget.fields[1] + ' as zname ',
-        })
-        //save to object
-        relations[key] = Util.arrayToObject(rowsarr, 'id')
+      if (!notJoins.includes(key)) {
+        let widget = MYMODEL.widgets[key]
+        if (widget.name == 'password') {
+          passwords.push(key)
+        } else if (widget.name == 'select') {
+          tableObj[key] = widget.fields
+        } else if (widget.name == 'switch') {
+          tableObj[key] = widget.fields
+        } else if (widget.name == 'relation' || widget.name == 'typeahead') {
+          var rowsarr = await connection.results({
+            table: widget.table,
+            select: widget.fields[0] + ',' + widget.fields[1] + ' as zname ',
+          })
+          //save to object
+          relations[key] = Util.arrayToObject(rowsarr, 'id')
+        }
       }
     }
   }
@@ -2073,7 +2140,6 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
         datas.push(arr)
       })
     }
-
     const data = {
       draw: body.draw,
       recordsTotal: count.count || 0,

package/package.json

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