sumba 2.32.3 → 2.33.0

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/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/dobo/fixture/team-user.json

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

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/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
           ]
         })

package/lib/create-new-site.js

@@ -60,8 +60,8 @@ export async function createRefs (site, data, options, verbose) {
     const mdl = getModel(m)
     const fixtures = data[m]
     for (const f of fixtures) {
-      f.siteId = site.id
-      const lv = {}
+      f.siteId = site.id + ''
+      const lv = { siteId: f.siteId }
       for (const key in f) {
         const val = f[key]
         if (isString(val) && val.slice(0, 2) === '?:') f[key] = await mdl._simpleLookup(val.slice(2), lv, options)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,8 +1,15 @@
 # Changes
 
-## 2026-06-12
+## 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```
+
+## 2026-06-15
 
 - [2.32.3] Bug fix in ```hook.js```
+- [2.32.4] Bug fix in ```create-new-site.js```
 
 ## 2026-06-12