sumba 2.33.0 → 2.33.2

package/extend/bajo/hook.js

@@ -20,6 +20,22 @@ async function clearCacheUser (id, result) {
   await clear({ key: `dobo|SumbaUser|getUserByToken|${token}` })
 }
 
+function filterModelFromSetting ({ model, field, options }) {
+  const { isEmpty, isArray, set } = this.app.lib._
+  const { req } = options
+  const opValue = req.getSetting(`sumba:modelGuard.${field}`, {})
+  const results = []
+  for (const op of ['in', 'nin', 'inOrNull']) {
+    if (isEmpty(opValue[op]) || !isArray(opValue[op])) continue
+    if (op === 'inOrNull') {
+      const val = set({}, field, set({}, '$in', opValue[op]))
+      const nl = set({}, field, { $eq: null })
+      results.push({ $or: [val, nl] })
+    } else results.push(set({}, field, set({}, '$' + op, opValue[op])))
+  }
+  return { results, opValue }
+}
+
 async function applyModelGuard ({ model, q, teamIds, options }) {
   const { set, orderBy, isEmpty, isArray } = this.app.lib._
   const { includes } = this.app.lib.aneka
@@ -39,15 +55,8 @@ async function applyModelGuard ({ model, q, teamIds, options }) {
   const rules = orderBy(guards.filter(filterFn), ['field'])
   for (const field of fields) {
     if (!model.getNonVirtualProperties(true).includes(field)) continue // or, should it throws exception instead?
-    const opValue = req.getSetting(`sumba:modelGuard.${field}`, {})
-    for (const op of ['in', 'nin', 'inOrNull']) {
-      if (isEmpty(opValue[op]) || !isArray(opValue[op])) continue
-      if (op === 'inOrNull') {
-        const val = set({}, field, set({}, '$in', opValue[op]))
-        const nl = set({}, field, { $eq: null })
-        results.push({ $or: [val, nl] })
-      } else results.push(set({}, field, set({}, '$' + op, opValue[op])))
-    }
+    const inSetting = filterModelFromSetting.call(this, { model, field, options })
+    if (inSetting.results.length > 0) inSetting.results.push(...inSetting.results)
     const prop = model.getProperty(field)
     const items = rules.filter(item => item.field === field)
     for (const item of items) {
@@ -55,7 +64,7 @@ async function applyModelGuard ({ model, q, teamIds, options }) {
         return sanitizeByType(val, prop.type, { strict: true, inputFormat: 'string', model: model.name })
       })
       const op = item.condition.toLowerCase()
-      if (['in', 'nin'].includes(op) && !isEmpty(opValue[op]) && isArray(opValue[op])) values = values.filter(val => opValue[op].includes(val))
+      if (['in', 'nin'].includes(op) && !isEmpty(inSetting.opValue[op]) && isArray(inSetting.opValue[op])) values = values.filter(val => inSetting.opValue[op].includes(val))
       if (isEmpty(values)) continue
       let value
       if (['in', 'nin'].includes(op)) value = set({}, '$' + op, values)
@@ -89,7 +98,7 @@ export async function applyAttribGuard ({ model, teamIds, options }) {
 }
 
 async function rebuildFilter (model, filter = {}, options = {}) {
-  const { isEmpty, get } = this.app.lib._
+  const { isEmpty, get, keys } = this.app.lib._
   const { req } = options
   const allowEmpty = !get(this, `app.${model.ns}.config.sumba.noEmptyQuery`, []).includes(model.name)
   const hasSiteId = model.hasProperty('siteId')
@@ -97,7 +106,7 @@ async function rebuildFilter (model, filter = {}, options = {}) {
   const hasTeamId = model.hasProperty('teamId')
   const teams = get(req, 'user.teams', [])
   const teamIds = teams.map(team => team.id + '')
-  // const aliases = teams.map(team => team.alias)
+  const aliases = teams.map(team => team.alias)
   const q = { $and: [] }
 
   filter.query = filter.query ?? {}
@@ -110,12 +119,21 @@ async function rebuildFilter (model, filter = {}, options = {}) {
     return
   }
   if (hasSiteId) q.$and.push({ siteId: req.site.id + '' })
-  /*
   if (aliases.includes('administrator')) {
+    if (get(req, 'site.alias') === 'default') {
+      filter.query = q
+      return
+    }
+    const fields = keys(req.getSetting('sumba:modelGuard', {}))
+    const results = []
+    for (const field of fields) {
+      const inSetting = filterModelFromSetting.call(this, { model, field, options })
+      if (inSetting.results.length > 0) results.push(...inSetting.results)
+    }
+    if (results.length > 0) q.$and.push(...results)
     filter.query = q
     return
   }
-  */
   if (isEmpty(req.user)) {
     if (q.$and.length === 0 && !allowEmpty) throw this.error('_emptyColumnQuery')
     filter.query = q

package/extend/dobo/feature/country.js

@@ -7,7 +7,7 @@ async function country (opts = {}) {
       type: 'string',
       maxLength: 2,
       index: opts.index ?? true,
-      required: opts.required,
+      required: opts.required ?? true,
       values: 'sumba:getCountriesValues',
       rules: opts.enforceRule ? ['uppercase', { rule: 'length', params: 2 }] : [],
       rulesMsg: opts.enforceRule ? { 'any.only': 'validCountryCodeRequired' } : undefined

package/extend/waibuMpa/route/help/trouble-tickets/details/@id.js

@@ -29,7 +29,7 @@ const id = {
     schema.view.format = {
       createdAt: async function (val, rec) {
         const message = this.app.bajoMarkdown ? this.app.bajoMarkdown.parseContent(rec.message) : rec.message
-        const isMe = rec.userId === req.user.id
+        const isMe = rec.userId === req.user.id + ''
         const sentence = `<c:div margin="bottom-3"><c:badge background="color:${isMe ? 'primary' : 'secondary'}" t:content="${isMe ? 'you' : 'us'}" /> <small>${req.format(val, 'datetime')}</small></c:div>`
         return (await this.component.buildSentence(sentence)) + message
       }

package/index.js

@@ -745,7 +745,6 @@ async function factory (pkgName) {
       const { merge, isEmpty, camelCase, get } = this.app.lib._
       const { routePath } = this.app.waibu
       const userId = get(req, 'session.userId')
-
       const setUser = async () => {
         if (!userId) return
         try {
@@ -806,7 +805,8 @@ async function factory (pkgName) {
     checkXSite = async (req, reply) => {
       const { get } = this.app.lib._
       if (!this.config.multiSite.enabled) return
-      if (!get(req, 'routeOptions.config.xSite')) return
+      const config = get(req, 'routeOptions.config')
+      if (!get(config, 'xSite') || ['/dashboard'].includes(config.pathSrc)) return
       if (!get(req, 'user.isXSiteAdmin')) throw this.error('accessDenied', { statusCode: 403 })
     }
 

package/lib/get-site.js

@@ -23,7 +23,7 @@ async function getSite (input, byId = false) {
     }
     site.setting = defaultsDeep({}, nsSetting, defSetting)
     // additional fields
-    const country = await this.app.dobo.getModel('CdbCountry').getRecord(site.country, { noHook: true })
+    const country = await this.app.dobo.getModel('CdbCountry').getRecord(site.country, { noMagic: true })
     site.countryName = (country ?? {}).name ?? site.country
   }
 

package/lib/get-user.js

@@ -2,12 +2,14 @@ export async function mergeTeam (user, req) {
   const { map, pick } = this.app.lib._
   const { getModel } = this.app.dobo
   user.teams = []
-  const query = { userId: user.id, siteId: user.siteId, status: 'ACTIVE' }
+  const query = { userId: user.id + '', siteId: user.siteId, status: 'ACTIVE' }
   let mdl = getModel('SumbaTeamUser')
   const userTeam = await mdl.findAllRecord({ query })
   if (userTeam.length === 0) return
   delete query.userId
-  query.id = { $in: map(userTeam, 'teamId') }
+  const idProp = mdl.getProperty('id')
+  const $in = userTeam.map(item => ['integer', 'smallint'].includes(idProp.type) ? parseInt(item.teamId) : item.teamId)
+  query.id = { $in }
   mdl = getModel('SumbaTeam')
   const teams = await mdl.findAllRecord({ query })
   if (teams.length > 0) {

package/package.json

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

package/wiki/CHANGES.md

@@ -1,10 +1,16 @@
 # Changes
 
+## 2026-06-18
+
+- [2.33.2] Bug fix in ```hook.js```
+
 ## 2026-06-17
 
 - [2.33.0] Add ```Site Setting``` in ```Cross-Site```
 - [2.33.0] Bug fix in ```hook.js```
-- [2.33.0] Bug fix in ```feature:siteId```
+- [2.33.0] Bug fix in ```sumba:siteId``` feature
+- [2.33.1] Bug fix in ```checkUser()```,  ```checkTeam()``` & ```checkXSite()```
+- [2.33.1] Bug fix in ```sumba:country``` feature
 
 ## 2026-06-15