zet-lib 1.3.28 → 1.3.30

package/lib/connection.js

@@ -179,6 +179,27 @@ connection.results = async (obj) => {
   }
 }
 
+connection.sql = async (obj) => {
+  const select = obj.select || '*'
+  const table = obj.table || ''
+  //[{field:"your_field",option:"=>",value:"12",operator:"AND",type:"text,json,date"}]
+  const statement = obj.statement || ''
+  const limit = obj.limit ? ` LIMIT ${obj.limit} ` : ''
+  const offset = obj.hasOwnProperty('offset') ? ` OFFSET ${obj.offset} ` : obj.limit ? 'OFFSET 0' : ''
+  const orderBy = orderByFn(obj)
+  const values = obj.values || []
+  const objJoin = obj.joins || []
+  let join = ''
+  if (objJoin.length) {
+    join = objJoin.join(' ')
+  }
+  const whereObj = whereFn(obj)
+  const wheres = whereObj.where
+  const arr = whereObj.arr
+  const sql = `SELECT ${select} FROM  "${table}" ${join} ${wheres} ${statement} ${orderBy} ${limit}  ${offset}`
+  return { sql: sql, arr: arr }
+}
+
 connection.result = async (obj) => {
   const results = await connection.results(obj)
   if (results.length) {

package/lib/zGeneratorRouter.js

@@ -682,7 +682,7 @@ const buildJoin = async (MYMODEL, result) => {
           console.log(originKey)
           newDataObj[item.key] = item.value
           MYMODEL.keys.push(item.key)
-          MYMODEL.keysExcel.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]

package/lib/zRoute.js

@@ -880,6 +880,15 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
             types[key] = 'select'
             break
 
+          case 'dropdown_checkbox':
+            options = MYMODEL.widgets[key].fields.reduce((result, item) => {
+              var selected = value == item ? ' selected ' : ''
+              return result + `<option value="${item}" ${selected} >${item}</option>`
+            }, '')
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search"><option value=""></option>${options}</select>`
+            types[key] = 'select'
+            break
+
           case 'dropdown_multi':
             options = relations[key].reduce((result, item) => {
               var selected = value == item.id ? ' selected ' : ''
@@ -1437,12 +1446,14 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
   })
   let rows = []
   let fields = []
+  let fieldNames = []
   let body = {}
   let select = ''
   let arr = []
   let allfields = Object.keys(MYMODEL.widgets)
   if (results.length) {
     let result = results[0]
+    fieldNames = result.filter.fields
     body = result.filter
     fields = body.fields.filter((item) => item != 'no' && item != 'actionColumn')
     select = Util.selectParser(fields, MYMODEL)
@@ -1468,23 +1479,22 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
       value: res.locals.companyId,
       operator: 'AND',
     })
-
     let columns = body.columns
     columns.forEach(function (item) {
-      if (item.search.value) {
+      if (item.search.value != '') {
         let astype = 'text'
-        if (asDate.includes(fields[item.data])) {
+        if (asDate.includes(fieldNames[item.data])) {
           astype = 'date'
         }
-        if (asJSONb.includes(fields[item.data])) {
+        if (asJSONb.includes(fieldNames[item.data])) {
           astype = 'jsonb'
         }
-        if (asArray.includes(fields[item.data])) {
+        if (asArray.includes(fieldNames[item.data])) {
           astype = 'array'
         }
         if (astype === 'jsonb') {
           whereArray.push({
-            field: Util.fieldWithTable(fields[item.data], MYMODEL, true),
+            field: Util.fieldWithTable(fieldNames[item.data], MYMODEL, true),
             option: ' ',
             value: ` @> '["${item.search.value}"]'`,
             operator: 'AND',
@@ -1494,14 +1504,14 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
           whereArray.push({
             field: '',
             option: '',
-            value: ` ${Util.fieldWithTable(fields[item.data], MYMODEL, true)}::text ILIKE  '${item.search.value}' `,
+            value: ` ${Util.fieldWithTable(fieldNames[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]],
+            field: Util.fieldWithTable(fieldNames[item.data], MYMODEL, true),
+            option: MYMODEL.options[fieldNames[item.data]],
             value: item.search.value,
             operator: 'AND',
             type: astype,
@@ -1509,8 +1519,7 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
         }
       }
     })
-
-    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]
+    const orderColumn = fieldNames[body.order[0].column] == 'actionColumn' ? `${table}.id` : fieldNames[body.order[0].column] == 'no' ? `${table}.id` : fieldNames[body.order[0].column] == 'actionColum' ? `${table}.id` : fieldNames[body.order[0].column]
     if (zstandart) {
       select = Util.selectParser(allfields, MYMODEL)
     }
@@ -1562,7 +1571,7 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
 }
 
 // for excels
-zRoute.excel = async (req, res, MYMODEL, myfields, rows, callback, fileName) => {
+zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
   const cacheRole = myCache.get('ROLES')[res.locals.roleId].params
   const levels = cacheRole[MYMODEL.table] || []
   if (!levels.includes('export')) {
@@ -1574,12 +1583,6 @@ zRoute.excel = async (req, res, MYMODEL, myfields, rows, callback, fileName) =>
   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 () {}
@@ -1656,23 +1659,23 @@ zRoute.excel = async (req, res, MYMODEL, myfields, rows, callback, fileName) =>
   let usersObj = await zRoute.getUsers()
   if (Object.prototype.hasOwnProperty.call(MYMODEL, 'widgets')) {
     for (let key in MYMODEL.widgets) {
-      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')
-        }
+      //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')
       }
+      //}
     }
   }
 
@@ -2029,13 +2032,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
       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') {
+      if (MYMODEL.widgets[key].name == 'dropdown_multi' || MYMODEL.widgets[key].name == 'dragdrop' || 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') {
@@ -2108,6 +2105,8 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
       gridData.joins = joins
     }
     const rows = await connection.results(gridData)
+    //let sql = await connection.sql(gridData)
+    //console.log(sql)
     let gridCount = {
       select: `count(${table}.id) as count`,
       table: MYMODEL.table,

package/package.json

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