sumba 2.10.0 → 2.11.1

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

@@ -4,11 +4,22 @@ export async function rebuildFilter (modelName, filter, req) {
   const { isEmpty, isPlainObject, map, find, get } = this.app.lib._
   filter.query = filter.query ?? {}
 
-  const queryByModel = (query) => {
-    // by model
+  const queryBySiteSetting = (query) => {
+    if (!req.site) return
     const setting = get(req, `site.setting.dobo.query.${modelName}`)
     if (isPlainObject(setting) && !isEmpty(setting)) query.$and.push(setting)
-    return query
+  }
+
+  const queryByTeamSetting = (query) => {
+    if (!req.user) return
+    const q = []
+    for (const team of req.user.teams) {
+      const item = get(team, `setting.dobo.query.${modelName}`)
+      if (item) q.push(item)
+    }
+    if (isEmpty(q)) return
+    if (q.length === 1) query.$and.push(q[0])
+    else query.$and.push({ $or: q })
   }
 
   const model = this.app.dobo.getModel(modelName)
@@ -17,14 +28,12 @@ export async function rebuildFilter (modelName, filter, req) {
   const hasTeamId = model.hasProperty('teamId')
   const isAdmin = find(get(req, 'user.teams', []), { alias: 'administrator' }) && useAdmin.includes(get(req, 'routeOptions.config.ns'))
   const q = { $and: [] }
+  queryBySiteSetting(q)
+  queryByTeamSetting(q)
   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')
@@ -33,14 +42,13 @@ export async function rebuildFilter (modelName, filter, req) {
   } else if (!isAdmin) {
     if (hasUserId) q.$and.push({ userId: req.user.id })
   }
-  filter.query = queryByModel(q)
-  return filter
+  filter.query = q
 }
 
 export async function handler (modelName, filter, options = {}) {
   const { req } = options
   if (options.noAutoFilter || !req) return
-  filter = await rebuildFilter.call(this, modelName, filter, req)
+  await rebuildFilter.call(this, modelName, filter, req)
 }
 
 const doboBeforeFindRecord = {

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

@@ -5,7 +5,8 @@ export async function checker (modelName, id, options = {}) {
 
   const model = this.app.dobo.getModel(modelName)
   if (options.noAutoFilter || !req) return
-  const filter = await rebuildFilter.call(this, modelName, {}, req)
+  const filter = {}
+  await rebuildFilter.call(this, modelName, filter, req)
   if (filter.query.$and) filter.query.$and.push({ id })
   else filter.query.id = id
   filter.limit = 1

package/extend/bajo/hook/waibu@pre-parsing.js

@@ -1,8 +1,7 @@
 const preParsing = {
   level: 10,
   handler: async function (req, reply) {
-    const { getHostname } = this.app.waibu
-    req.site = await this.getSite(getHostname(req))
+    req.site = await this.getSite(req)
   }
 }
 

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

@@ -100,6 +100,7 @@
   "manageUser": "Manage User",
   "manageTeam": "Manage Team",
   "manageTeamUser": "Manage Team Member",
+  "manageTeamSetting": "Manage Team Setting",
   "resetUserPassword": "Reset User Password",
   "unknownUser": "User Unknown/Invalid",
   "socialMedia": "Social Media",

package/extend/bajo/intl/id.json

@@ -101,6 +101,7 @@
   "manageUser": "Kelola Pengguna",
   "manageTeam": "Kelola Tim",
   "manageTeamUser": "Kelola Anggota Tim",
+  "manageTeamSetting": "Kelola Setelan Tim",
   "resetUserPassword": "Reset Kata Sandi Pengguna",
   "unknownUser": "Pengguna Tidak Dikenal/Tidak Valid",
   "socialMedia": "Media Sosial",

package/extend/dobo/feature/team-id.js

@@ -4,11 +4,19 @@ async function teamId (opts = {}) {
       name: 'teamId',
       type: 'string',
       maxLength: 50,
+      required: true,
       ref: {
         site: {
           model: 'SumbaSite',
           propName: 'id',
-          type: '1:1'
+          type: '1:1',
+          fields: ['id', 'alias', 'hostname', 'title']
+        },
+        team: {
+          model: 'SumbaTeam',
+          propName: 'id',
+          type: '1:1',
+          fields: ['id', 'name']
         }
       },
       index: true

package/extend/dobo/model/site.json

@@ -3,14 +3,15 @@
   "properties": [{
     "name": "hostname",
     "type": "string",
-    "minLength": 5,
     "maxLength": 100,
+    "required": true,
     "index": "unique"
   }, {
     "name": "alias",
     "type": "string",
     "maxLength": 100,
     "index": "unique",
+    "required": true,
     "immutable": true
   }, {
     "name": "title",
@@ -20,7 +21,6 @@
   }, {
     "name": "orgName",
     "type": "string",
-    "minLength": 5,
     "maxLength": 100,
     "index": true
   }, {

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

@@ -0,0 +1,17 @@
+{
+  "buildLevel": 5,
+  "properties": [
+    "ns,,50,true,true",
+    "key,,255,true,true",
+    "value,text"
+  ],
+  "indexes": [{
+    "fields": ["ns", "key", "siteId", "teamId"],
+    "type": "unique"
+  }],
+  "features": [
+    "sumba:siteId",
+    "dobo:updatedAt",
+    "sumba:teamId"
+  ]
+}

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

@@ -1,19 +1,6 @@
 {
   "buildLevel": 4,
-  "properties": [{
-    "name": "teamId",
-    "type": "string",
-    "maxLength": 50,
-    "required": true,
-    "ref": {
-      "team": {
-        "model": "SumbaTeam",
-        "propName": "id",
-        "type": "1:1",
-        "fields": ["id", "name"]
-      }
-    }
-  }],
+  "properties": [],
   "indexes": [{
     "fields": ["userId", "siteId", "teamId"],
     "type": "unique"
@@ -21,6 +8,7 @@
   "features": [
     "dobo:createdAt",
     "dobo:updatedAt",
+    "sumba:teamId",
     "sumba:siteId",
     "sumba:userId",
     "dobo:immutable"

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

@@ -11,7 +11,6 @@ const auth = {
       user = await this.getUser(session.userId)
       if (user) {
         socket.join(camelCase(`user ${user.username}`))
-        await this.mergeTeam(user, site)
         for (const team of user.teams) {
           socket.join(camelCase(`team ${team.alias}`))
         }

package/extend/waibuDb/schema/team-setting.js

@@ -0,0 +1,51 @@
+async function teamUser () {
+  return {
+    common: {
+      layout: [
+        { name: 'meta', fields: ['id', 'teamId', 'createdAt', 'updatedAt'] },
+        { name: 'general', fields: ['ns', 'key', 'value'] }
+      ],
+      calcFields: [
+        { name: 'team', type: 'string' }
+      ],
+      valueFormatter: {
+        team: (val, rec) => {
+          return rec._ref.team.name
+        }
+      },
+      widget: {
+        teamId: {
+          component: 'form-select-ext',
+          attr: {
+            remoteUrl: 'sumba.restapi:/manage/team',
+            remoteSearchField: 'name',
+            remoteLabelField: 'name',
+            remoteApiKey: true,
+            ref: 'team:name'
+          }
+        }
+      }
+    },
+    view: {
+      list: {
+        fields: ['team', 'ns', 'key', 'value', 'createdAt', 'updatedAt'],
+        stat: {
+          aggregate: [
+            { fields: ['userId'], group: 'userId', aggregate: ['count'] },
+            { fields: ['teamId'], group: 'teamId', aggregate: ['count'] }
+          ]
+        }
+      },
+      details: {
+      },
+      add: {
+        hidden: ['id', 'createdAt', 'updatedAt']
+      },
+      edit: {
+        readonly: ['id', 'createdAt', 'updatedAt']
+      }
+    }
+  }
+}
+
+export default teamUser

package/extend/waibuDb/schema/team-user.js

@@ -25,7 +25,7 @@ async function teamUser () {
             remoteSearchField: 'username',
             remoteLabelField: 'username',
             remoteApiKey: true,
-            rel: 'user:username'
+            ref: 'user:username'
           }
         },
         teamId: {
@@ -35,7 +35,7 @@ async function teamUser () {
             remoteSearchField: 'name',
             remoteLabelField: 'name',
             remoteApiKey: true,
-            rel: 'team:name'
+            ref: 'team:name'
           }
         }
       }

package/extend/waibuMpa/extend/waibuAdmin/route/team-setting/@action.js

@@ -0,0 +1,11 @@
+const action = {
+  method: ['GET', 'POST'],
+  title: 'manageTeamSetting',
+  handler: async function (req, reply) {
+    const { importModule } = this.app.bajo
+    const crudSkel = await importModule('waibuAdmin:/lib/crud-skel.js')
+    return await crudSkel.call(this, 'SumbaTeamSetting', req, reply)
+  }
+}
+
+export default action

package/index.js

@@ -2,6 +2,7 @@ import path from 'path'
 import createNewSite from './lib/create-new-site.js'
 import removeSite from './lib/remove-site.js'
 import getSite from './lib/get-site.js'
+import getUser from './lib/get-user.js'
 
 /**
  * Plugin factory
@@ -11,6 +12,7 @@ import getSite from './lib/get-site.js'
  */
 async function factory (pkgName) {
   const me = this
+  const { getModel } = this.app.dobo
 
   /**
    * Sumba class
@@ -133,7 +135,7 @@ async function factory (pkgName) {
         }
       }
       this.unsafeUserFields = ['password']
-      this.selfBind(['createNewSite', 'removeSite', 'getSite'])
+      this.selfBind(['createNewSite', 'removeSite', 'getSite', 'getUser'])
     }
 
     init = async () => {
@@ -188,6 +190,7 @@ async function factory (pkgName) {
           { title: 'manageUser', href: `waibuAdmin:/${prefix}/user/list` },
           { title: 'manageTeam', href: `waibuAdmin:/${prefix}/team/list` },
           { title: 'manageTeamUser', href: `waibuAdmin:/${prefix}/team-user/list` },
+          { title: 'manageTeamSetting', href: `waibuAdmin:/${prefix}/team-setting/list` },
           { title: 'manageDownload', href: `waibuAdmin:/${prefix}/download/list` },
           { title: '-' },
           { title: 'siteSetting', href: `waibuAdmin:/${prefix}/site-setting/list` },
@@ -201,37 +204,9 @@ async function factory (pkgName) {
       }]
     }
 
-    getUser = async (rec, safe = true) => {
-      const { omit, isPlainObject } = this.app.lib._
-      let user
-      if (isPlainObject(rec)) user = rec
-      else {
-        const mdl = this.app.dobo.getModel('SumbaUser')
-        user = await mdl.getRecord(rec, { noHook: true, throwNotFound: false })
-      }
-      if (!user) return null
-      return safe ? omit(user, this.unsafeUserFields) : user
-    }
-
-    mergeTeam = async (user, site) => {
-      if (!user) return
-      const { map, pick } = this.app.lib._
-      user.teams = []
-      const query = { userId: user.id, siteId: site.id }
-      let mdl = this.app.dobo.getModel('SumbaTeamUser')
-      const userTeam = await mdl.findAllRecord({ query })
-      if (userTeam.length === 0) return
-      delete query.userId
-      query.id = { $in: map(userTeam, 'teamId') }
-      query.status = 'ENABLED'
-      mdl = this.app.dobo.getModel('SumbaTeam')
-      const team = await mdl.findAllRecord({ query })
-      if (team.length > 0) user.teams.push(...map(team, t => pick(t, ['id', 'alias'])))
-    }
-
     getUserFromUsernamePassword = async (username = '', password = '', req) => {
       const { importPkg } = this.app.bajo
-      const model = this.app.dobo.getModel('SumbaUser')
+      const model = getModel('SumbaUser')
       await model.validate({ username, password }, null, { partial: true, ns: ['sumba', 'dobo'], fields: ['username', 'password'] })
       const bcrypt = await importPkg('bajoExtra:bcrypt')
 
@@ -287,7 +262,7 @@ async function factory (pkgName) {
       if (!isMd5(token)) return false
       token = await hash(token)
       const query = { token }
-      const rows = await this.app.dobo.getModel('SumbaUser').findRecord({ query }, { req, noHook: true })
+      const rows = await getModel('SumbaUser').findRecord({ query }, { req, noHook: true })
       if (rows.length === 0) throw this.error('invalidKey', merge({ statusCode: 401 }, payload))
       if (rows[0].status !== 'ACTIVE') throw this.error('userInactive', merge({ details: [{ field: 'status', error: 'inactive' }], statusCode: 401 }, payload))
       req.user = await getUser(rows[0])
@@ -353,7 +328,7 @@ async function factory (pkgName) {
       const decoded = await verifier(token)
       const id = decoded.payload.uid
       try {
-        const rec = await this.app.dobo.getModel('SumbaUser').getRecord(id, { req, noHook: true })
+        const rec = await getModel('SumbaUser').getRecord(id, { req, noHook: true })
         if (!rec) throw this.error('invalidToken', { statusCode: 401 })
         if (rec.status !== 'ACTIVE') throw this.error('userInactive', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
         req.user = await getUser(rec)
@@ -472,7 +447,7 @@ async function factory (pkgName) {
     getApiKeyFromUserId = async id => {
       const { hash } = this.app.bajoExtra
       const options = { forceNoHidden: true, noHook: true, noCache: true, attachment: true, mimeType: true }
-      const resp = await this.app.dobo.getModel('SumbaUser').getRecord(id, options)
+      const resp = await getModel('SumbaUser').getRecord(id, options)
       return await hash(resp.salt)
     }
 
@@ -519,6 +494,7 @@ async function factory (pkgName) {
     createNewSite = createNewSite
     removeSite = removeSite
     getSite = getSite
+    getUser = getUser
   }
 
   return Sumba

package/lib/check-team.js

@@ -3,7 +3,6 @@ import { pathsToCheck } from './check-user-id.js'
 async function checkTeam (req, reply, source) {
   if (!req.user) return
   const { map } = this.app.lib._
-  await this.mergeTeam(req.user, req.site)
   const paths = pathsToCheck.call(this, req, true)
   const teams = map(req.user.teams, 'alias')
   const match = this.checkPathsByTeam({ paths, method: req.method, teams, guards: this.teamRoutes })

package/lib/get-site.js

@@ -1,11 +1,15 @@
-async function getSite (hostname, useId) {
-  const { omit } = this.app.lib._
+import { parseNsSettings } from './util.js'
+
+async function getSite (req) {
+  const { runHook } = this.app.bajo
+  const { omit, isPlainObject } = this.app.lib._
+  const { getHostname } = this.app.waibu
   const omitted = ['status']
 
+  await runHook(`${this.ns}:beforeGetSite`, req)
   const mergeSetting = async (site) => {
     const { defaultsDeep, isSet } = this.app.lib.aneka
-    const { parseObject, dayjs } = this.app.lib
-    const { isEmpty, trim, get, filter, set, isPlainObject, isArray } = this.app.lib._
+    const { get, filter } = this.app.lib._
     const defSetting = {}
     const nsSetting = {}
     const names = this.app.getAllNs()
@@ -18,27 +22,13 @@ async function getSite (hostname, useId) {
       const item = get(this, `app.${ns}.config.siteSetting`)
       if (isSet(item)) defSetting[ns] = item
       const items = filter(all, { ns })
-      for (const item of items) {
-        let value = trim([item.value] ?? '')
-        if (['[', '{'].includes(value[0])) {
-          try {
-            value = parseObject(JSON.parse(value))
-          } catch (err) {}
-        } else if (Number(value)) value = Number(value)
-        else if (['true', 'false'].includes(value)) value = value === 'true'
-        else if (item.key.endsWith('$in')) value = value.split(',').map(v => v.trim())
-        else {
-          const dt = dayjs(value)
-          if (dt.isValid()) value = dt.toDate()
-        }
-        if ((isPlainObject(value) || isArray(value)) && isEmpty(value)) continue
-        set(nsSetting, `${ns}.${item.key}`, value)
-      }
+      parseNsSettings.call(this, ns, nsSetting, items)
     }
     site.setting = defaultsDeep({}, nsSetting, defSetting)
     // additional fields
     const country = await this.app.dobo.getModel('CdbCountry').getRecord(site.country, { noHook: true })
     site.countryName = (country ?? {}).name ?? site.country
+    await runHook(`${this.ns}:afterGetSite`, req, site)
   }
 
   let site = {}
@@ -51,8 +41,8 @@ async function getSite (hostname, useId) {
     return site
   }
   let query
-  if (useId) query = { id: hostname }
-  else query = { hostname }
+  if (!isPlainObject(req)) query = { id: req }
+  else query = { hostname: getHostname(req) }
   let row = await this.app.dobo.getModel('SumbaSite').findOneRecord({ query }, { noHook: true })
   if (!row) {
     if (multiSite.catchAll) {

package/lib/get-user.js

@@ -0,0 +1,50 @@
+import { parseNsSettings } from './util.js'
+
+async function getUser (rec, safe = true) {
+  const { runHook } = this.app.bajo
+  const { map, pick, omit, isPlainObject } = this.app.lib._
+  const { getModel } = this.app.dobo
+  await runHook(`${this.ns}:beforeGetUser`, rec, safe)
+  let user
+  if (!isPlainObject(rec)) {
+    const mdl = getModel('SumbaUser')
+    user = await mdl.getRecord(rec, { noHook: true, throwNotFound: false })
+  } else {
+    user = rec
+  }
+  if (!user) return null
+  // merge teams
+  user.teams = []
+  const query = { userId: user.id, siteId: user.siteId }
+  let mdl = getModel('SumbaTeamUser')
+  const userTeam = await mdl.findAllRecord({ query })
+  if (userTeam.length === 0) return
+  delete query.userId
+  query.id = { $in: map(userTeam, 'teamId') }
+  query.status = 'ENABLED'
+  mdl = getModel('SumbaTeam')
+  const teams = await mdl.findAllRecord({ query })
+  if (teams.length > 0) {
+    // setting
+    delete query.id
+    delete query.status
+    query.siteId = user.siteId
+    query.teamId = { $in: teams.map(t => t.id + '') }
+    mdl = getModel('SumbaTeamSetting')
+    const items = await mdl.findAllRecord({ query })
+    for (const team of teams) {
+      const names = map(items, 'ns')
+      const item = pick(team, ['id', 'alias'])
+      item.setting = {}
+      for (const ns of names) {
+        parseNsSettings.call(this, ns, item.setting, items.filter(s => s.teamId === (team.id + '')))
+      }
+      user.teams.push(item)
+    }
+  }
+  user = safe ? omit(user, this.unsafeUserFields) : user
+  await runHook(`${this.ns}:afterGetUser`, rec, safe, user)
+  return user
+}
+
+export default getUser

package/lib/util.js

@@ -0,0 +1,27 @@
+export function parseNsSettings (ns, setting, items) {
+  const { trim, set, isPlainObject, isArray, isEmpty, find } = this.app.lib._
+  const { parseObject, dayjs } = this.app.lib
+
+  for (const item of items) {
+    if (item.ns === '_var' || ns === '_var') continue
+    let value = trim([item.value] ?? '')
+    if (value[0] === '#' && value[value.length - 1] === '#') {
+      const val = value.slice(1, -1)
+      const newValue = find(items, { ns: '_var', key: val })
+      if (newValue) value = newValue.value
+    }
+    if (['[', '{'].includes(value[0]) && [']', '}'].includes(value[value.length - 1])) {
+      try {
+        value = parseObject(JSON.parse(value))
+      } catch (err) {}
+    } else if (Number(value)) value = Number(value)
+    else if (['true', 'false'].includes(value)) value = value === 'true'
+    else if (item.key.endsWith('$in')) value = value.split(',').map(v => v.trim())
+    else {
+      const dt = dayjs(value)
+      if (dt.isValid()) value = dt.toDate()
+    }
+    if ((isPlainObject(value) || isArray(value)) && isEmpty(value)) continue
+    set(setting, `${ns}.${item.key}`, value)
+  }
+}

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-03-22
+
+- [2.11.0] Add ```Team Setting``` feature
+- [2.11.0] Rewrite ```getUser()```
+- [2.11.0] Rewrite ```getSite()```
+- [2.11.0] Bug fix in model reference not displayed correctly on ```Details View```
+- [2.11.1] Bug fix in ```parseNsSetting()```
+
 ## 2026-03-13
 
 - [2.10.0] ```getSite()``` now accept object & array based on their keys to