sumba 2.18.0 → 2.19.0

package/extend/bajo/hook/dobo.sumba-site@after-remove-record.js

@@ -1,7 +1,9 @@
 import { removeRefs } from '../../../lib/remove-site.js'
+import { clearCache } from './dobo.sumba-site@after-update-record.js'
 
 async function afterRemoveRecord (id, result, options) {
   await removeRefs.call(this, result.oldData, options)
+  await clearCache.call(this, id, result)
 }
 
 export default afterRemoveRecord

package/extend/bajo/hook/dobo.sumba-site@after-update-record.js

@@ -0,0 +1,14 @@
+export async function clearCache (id, result) {
+  if (!this.app.bajoCache) return
+  const { clear } = this.app.bajoCache
+  const { get } = this.app.lib._
+  await clear({ key: 'dobo|SumbaSite|getSite|default' })
+  await clear({ key: `dobo|SumbaSite|getSite|multiSite|${id}` })
+  await clear({ key: `dobo|SumbaSite|getSite|multiSite|${get(result, 'data.hostname', get(result, 'oldData.hostname'))}` })
+}
+
+async function afterUpdateRecord (id, input, result, opts) {
+  await clearCache.call(this, id, result)
+}
+
+export default afterUpdateRecord

package/extend/bajo/hook/dobo.sumba-user@after-remove-record.js

@@ -0,0 +1,7 @@
+import { clearCache } from './dobo.sumba-user@after-update-record.js'
+
+async function afterRemoveRecord (id, rec, options = {}) {
+  await clearCache.call(this, id, rec)
+}
+
+export default afterRemoveRecord

package/extend/bajo/hook/dobo.sumba-user@after-update-record.js

@@ -1,3 +1,14 @@
+export async function clearCache (id, result) {
+  if (!this.app.bajoCache) return
+  const { hash } = this.app.bajoExtra
+  const { clear } = this.app.bajoCache
+  const { get, isEmpty } = this.app.lib._
+  let token = get(result, 'data.token', get(result, 'oldData.token', ''))
+  if (!isEmpty(token)) token = await hash(token)
+  await clear({ key: `dobo|SumbaUser|getUserById|${id}` })
+  await clear({ key: `dobo|SumbaUser|getUserByToken|${token}` })
+}
+
 async function afterUpdateRecord (id, body, rec, options = {}) {
   const { data, oldData } = rec
   const { req } = options
@@ -5,6 +16,9 @@ async function afterUpdateRecord (id, body, rec, options = {}) {
   const t = get(req, 't', this.t)
   const to = `${data.firstName} ${data.lastName} <${data.email}>`
   const source = this.ns
+
+  await clearCache.call(this, id, rec)
+
   let subject
   const payload = { to, subject, data }
 

package/extend/dobo/model/site.json

@@ -40,5 +40,6 @@
     "dobo:createdAt",
     "dobo:updatedAt",
     "dobo:immutable"
-  ]
+  ],
+  "scanables": ["hostname", "alias", "title", "orgName"]
 }

package/extend/waibuMpa/extend/waibuAdmin/route/site.js

@@ -14,7 +14,8 @@ const manageSite = {
     const options = {
       modelOpts: {
         formatValue: true,
-        retainOriginalValue: true
+        retainOriginalValue: true,
+        noCache: true
       },
       schema: {
         view: {

package/extend/waibuMpa/route/your-stuff/profile/edit.js

@@ -8,7 +8,7 @@ const profile = {
     const { updateRecord, getRecord } = this.app.waibuDb
     const { omit, pick } = this.app.lib._
     const { hash } = this.app.bajoExtra
-    const resp = await getRecord({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: ['token'], noHook: true, noCache: true } })
+    const resp = await getRecord({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: ['token'], noHook: true, noCache: true, formatValue: true, retainOriginalValue: true } })
     let form = defaultsDeep(req.body, omit(resp.data, ['password', 'salt']))
     form.token = await hash(form.token)
     let error

package/extend/waibuMpa/route/your-stuff/profile.js

@@ -3,7 +3,7 @@ const profile = {
   handler: async function (req, reply) {
     const { hash } = this.app.bajoExtra
     const { getRecord } = this.app.waibuDb
-    const options = { forceNoHidden: ['token'], noHook: true, noCache: true, attachment: true, mimeType: true }
+    const options = { forceNoHidden: ['token'], noHook: true, noCache: true, attachment: true, mimeType: true, formatValue: true, retainOriginalValue: true }
     const resp = await getRecord({ model: 'SumbaUser', req, id: req.user.id, options })
     const form = resp.data
     form.token = await hash(form.salt)

package/lib/get-site.js

@@ -31,7 +31,7 @@ async function getSite (input, byId = false) {
 
   if (!this.config.multiSite.enabled) {
     const filter = { query: { alias: 'default' } }
-    const key = 'getSite|default'
+    const key = 'dobo|SumbaSite|getSite|default'
     if (getCache) {
       site = await getCache({ key })
       if (site) return site
@@ -47,7 +47,7 @@ async function getSite (input, byId = false) {
   let query
   if (byId) query = { id: input }
   else query = { hostname: input }
-  const key = `getSite|multiSite|${input}`
+  const key = `dobo|SumbaSite|getSite|multiSite|${input}`
   if (getCache) {
     site = await getCache({ key })
     if (site) return JSON.parse(site)

package/lib/get-user.js

@@ -39,7 +39,7 @@ export async function mergeTeam (user) {
 export async function getUserById (id, req) {
   const { getModel } = this.app.dobo
   const { set: setCache, get: getCache } = this.app.bajoCache ?? {}
-  const key = `getUserById|${id}`
+  const key = `dobo|SumbaUser|getUserById|${id}`
   let user
   if (getCache) {
     user = await getCache({ key })
@@ -57,7 +57,7 @@ export async function getUserById (id, req) {
 export async function getUserByToken (token, req) {
   const { getModel } = this.app.dobo
   const { set: setCache, get: getCache } = this.app.bajoCache ?? {}
-  const key = `getUserByToken|${token}`
+  const key = `dobo|SumbaUser|getUserByToken|${token}`
   let user
   if (getCache) {
     user = await getCache({ key })

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 2026-04-16
+
+- [2.19.0] Add cache clearing if a site is updated/removed
+- [2.19.0] Add cache clearing if a user is updated/removed
+- [2.19.0] Necessary changes to all routes to support ```formatValue``` & ```retainOriginalValue``` options
+- [2.19.0] Change cache key for ```getUser()```
+- [2.19.0] Change cache key for ```getSite()```
+
+## 2026-04-13
+
+- [2.18.1] Bug fix on ```SumbaSite``` model
+
 ## 2026-04-11
 
 - [2.18.0] Some major rewrites :/