sumba 2.32.4 → 2.33.1

package/extend/bajo/hook.js

@@ -40,8 +40,13 @@ async function applyModelGuard ({ model, q, teamIds, options }) {
   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']) {
-      if (!isEmpty(opValue[op]) && isArray(opValue[op])) results.push(set({}, field, set({}, '$' + op, opValue[op])))
+    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 prop = model.getProperty(field)
     const items = rules.filter(item => item.field === field)

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

@@ -175,7 +175,8 @@
     "siteIds": "Sites",
     "allTeams": "All Teams?",
     "condition": "Condition",
-    "hiddenFields": "Hide Fields"
+    "hiddenFields": "Hide Fields",
+    "_immutable": "Immutable"
   },
   "validation": {
     "password": {

package/extend/bajo/intl/id.json

@@ -181,7 +181,8 @@
     "siteIds": "Situs",
     "allTeams": "Semua Tim?",
     "condition": "Kondisi",
-    "hiddenFields": "Sembunyikan Kolom"
+    "hiddenFields": "Sembunyikan Kolom",
+    "_immutable": "Immutable"
   },
   "validation": {
     "password": {

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/dobo/feature/site-id.js

@@ -5,10 +5,11 @@ async function siteId (opts = {}) {
       type: 'string',
       maxLength: 50,
       ref: {
-        siteDetail: {
+        siteId: {
           model: 'SumbaSite',
           field: 'id',
-          type: '1:1'
+          searchField: 'hostname',
+          fields: ['id', 'hostname']
         }
       },
       index: true

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

@@ -0,0 +1,15 @@
+async function siteSetting () {
+  return {
+    common: {
+      widget: {
+        siteId: {
+          attr: {
+            url: 'sumba.restapi:/manage/site'
+          }
+        }
+      }
+    }
+  }
+}
+
+export default siteSetting

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

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

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

@@ -351,6 +351,7 @@ async function factory (pkgName) {
           title: 'xSite',
           children: [
             { title: 'allSites', href: `waibuAdmin:/${prefix}/x/site/:action`, params },
+            { title: 'siteSetting', href: `waibuAdmin:/${prefix}/x/site-setting/:action`, params },
             sessionMenu
           ]
         })
@@ -744,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 {
@@ -805,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.32.4",
+  "version": "2.33.1",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 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 ```sumba:siteId``` feature
+- [2.33.1] Bug fix in ```checkUser()```,  ```checkTeam()``` & ```checkXSite()```
+- [2.33.1] Bug fix in ```sumba:country``` feature
+
 ## 2026-06-15
 
 - [2.32.3] Bug fix in ```hook.js```