sumba 2.8.0 → 2.9.0

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

@@ -1,19 +1,30 @@
 const useAdmin = ['waibuAdmin']
 
 export async function rebuildFilter (modelName, filter, req) {
-  const { isEmpty, map, find, get } = this.app.lib._
+  const { isEmpty, isPlainObject, map, find, get } = this.app.lib._
   filter.query = filter.query ?? {}
+
+  const queryByModel = (query) => {
+    // by model
+    const setting = get(req, `site.setting.dobo.query.${modelName}`)
+    if (isPlainObject(setting) && !isEmpty(setting)) query.$and.push(setting)
+    return query
+  }
+
   const model = this.app.dobo.getModel(modelName)
   const hasSiteId = model.hasProperty('siteId')
   const hasUserId = model.hasProperty('userId')
   const hasTeamId = model.hasProperty('teamId')
   const isAdmin = find(get(req, 'user.teams', []), { alias: 'administrator' }) && useAdmin.includes(get(req, 'routeOptions.config.ns'))
-  if (!(hasSiteId || hasUserId || hasTeamId)) return filter
   const q = { $and: [] }
   if (!isEmpty(filter.query)) {
     if (filter.query.$and) q.$and.push(...filter.query.$and)
     else q.$and.push(filter.query)
   }
+  if (!(hasSiteId || hasUserId || hasTeamId)) {
+    filter.query = queryByModel(q)
+    return filter
+  }
   if (hasSiteId) q.$and.push({ siteId: req.site.id })
   if (hasTeamId && !isAdmin) {
     const teamIds = map(req.user.teams, 'id')
@@ -22,7 +33,7 @@ export async function rebuildFilter (modelName, filter, req) {
   } else if (!isAdmin) {
     if (hasUserId) q.$and.push({ userId: req.user.id })
   }
-  filter.query = q
+  filter.query = queryByModel(q)
   return filter
 }
 

package/extend/dobo/model/site.json

@@ -29,8 +29,16 @@
     "maxLength": 100,
     "rules": ["email"]
   }],
-  "features": ["sumba:personInCharge", "sumba:address", "sumba:social", {
-    "name": "sumba:status",
-    "default": "ACTIVE"
-  }, "dobo:createdAt", "dobo:updatedAt", "dobo:immutable"]
+  "features": [
+    "sumba:personInCharge",
+    "sumba:address",
+    "sumba:social",
+    {
+      "name": "sumba:status",
+      "default": "ACTIVE"
+    },
+    "dobo:createdAt",
+    "dobo:updatedAt",
+    "dobo:immutable"
+  ]
 }

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

@@ -1,4 +1,5 @@
 {
+  "buildLevel": 4,
   "properties": [{
     "name": "teamId",
     "type": "string",

package/extend/dobo/model/team.json

@@ -1,4 +1,5 @@
 {
+  "buildLevel": 3,
   "properties": [
     "alias,,20,,true",
     "name,,50,true,true"

package/extend/masohiSocketIo/middleware/server/auth.js

@@ -4,7 +4,7 @@ const auth = {
     const { camelCase } = this.app.lib._
     const { req } = socket
     const { session } = req
-    const site = await this.getSite(session.siteId)
+    const site = await this.getSite(session.siteId, true)
     socket.join(camelCase(`site ${site.alias}`))
     let user
     if (session.userId) {

package/index.js

@@ -20,7 +20,10 @@ async function factory (pkgName) {
     constructor () {
       super(pkgName, me.app)
       this.config = {
-        multiSite: false,
+        multiSite: {
+          enabled: false,
+          catchAll: 'default'
+        },
         waibu: {
           title: 'site',
           prefix: 'site'
@@ -445,7 +448,8 @@ async function factory (pkgName) {
 
       let site = {}
 
-      if (!this.config.multiSite) {
+      const multiSite = this.config.multiSite === true ? { enabled: true, catchAll: 'default' } : this.config.multiSite
+      if (!multiSite.enabled) {
         const resp = await this.app.dobo.getModel('SumbaSite').findOneRecord({ query: { alias: 'default' } }, { noHook: true })
         site = omit(resp, omitted)
         await mergeSetting(site)
@@ -453,16 +457,15 @@ async function factory (pkgName) {
       }
       let query
       if (useId) query = { id: hostname }
-      else {
-        query = {
-          $or: [
-            { hostname },
-            { alias: hostname }
-          ]
+      else query = { hostname }
+      let row = await this.app.dobo.getModel('SumbaSite').findOneRecord({ query }, { noHook: true })
+      if (!row) {
+        if (multiSite.catchAll) {
+          query = { alias: multiSite.catchAll === true ? 'default' : multiSite.catchAll }
+          row = await this.app.dobo.getModel('SumbaSite').findOneRecord({ query }, { noHook: true })
         }
+        if (!row) throw this.error('unknownSite')
       }
-      const row = await this.app.dobo.getModel('SumbaSite').findOneRecord({ query }, { noHook: true })
-      if (!row) throw this.error('unknownSite')
       if (row.status !== 'ACTIVE') throw this.error('siteInactiveInfo')
       site = omit(row, omitted)
       await mergeSetting(site)

package/lib/create-new-site.js

@@ -72,6 +72,10 @@ async function createNewSite (alias, hostname, verbose) {
       const fixtures = data[m]
       for (const f of fixtures) {
         f.siteId = newSite.id + ''
+        for (const key in f) {
+          const val = f[key]
+          if (isString(val) && val.slice(0, 2) === '?:') f[key] = await mdl._simpleLookup(val.slice(2), options)
+        }
         await mdl.createRecord(f, options)
       }
       if (verbose) this.print.succeed('writingModel%s%s', mdl.name, fixtures.length)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,10 +1,16 @@
 # Changes
 
+## 2026-03-12
+
+- [2.9.0] Add ability to restrict/filter dobo's records through site setting
+- [2.9.0] Multisite config now accept object. If set to ```true``` it defaults to ```catchAll: 'default'```
+
 ## 2026-03-11
 
 - [2.8.0] Add ```createNewSite()``` and ```applet.crateNewSite```
 - [2.8.0] Add ```removeSite()``` and ```applet.removeSite```
 - [2.8.0] Set ```site.json```, ```user.json```, ```team.json```, ```team-user.json``` first fixture as immutable row
+- [2.8.1] Bug fix in ```createNewSite()```
 
 ## 2026-03-08