sumba 2.25.0 → 2.25.1

package/extend/bajo/hook/dobo@before-driver-find-all-record.js

@@ -1,13 +1,8 @@
-import { rebuildFilter } from './dobo@before-driver-find-record.js'
+import { handler } from './dobo@before-driver-find-record.js'
 
 const doboBeforeDriverFindAllRecord = {
   level: 1000,
-  handler: async function (model, filter, options) {
-    const { req } = options
-    const { isEmpty } = this.app.lib._
-    if (options.noAutoFilter || !req || isEmpty(req.site)) return
-    await rebuildFilter.call(this, model, filter, options)
-  }
+  handler
 }
 
 export default doboBeforeDriverFindAllRecord

package/extend/bajo/hook/dobo@before-driver-find-record.js

@@ -89,11 +89,29 @@ export async function rebuildFilter (model, filter = {}, options = {}) {
     filter.query = q
     return
   }
+  if (!req.user) {
+    filter.query = q
+    return
+  }
+
+  const condUserId = {
+    $or: [
+      { userId: req.user.id + '' },
+      { userId: { $eq: null } }
+    ]
+  }
+
+  const condTeamId = {
+    $or: [
+      { teamId: { $in: teamIds } },
+      { teamId: { $eq: null } }
+    ]
+  }
 
   if (hasTeamId) {
-    if (hasUserId) q.$and.push({ $or: [{ teamId: { $in: teamIds } }, { userId: req.user.id + '' }] })
-    else q.$and.push({ teamId: { $in: teamIds } })
-  } else if (hasUserId) q.$and.push({ userId: req.user.id + '' })
+    if (hasUserId) q.$and.push({ $or: [condTeamId, condUserId] })
+    else q.$and.push(condTeamId)
+  } else if (hasUserId) q.$and.push(condUserId)
 
   await applyModelGuard.call(this, { model, q, teamIds, options })
   await applyAttribGuard.call(this, { model, teamIds, options })
@@ -102,7 +120,8 @@ export async function rebuildFilter (model, filter = {}, options = {}) {
 
 export async function handler (model, filter, options = {}) {
   const { isEmpty } = this.app.lib._
-  if (options.noAutoFilter || !options.req || isEmpty((options.req ?? {}).site)) return
+  const { req = {} } = options
+  if (options.noAutoFilter || isEmpty(req) || isEmpty(req.site)) return
   await rebuildFilter.call(this, model, filter, options)
 }
 

package/extend/bajo/hook/dobo@before-driver-get-record.js

@@ -1,9 +1,10 @@
 import { rebuildFilter } from './dobo@before-driver-find-record.js'
 
 export async function checker (model, id, options = {}) {
-  const { req } = options
+  const { isEmpty } = this.app.lib._
+  const { req = {} } = options
+  if (options.noAutoFilter || isEmpty(req) || isEmpty(req.site)) return
 
-  if (options.noAutoFilter || !req) return
   const filter = {}
   await rebuildFilter.call(this, model, filter, options)
   if (filter.query.$and) filter.query.$and.push({ id })

package/extend/dobo/fixture/team-user.json

@@ -1,6 +1,6 @@
 [{
-  "userId": "?:SumbaUser::username:admin",
-  "teamId": "?:SumbaTeam::alias:administrator",
   "siteId": "?:SumbaSite::alias:default",
+  "userId": "?:SumbaUser::username:admin+siteId={siteId}",
+  "teamId": "?:SumbaTeam::alias:administrator+siteId={siteId}",
   "_immutable": true
 }]

package/extend/dobo/model/team-user.json

@@ -8,9 +8,9 @@
   "features": [
     "dobo:createdAt",
     "dobo:updatedAt",
-    "sumba:teamId",
     "sumba:siteId",
     "sumba:userId",
+    "sumba:teamId",
     "dobo:immutable"
   ]
 }

package/index.js

@@ -32,7 +32,7 @@ async function factory (pkgName) {
       super(pkgName, me.app)
       this.config = {
         multiSite: cloneDeep(defMultiSite),
-        crossSiteAdmins: [], // format: "<siteAlias>:<username>"
+        xSiteAdmins: [], // format: "<siteAlias>:<username>"
         waibu: {
           title: 'site',
           prefix: 'site'
@@ -175,10 +175,10 @@ async function factory (pkgName) {
 
     start = async () => {
       const { getModel } = this.app.dobo
-      if (this.config.crossSiteAdmins.length === 0) {
+      if (this.config.xSiteAdmins.length === 0) {
         const site = await getModel('SumbaSite').findOneRecord({ query: { alias: 'default' } }, { noMagic: true })
         const user = await getModel('SumbaUser').findOneRecord({ query: { username: 'admin', siteId: site.id } }, { noMagic: true })
-        this.config.crossSiteAdmins.push(`${site.alias}:${user.username}`)
+        this.config.xSiteAdmins.push(`${site.alias}:${user.username}`)
       }
     }
 
@@ -556,7 +556,7 @@ async function factory (pkgName) {
 
     getRouteGuards = async (reread) => {
       const { routePath } = this.app.waibu
-      const { map, orderBy } = this.app.lib._
+      const { orderBy } = this.app.lib._
       const { isSet } = this.app.lib.aneka
       if (!reread) return this.routeGuards
 
@@ -571,9 +571,13 @@ async function factory (pkgName) {
           delete item.siteId
           return item
         })
-        this.routeGuards[type] = orderBy(map(result[type], item => {
-          item.path = routePath(item.path)
-          return item
+        this.routeGuards[type] = orderBy(result[type].filter(item => {
+          try {
+            item.path = routePath(item.path)
+            return true
+          } catch (err) {
+            return false
+          }
         }), ['weight', 'path'], ['desc', 'asc'])
       }
       return this.routeGuards

package/lib/get-user.js

@@ -30,7 +30,7 @@ export async function mergeTeam (user, req) {
       user.teams.push(item)
     }
   }
-  user.isXSiteAdmin = this.config.crossSiteAdmins.includes(`${req.site.alias}:${user.username}`)
+  user.isXSiteAdmin = this.config.xSiteAdmins.includes(`${req.site.alias}:${user.username}`)
   user.isAdmin = user.teams.some(t => t.alias === 'administrator')
   for (const field of this.unsafeUserFields) {
     delete user[field]

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 2026-05-25
+
+- [2.25.1] Bug fix in several places because name changing ```crossSiteAdmins``` to ```xSiteAdmins```
+
 ## 2026-05-22
 
 - [2.25.0] Reorganize admin menu layout & order