zet-lib 1.2.18 → 1.2.19

package/lib/zRoute.js

@@ -713,7 +713,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
             break
 
           case 'datepicker':
-            dataTable[key] = `<input type="text"  class="form-control search datepicker" value="${value}" id="data_table_${key}" >`
+            dataTable[key] = `<input type="text"  class="form-control search" value="${value}" id="data_table_${key}" >`
             types[key] = 'input'
             break
 
@@ -1670,174 +1670,226 @@ zRoute.dataTableSave = async (routeName, userId, body) => {
 dynamic list Data Table
  */
 zRoute.listDataTable = async (req, res, objData = {}) => {
-  const body = req.body
-  const MYMODEL = objData.MYMODEL || {}
-  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 = []
-  for (let key in MYMODEL.widgets) {
-    if (MYMODEL.widgets[key].name == 'datetime') {
-      asDate.push(key)
+  const room = res.locals.token || 'aa'
+  try {
+    const body = req.body
+    const MYMODEL = objData.MYMODEL || {}
+    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 = []
+    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 == 'dropdown_checkbox') {
+        asJSONb.push(key)
+      }
     }
-    if (MYMODEL.widgets[key].name == 'datepicker') {
-      asDate.push(key)
+    let whereArray = []
+    if (objData.hasOwnProperty('whereArray')) {
+      whereArray = objData['whereArray']
     }
+    whereArray.push({
+      field: 'company_id',
+      option: '=',
+      value: res.locals.companyId,
+      operator: 'AND',
+    })
+
+    columns.forEach(function (item) {
+      if (item.search.value) {
+        let astype = 'text'
+        if (asDate.includes(fields[item.data])) {
+          astype = 'date'
+        }
+        if (asJSONb.includes(fields[item.data])) {
+          astype = 'jsonb'
+        }
+        if (astype === 'jsonb') {
+          whereArray.push({
+            field: fields[item.data],
+            option: ' ',
+            value: ` @> '["${item.search.value}"]'`,
+            operator: 'AND',
+            type: 'inline',
+          })
+        } else {
+          whereArray.push({
+            field: fields[item.data],
+            option: MYMODEL.options[fields[item.data]],
+            value: item.search.value,
+            operator: 'AND',
+            type: astype,
+          })
+        }
+      }
+    })
+    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({
+      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',
+      table: MYMODEL.table,
+      whereArray: whereArray,
+    })
+    let datas = []
+    const zRole = objData.zRole || require('./zRole')
+    const levels = objData.hasOwnProperty('levels') ? objData.levels : zRole.myLevel(req, res, MYMODEL.table)
+    if (objData.hasOwnProperty('datas')) {
+      datas = objData.datas(body, rows, fields, relations, levels)
+    } else {
+      rows.forEach(function (row, index) {
+        let arr = []
+        fields.forEach(function (item) {
+          if (item == 'no') {
+            arr.push(index + 1 + parseInt(body.start))
+          } else if (item == 'actionColumn') {
+            let buttons = objData.hasOwnProperty('actionButtons') ? objData.actionButtons(levels, row, MYMODEL.table) : zRoute.actionButtons(levels, row, MYMODEL.table)
+            arr.push(buttons)
+          } else {
+            let data = objData.hasOwnProperty('datas') ? objData.data(item, row[item], MYMODEL, relations) : zRoute.dataTableData(item, row[item], MYMODEL, relations)
+            arr.push(data)
+          }
+        })
+        datas.push(arr)
+      })
+    }
+
+    const data = {
+      draw: body.draw,
+      recordsTotal: count.count || 0,
+      recordsFiltered: count.count || 0,
+      data: datas,
+    }
+    //save grid filter async
+    zRoute.dataTableSave(MYMODEL.routeName, res.locals.userId, body)
+    res.json(data)
+  } catch (err) {
+    console.log(err)
+    io.to(room).emit('error', err + '')
   }
-  let whereArray = []
-  if (objData.hasOwnProperty('whereArray')) {
-    whereArray = objData['whereArray']
-  }
-  whereArray.push({
-    field: 'company_id',
-    option: '=',
-    value: res.locals.companyId,
-    operator: 'AND',
-  })
+}
 
-  columns.forEach(function (item) {
-    if (item.search.value) {
-      let astype = 'text'
-      if (asDate.includes(fields[item.data])) {
-        astype = 'date'
+zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
+  const room = res.locals.token || 'aa'
+  try {
+    actionButtonsFn = actionButtonsFn || function () {}
+    const relations = await zRoute.relations(req, res, MYMODEL.table)
+    const body = req.body
+    const fields = body.fields
+    const select = Util.selectParser(fields, MYMODEL)
+    const asDate = []
+    const asJSONb = []
+    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 == 'dropdown_checkbox') {
+        asJSONb.push(key)
+      }
+    }
+    let whereArray = []
+    const columns = body.columns
+    if (MYMODEL.keys.includes('company_id')) {
       whereArray.push({
-        field: fields[item.data],
-        option: MYMODEL.options[fields[item.data]],
-        value: item.search.value,
+        field: 'company_id',
+        option: '=',
+        value: res.locals.companyId,
         operator: 'AND',
-        type: astype,
       })
     }
-  })
-  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({
-    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',
-    table: MYMODEL.table,
-    whereArray: whereArray,
-  })
-  let datas = []
-  const zRole = objData.zRole || require('./zRole')
-  const levels = objData.hasOwnProperty('levels') ? objData.levels : zRole.myLevel(req, res, MYMODEL.table)
-  if (objData.hasOwnProperty('datas')) {
-    datas = objData.datas(body, rows, fields, relations, levels)
-  } else {
+    columns.forEach(function (item) {
+      if (item.search.value) {
+        let astype = 'text'
+        if (asDate.includes(fields[item.data])) {
+          astype = 'date'
+        }
+        if (asJSONb.includes(fields[item.data])) {
+          astype = 'jsonb'
+        }
+        if (astype === 'jsonb') {
+          whereArray.push({
+            field: fields[item.data],
+            option: ' ',
+            value: ` @> '["${item.search.value}"]'`,
+            operator: 'AND',
+            type: 'inline',
+          })
+        } else {
+          whereArray.push({
+            field: fields[item.data],
+            option: MYMODEL.options[fields[item.data]],
+            value: item.search.value,
+            operator: 'AND',
+            type: astype,
+          })
+        }
+      }
+    })
+    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({
+      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',
+      table: MYMODEL.table,
+      whereArray: whereArray,
+    })
+    let datas = []
+    const levels = zRole.myLevel(req, res, MYMODEL.table)
     rows.forEach(function (row, index) {
       let arr = []
       fields.forEach(function (item) {
         if (item == 'no') {
           arr.push(index + 1 + parseInt(body.start))
         } else if (item == 'actionColumn') {
-          let buttons = objData.hasOwnProperty('actionButtons') ? objData.actionButtons(levels, row, MYMODEL.table) : zRoute.actionButtons(levels, row, MYMODEL.table)
+          let buttons = !actionButtonsFn(levels, row, MYMODEL.table) ? zRoute.actionButtons(levels, row, MYMODEL.table) : actionButtonsFn(levels, row, MYMODEL.table)
           arr.push(buttons)
         } else {
-          let data = objData.hasOwnProperty('datas') ? objData.data(item, row[item], MYMODEL, relations) : zRoute.dataTableData(item, row[item], MYMODEL, relations)
-          arr.push(data)
+          arr.push(zRoute.dataTableData(item, row[item], MYMODEL, relations))
         }
       })
       datas.push(arr)
     })
+    const data = {
+      draw: body.draw,
+      recordsTotal: count.count || 0,
+      recordsFiltered: count.count || 0,
+      data: datas,
+    }
+    //save grid filter async
+    zRoute.dataTableSave(MYMODEL.routeName, res.locals.userId, body)
+    res.json(data)
+  } catch (err) {
+    console.log(err)
+    io.to(room).emit('error', err + '')
   }
-
-  const data = {
-    draw: body.draw,
-    recordsTotal: count.count || 0,
-    recordsFiltered: count.count || 0,
-    data: datas,
-  }
-  //save grid filter async
-  zRoute.dataTableSave(MYMODEL.routeName, res.locals.userId, body)
-  res.json(data)
-}
-
-zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
-  actionButtonsFn = actionButtonsFn || function () {}
-  const relations = await zRoute.relations(req, res, MYMODEL.table)
-  const body = req.body
-  const fields = body.fields
-  const select = Util.selectParser(fields, MYMODEL)
-  const asDate = []
-  for (let key in MYMODEL.widgets) {
-    if (MYMODEL.widgets[key].name == 'datetime') {
-      asDate.push(key)
-    }
-    if (MYMODEL.widgets[key].name == 'datepicker') {
-      asDate.push(key)
-    }
-  }
-  let whereArray = []
-  const columns = body.columns
-  if (MYMODEL.keys.includes('company_id')) {
-    whereArray.push({
-      field: 'company_id',
-      option: '=',
-      value: res.locals.companyId,
-      operator: 'AND',
-    })
-  }
-  columns.forEach(function (item) {
-    if (item.search.value) {
-      let astype = 'text'
-      if (asDate.includes(fields[item.data])) {
-        astype = 'date'
-      }
-      whereArray.push({
-        field: fields[item.data],
-        option: MYMODEL.options[fields[item.data]],
-        value: item.search.value,
-        operator: 'AND',
-        type: astype,
-      })
-    }
-  })
-  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({
-    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',
-    table: MYMODEL.table,
-    whereArray: whereArray,
-  })
-  let datas = []
-  const levels = zRole.myLevel(req, res, MYMODEL.table)
-  rows.forEach(function (row, index) {
-    let arr = []
-    fields.forEach(function (item) {
-      if (item == 'no') {
-        arr.push(index + 1 + parseInt(body.start))
-      } else if (item == 'actionColumn') {
-        let buttons = !actionButtonsFn(levels, row, MYMODEL.table) ? zRoute.actionButtons(levels, row, MYMODEL.table) : actionButtonsFn(levels, row, MYMODEL.table)
-        arr.push(buttons)
-      } else {
-        arr.push(zRoute.dataTableData(item, row[item], MYMODEL, relations))
-      }
-    })
-    datas.push(arr)
-  })
-  const data = {
-    draw: body.draw,
-    recordsTotal: count.count || 0,
-    recordsFiltered: count.count || 0,
-    data: datas,
-  }
-  //save grid filter async
-  zRoute.dataTableSave(MYMODEL.routeName, res.locals.userId, body)
-  res.json(data)
 }
 
 zRoute.actionButtons = (levels, row, table, callback = null) => {

package/package.json

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