sumba 2.31.0 → 2.32.0

package/extend/bajo/hook.js

@@ -21,8 +21,9 @@ async function clearCacheUser (id, result) {
 }
 
 async function applyModelGuard ({ model, q, teamIds, options }) {
-  const { get, set, orderBy, without } = this.app.lib._
+  const { set, orderBy } = this.app.lib._
   const { includes } = this.app.lib.aneka
+  const { sanitizeByType } = this.app.dobo
   const { req } = options
   const results = []
 
@@ -31,24 +32,29 @@ async function applyModelGuard ({ model, q, teamIds, options }) {
   const filterFn = item => {
     const bySiteId = item.siteId === req.site.id + ''
     const byModel = item.models.includes(model.name)
-    const byTeamId = includes(item.teamIds, teamIds)
     const byFields = fields.includes(item.field)
-    return bySiteId && byModel && byTeamId && byFields
+    return bySiteId && byModel && byFields
   }
 
   const rules = orderBy(guards.filter(filterFn), ['field'])
   for (const field of fields) {
-    let values = []
+    if (!model.getNonVirtualProperties(true).includes(field)) continue // or, should it throws exception instead?
+    const prop = model.getProperty(field)
     const items = rules.filter(item => item.field === field)
     for (const item of items) {
-      if (item.behavior === 'NIN') values = without(values, ...item.value)
-      else if (item.behavior === 'IN') values.push(...item.value)
+      const values = item.value.map(val => {
+        return sanitizeByType(val, prop.type, { strict: true, inputFormat: 'string', model: model.name })
+      })
+      const op = item.condition.toLowerCase()
+      let value
+      if (['in', 'nin'].includes(op)) value = set({}, '$' + op, values)
+      else if (op === 'between') value = { $gte: values[0], $lte: values[1] }
+      else value = set({}, '$' + op, values[0])
+      const teamOk = item.allTeams ? true : (item.teamIds.length === 0 ? false : includes(item.teamIds, teamIds))
+      if (!teamOk) throw this.error('_abortAction')
+      results.push(set({}, field, value))
     }
-    if (values.length) results.push(set({}, field, { $in: values }))
   }
-
-  const allowEmpty = get(this, `config.dobo.model.${model.name}.allowEmptyQuery`, true)
-  if (results.length === 0 && !allowEmpty) throw this.error('_emptyColumnQuery') // signal driver to about with no result immediately
   q.$and.push(...results)
 }
 
@@ -62,20 +68,19 @@ export async function applyAttribGuard ({ model, teamIds, options }) {
   const filterFn = item => {
     const bySiteId = item.siteId === req.site.id + ''
     const byModel = item.models.includes(model.name)
-    const byTeamId = includes(item.teamIds, teamIds)
+    const byTeamId = item.allTeams ? true : includes(item.teamIds, teamIds)
     return bySiteId && byModel && byTeamId
   }
-
-  const item = guards.filter(filterFn)[0]
-  if (item) results.push(...item.hiddenFields)
+  guards.filter(filterFn).forEach(item => results.push(...item.hiddenFields))
   options.hidden = options.hidden ?? []
-  if (results.length > 0) options.hidden.push(...results)
+  options.hidden.push(...results)
   options.hidden = uniq(options.hidden)
 }
 
 async function rebuildFilter (model, filter = {}, options = {}) {
   const { isEmpty, get } = this.app.lib._
   const { req } = options
+  const allowEmpty = !get(this, `app.${model.ns}.config.sumba.allowEmptyQuery`, []).includes(model.name)
   const hasSiteId = model.hasProperty('siteId')
   const hasUserId = model.hasProperty('userId')
   const hasTeamId = model.hasProperty('teamId')
@@ -89,13 +94,17 @@ async function rebuildFilter (model, filter = {}, options = {}) {
     if (filter.query.$and) q.$and.push(...filter.query.$and)
     else q.$and.push(filter.query)
   }
-  if (req.routeOptions.config.xSite) return
+  if (req.routeOptions.config.xSite) {
+    filter.query = q
+    return
+  }
   if (hasSiteId) q.$and.push({ siteId: req.site.id + '' })
   if (aliases.includes('administrator')) {
     filter.query = q
     return
   }
-  if (!req.user) {
+  if (isEmpty(req.user)) {
+    if (q.$and.length === 0 && !allowEmpty) throw this.error('_emptyColumnQuery')
     filter.query = q
     return
   }
@@ -119,8 +128,9 @@ async function rebuildFilter (model, filter = {}, options = {}) {
     else q.$and.push(condTeamId)
   } else if (hasUserId) q.$and.push(condUserId)
 
-  await applyModelGuard.call(this, { model, q, teamIds, options })
+  await applyModelGuard.call(this, { model, q, teamIds, options, allowEmpty })
   await applyAttribGuard.call(this, { model, teamIds, options })
+  if (q.$and.length === 0 && !allowEmpty) throw this.error('_emptyColumnQuery')
   filter.query = q
 }
 

package/extend/bajo/intl/en-US.json

@@ -173,7 +173,9 @@
     "hiddenCols": "Hidden Columns",
     "models": "Models",
     "siteIds": "Sites",
-    "allTeams": "All Teams?"
+    "allTeams": "All Teams?",
+    "condition": "Condition",
+    "hiddenFields": "Hide Fields"
   },
   "validation": {
     "password": {

package/extend/bajo/intl/id.json

@@ -179,7 +179,9 @@
     "hiddenCols": "Kolom Tersembunyi",
     "models": "Model",
     "siteIds": "Situs",
-    "allTeams": "Semua Tim?"
+    "allTeams": "Semua Tim?",
+    "condition": "Kondisi",
+    "hiddenFields": "Sembunyikan Kolom"
   },
   "validation": {
     "password": {

package/extend/dobo/model.js

@@ -76,11 +76,11 @@ async function model () {
       },
       'field,,50,true,true',
       {
-        name: 'behavior',
+        name: 'condition',
         type: 'string',
         maxLength: 20,
         required: true,
-        values: ['IN', 'NIN'],
+        values: ['IN', 'NIN', 'EQ', 'NE', 'GT', 'GTE', 'LT', 'LTE', 'BETWEEN'],
         default: 'IN'
       },
       'value,array,,,true',

package/index.js

@@ -174,8 +174,7 @@ async function factory (pkgName) {
     }
 
     init = async () => {
-      const { getPluginDataDir } = this.app.bajo
-      this.downloadDir = `${getPluginDataDir(this.ns)}/download`
+      this.downloadDir = `${this.app.getPluginDataDir(this.ns)}/download`
       this.app.lib.fs.ensureDirSync(this.downloadDir)
       if (this.config.multiSite === true) {
         this.config.multiSite = cloneDeep(defMultiSite)
@@ -526,9 +525,8 @@ async function factory (pkgName) {
     }
 
     pushDownload = async ({ description, worker, data, source, req, file, type }) => {
-      const { getPlugin } = this.app.bajo
-      const { createRecord } = getPlugin('waibuDb')
-      const { push } = getPlugin('bajoQueue')
+      const { createRecord } = this.app.getPlugin('waibuDb')
+      const { push } = this.app.getPlugin('bajoQueue')
       description = description ?? file
       const jobQueue = {
         worker,
@@ -638,13 +636,21 @@ async function factory (pkgName) {
     _getGuards = (inputs = []) => {
       const { routePath } = this.app.waibu
       const { orderBy } = this.app.lib._
-      const normal = orderBy(inputs.filter(input => input.path[0] !== '!').map(result => {
-        result.path = routePath(result.path)
-        return result
+      const normal = orderBy(inputs.filter(input => {
+        try {
+          input.path = routePath(input.path)
+        } catch (err) {
+          return false
+        }
+        return input.path[0] !== '!'
       }), ['weight', 'path'], ['desc', 'asc'])
-      const inverse = orderBy(inputs.filter(input => input.path[0] === '!').map(result => {
-        result.path = routePath(result.path)
-        return result
+      const inverse = orderBy(inputs.filter(input => {
+        try {
+          input.path = routePath(input.path)
+        } catch (err) {
+          return false
+        }
+        return input.path[0] === '!'
       }), ['weight', 'path'], ['desc', 'asc'])
       return [...normal, ...inverse]
     }
@@ -673,7 +679,7 @@ async function factory (pkgName) {
     getAttribGuards = async (reread) => {
       if (!reread) return this.attribGuards
 
-      this.attribGuards = await this._fetchGuards('Model')
+      this.attribGuards = await this._fetchGuards('Attrib')
       return this.attribGuards
     }
 

package/lib/create-new-site.js

@@ -1,7 +1,7 @@
 import path from 'path'
 
 export async function getAllFixtures (alias) {
-  const { getPluginDataDir, readConfig } = this.app.bajo
+  const { readConfig } = this.app.bajo
   const { isEmpty, omit, kebabCase, isString } = this.app.lib._
   const { getModel } = this.app.dobo
   const { fastGlob } = this.app.lib
@@ -17,7 +17,7 @@ export async function getAllFixtures (alias) {
   }
 
   const formats = this.app.configHandlers.map(item => item.ext.slice(1))
-  const overrideBase = `${getPluginDataDir('sumba')}/create-new-site-fixtures/${alias}`
+  const overrideBase = `${this.app.getPluginDataDir('sumba')}/create-new-site-fixtures/${alias}`
   const models = this.app.dobo.models.filter(m => {
     const prop = m.properties.find(p => p.name === 'siteId')
     return !!prop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.31.0",
+  "version": "2.32.0",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-06-12
+
+- [2.32.0] Necessary updates to ```bajo@2.18.0``` specs
+- [2.32.0] Bug fix in ```_getGuards()```
+- [2.32.0] Bug fix in ```getAttribGuards()```
+- [2.32.0] Bug fix in ```hooks.js```
+- [2.32.0] Change ```behavior``` to ```condition``` in ```SumbaModelGuard``` model
+
 ## 2026-06-11
 
 - [2.31.0] Add ```status``` field on ```SumbaTeamUser```