sumba 2.25.1 → 2.26.0

package/extend/dobo/model.json

@@ -0,0 +1,214 @@
+[{
+  "baseName": "contact-form-cat",
+  "features": ["sumba:category", "sumba:siteId"]
+}, {
+  "baseName": "contact-form",
+  "properties": [
+    "firstName,,50,true,true",
+    "lastName,,50,true,true",
+    "email,,50,true,true",
+    "category,,50,true",
+    "subject,,255,,true",
+    "message,text"
+  ],
+  "features": [{
+      "name": "sumba:status",
+      "default": "NEW",
+      "values": ["NEW", "ACK"]
+    }, "sumba:userId", "sumba:siteId", "dobo:createdAt", "dobo:updatedAt"
+  ]
+}, {
+  "baseName": "download",
+  "properties": [
+    "description,,50,true",
+    "file,text,,,true",
+    "type,,20,true",
+    "jobQueue,object",
+    {
+      "name": "size",
+      "type": "integer",
+      "default": 0,
+      "index": true
+    }
+  ],
+  "features": ["sumba:siteId", "sumba:userId", "dobo:createdAt", "dobo:updatedAt", {
+    "name": "sumba:status",
+    "default": "INQUEUE",
+    "values": ["INQUEUE", "PROCESSING", "COMPLETE", "FAIL"]
+  }]
+}, {
+  "baseName": "site-setting",
+  "properties": [
+    "ns,,50,true,true",
+    "key,,255,true,true",
+    "value,text"
+  ],
+  "indexes": [{
+    "fields": ["ns", "key", "siteId"],
+    "type": "unique"
+  }],
+  "features": [
+    "sumba:siteId",
+    "dobo:immutable",
+    "dobo:updatedAt"
+  ]
+}, {
+  "buildLevel": 1,
+  "baseName": "site",
+  "properties": [{
+    "name": "hostname",
+    "type": "string",
+    "maxLength": 100,
+    "required": true,
+    "index": "unique"
+  }, {
+    "name": "alias",
+    "type": "string",
+    "maxLength": 100,
+    "index": "unique",
+    "required": true,
+    "immutable": true
+  }, {
+    "name": "title",
+    "type": "string",
+    "maxLength": 50,
+    "required": true
+  }, {
+    "name": "orgName",
+    "type": "string",
+    "maxLength": 100,
+    "index": true
+  }, {
+    "name": "email",
+    "type": "string",
+    "maxLength": 100,
+    "rules": ["email"]
+  }],
+  "features": [
+    "sumba:personInCharge",
+    "sumba:address",
+    "sumba:social",
+    {
+      "name": "sumba:status",
+      "default": "ACTIVE"
+    },
+    "dobo:createdAt",
+    "dobo:updatedAt",
+    "dobo:immutable"
+  ],
+  "scanables": ["hostname", "alias", "title", "orgName"]
+}, {
+  "buildLevel": 5,
+  "baseName": "team-setting",
+  "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"
+  ]
+}, {
+  "buildLevel": 4,
+  "baseName": "team-user",
+  "properties": [],
+  "indexes": [{
+    "fields": ["userId", "siteId", "teamId"],
+    "type": "unique"
+  }],
+  "features": [
+    "dobo:createdAt",
+    "dobo:updatedAt",
+    "sumba:siteId",
+    "sumba:userId",
+    "sumba:teamId",
+    "dobo:immutable"
+  ]
+}, {
+  "buildLevel": 3,
+  "baseName": "team",
+  "properties": [
+    "alias,,20,,true",
+    "name,,50,true,true"
+  ],
+  "indexes": [{
+    "fields": ["alias", "siteId"],
+    "type": "unique"
+  }],
+  "features": [
+    "dobo:createdAt",
+    "dobo:updatedAt",
+    "dobo:immutable",
+    "sumba:siteId",
+    {
+      "name": "sumba:status",
+      "default": "ENABLED",
+      "values": ["ENABLED", "DISABLED"]
+    },
+    "dobo:immutable"
+  ]
+}, {
+  "baseName": "ticket-cat",
+  "features": ["sumba:category", "sumba:siteId"]
+}, {
+  "baseName": "ticket-detail",
+  "properties": [
+    "masterId,,255,true,true",
+    "message,text"
+  ],
+  "features": ["dobo:createdAt", "sumba:userId", "sumba:siteId"]
+}, {
+  "baseName": "ticket",
+  "properties": [
+    "subject,,255,true,true",
+    {
+      "name": "cat",
+      "type": "string",
+      "maxLength": 50,
+      "index": true,
+      "required": true,
+      "ref": {
+        "cat": {
+          "model": "SumbaTicketCat",
+          "searchField": "name",
+          "labelField": "name"
+        }
+      }
+    },
+    "message,text,,,true"
+  ],
+  "features": [
+    "dobo:createdAt",
+    "dobo:updatedAt",
+    "sumba:siteId",
+    "sumba:userId",
+    {
+      "name": "sumba:status",
+      "default": "OPEN",
+      "values": ["OPEN", "CLOSED"]
+    }
+  ]
+}, {
+  "buildLevel": 5,
+  "baseName": "user-setting",
+  "properties": [
+    "ns,,50,true,true",
+    "key,,255,true,true",
+    "value,text"
+  ],
+  "indexes": [{
+    "fields": ["ns", "key", "siteId", "userId"],
+    "type": "unique"
+  }],
+  "features": [
+    "sumba:siteId",
+    "dobo:updatedAt",
+    "sumba:userId"
+  ]
+}]

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-05-28
+
+- [2.26.0] Change hooks to be written in one ```hook.js``` file
+- [2.26.0] Change model schemas to be written in one ```model.js``` file
+
 ## 2026-05-25
 
 - [2.25.1] Bug fix in several places because name changing ```crossSiteAdmins``` to ```xSiteAdmins```

package/extend/bajo/hook/bajo.extend@after-read-config.js

@@ -1,13 +0,0 @@
-import path from 'path'
-
-async function afterReadConfig (file, result, options) {
-  const base = path.basename(file, path.extname(file))
-  // rewrite fixtures
-  if (!(base === 'route-guard' && Array.isArray(result) && file.includes('/fixture/'))) return
-  for (const res of result) {
-    if (res.path.slice(0, 2) === ':/') res.path = options.sourceNs + res.path
-    res.path = res.path.replaceAll('{ns}', options.sourceNs)
-  }
-}
-
-export default afterReadConfig

package/extend/bajo/hook/dobo.sumba-attrib-guard$dobo.sumba-x-attrib-guard@after-transaction.js

@@ -1,6 +0,0 @@
-async function afterTransaction (action, ...args) {
-  if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
-  await this.getAttribGuards(true)
-}
-
-export default afterTransaction

package/extend/bajo/hook/dobo.sumba-contact-form@after-create-record.js

@@ -1,17 +0,0 @@
-async function afterCreateRecord (body, rec, options = {}) {
-  const { data } = rec
-  const { req } = options
-  const { get } = this.app.lib._
-  const t = get(req, 't', this.t)
-  const to = `${data.firstName} ${data.lastName} <${data.email}>`
-  let bcc
-  if (req.site) bcc = req.site.email
-  const subject = t('contactForm')
-  const payload = { to, bcc, subject, data }
-  await this.sendMail(
-    'sumba.template:/_mail/help-contact-form.html',
-    { payload, options, source: this.ns }
-  )
-}
-
-export default afterCreateRecord

package/extend/bajo/hook/dobo.sumba-contact-form@before-create-record.js

@@ -1,16 +0,0 @@
-const beforeCreateRecord = {
-  level: 1000,
-  handler: async function (body, options = {}) {
-    const { get, isEmpty } = this.app.lib._
-    const user = get(options, 'req.user')
-    if (user) {
-      if (isEmpty(body.firstName)) body.firstName = user.firstName
-      if (isEmpty(body.lastName)) body.lastName = user.firstName
-      if (isEmpty(body.email)) body.email = user.email
-    }
-    if (isEmpty(body.category)) body.category = 'MISC'
-    options.checksumId = true
-  }
-}
-
-export default beforeCreateRecord

package/extend/bajo/hook/dobo.sumba-model-guard$dobo.sumba-x-model-guard@after-transaction.js

@@ -1,6 +0,0 @@
-async function afterTransaction (action, ...args) {
-  if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
-  await this.getModelGuards(true)
-}
-
-export default afterTransaction

package/extend/bajo/hook/dobo.sumba-route-guard$dobo.sumba-x-route-guard@after-transaction.js

@@ -1,6 +0,0 @@
-async function afterTransaction (action, ...args) {
-  if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
-  await this.getRouteGuards(true)
-}
-
-export default afterTransaction

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

@@ -1,8 +0,0 @@
-import { createRefs, getAllFixtures } from '../../../lib/create-new-site.js'
-
-async function afterCreateRecord (body, result, options) {
-  const fixtures = await getAllFixtures.call(this, result.data.alias)
-  await createRefs.call(this, result.data, fixtures, options)
-}
-
-export default afterCreateRecord

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

@@ -1,9 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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-team$dobo.sumba-site@after-transaction.js

@@ -1,8 +0,0 @@
-async function afterTransaction (action, ...args) {
-  if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
-  await this.getRouteGuards(true)
-  await this.getModelGuards(true)
-  await this.getAttribGuards(true)
-}
-
-export default afterTransaction

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

@@ -1,15 +0,0 @@
-async function afterCreateRecord (body, rec, options = {}) {
-  const { data } = rec
-  const { req } = options
-  const { get } = this.app.lib._
-  const t = get(req, 't', this.t)
-  const to = `${data.firstName} ${data.lastName} <${data.email}>`
-  const subject = t('newUserSignup')
-  const payload = { to, subject, data }
-  await this.sendMail(
-    `sumba.template:/_mail/user-signup-success${data.status === 'ACTIVE' ? '-active' : ''}.html`,
-    { payload, options, source: this.ns }
-  )
-}
-
-export default afterCreateRecord

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

@@ -1,8 +0,0 @@
-async function afterRecordValidation (body, options) {
-  const { isBcrypt, hash } = this.app.bajoExtra
-  const { has } = this.app.lib._
-
-  if (has(body, 'password') && !isBcrypt(body.password)) body.password = await hash(body.password, 'bcrypt')
-}
-
-export default afterRecordValidation

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

@@ -1,7 +0,0 @@
-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,44 +0,0 @@
-export async function clearCache (id, result) {
-  if (!this.app.bajoCache) return
-  const { clear } = this.app.bajoCache ?? {}
-  const { get } = this.app.lib._
-  const token = get(result, 'data.token', get(result, 'oldData.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
-  const { get } = this.app.lib._
-  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 }
-
-  if (oldData.status === 'UNVERIFIED' && data.status === 'ACTIVE') {
-    payload.subject = t('userActivation')
-    await this.sendMail(
-      'sumba.template:/_mail/user-activation-success.html',
-      { payload, options, source }
-    )
-  } else if (oldData.token !== data.token) {
-    payload.subject = t('resetApiKey')
-    await this.sendMail(
-      'sumba.template:/_mail/mystuff-reset-api-key.html',
-      { payload, options, source }
-    )
-  } else if (body.password) {
-    payload.subject = t('changePassword')
-    await this.sendMail(
-      'sumba.template:/_mail/mystuff-change-password.html',
-      { payload, options, source }
-    )
-  }
-}
-
-export default afterUpdateRecord

package/extend/bajo/hook/dobo.sumba-user@before-create-record.js

@@ -1,7 +0,0 @@
-async function beforeCreateRecord (body, options = {}) {
-  const { token, salt } = await this.resetToken()
-  body.token = token
-  body.salt = salt
-}
-
-export default beforeCreateRecord

package/extend/bajo/hook/dobo.sumba-user@before-record-validation.js

@@ -1,8 +0,0 @@
-async function beforeRecordValidation (body, options = {}) {
-  const { set } = this.app.lib._
-  const password = await this.passwordRule(options.req)
-  const rule = { password }
-  set(options, 'validation.params.rule', rule)
-}
-
-export default beforeRecordValidation

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

@@ -1,9 +0,0 @@
-async function beforeUpdateRecord (id, body, options = {}) {
-  if (body.salt) {
-    const { token, salt } = await this.resetToken(body.salt)
-    body.token = token
-    body.salt = salt
-  }
-}
-
-export default beforeUpdateRecord

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

@@ -1,8 +0,0 @@
-import { handler } from './dobo@before-driver-find-record.js'
-
-const doboBeforeDriverCountRecord = {
-  level: 1000,
-  handler
-}
-
-export default doboBeforeDriverCountRecord

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

@@ -1,17 +0,0 @@
-const doboBeforeDriverCreateRecord = {
-  level: 1000,
-  handler: async function (model, body, options = {}) {
-    const { get } = this.app.lib._
-    const { isSet } = this.app.lib.aneka
-    const { req } = options
-    if (options.noAutoFilter || !req || get(req, 'routeOptions.config.xSite')) return
-    const item = { siteId: 'site.id', userId: 'user.id' }
-    for (const i in item) {
-      const rec = get(req, item[i])
-      const field = model.getProperty(i)
-      if (rec && field && !isSet(body[i])) body[i] = field.type === 'string' ? (rec + '') : rec
-    }
-  }
-}
-
-export default doboBeforeDriverCreateRecord

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

@@ -1,8 +0,0 @@
-import { handler } from './dobo@before-driver-find-record.js'
-
-const doboBeforeDriverFindAllRecord = {
-  level: 1000,
-  handler
-}
-
-export default doboBeforeDriverFindAllRecord

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

@@ -1,133 +0,0 @@
-async function applyModelGuard ({ model, q, teamIds, options }) {
-  const { get, set, orderBy, intersection, without } = this.app.lib._
-  const { include } = this.app.lib.aneka
-  const { req } = options
-  const results = []
-
-  const guards = await this.getModelGuards()
-  const columns = model.getNonVirtualProperties().map(prop => prop.name)
-  const filterFn = item => {
-    const bySiteId = item.siteIds.includes(req.site.id + '')
-    const byModel = item.models.includes(model.name)
-    const byTeamId = item.teamIds.length === 0 || include(item.teamIds, teamIds)
-    const byColumn = columns.includes(item.column)
-    return bySiteId && byModel && byTeamId && byColumn
-  }
-
-  guards.global = orderBy(guards.global.filter(filterFn), ['column'])
-  guards.local = orderBy(guards.local.filter(filterFn), ['column'])
-  for (const col of columns) {
-    let values = []
-    let items = guards.global.filter(item => item.column === col && !item.negation)
-    for (const item of items) {
-      values.push(...item.value)
-    }
-    items = guards.global.filter(item => item.column === col && item.negation)
-    for (const item of items) {
-      values = without(values, ...item.value)
-    }
-    items = guards.local.filter(item => item.column === col && !item.negation)
-    const newValues = []
-    for (const item of items) {
-      newValues.push(...item.value)
-    }
-    if (newValues.length > 0) values = intersection(values, newValues)
-    items = guards.local.filter(item => item.column === col && item.negation)
-    for (const item of items) {
-      values = without(values, ...item.value)
-    }
-    if (values.length) results.push(set({}, col, { $in: values }))
-  }
-
-  const allowEmpty = get(this, `config.dobo.model.${model.name}.allowEmptyQuery`, true)
-  if (results.length === 0 && !allowEmpty) throw this.error('_emptyColumnQuery') // signal driver to about with no result immediately
-  q.$and.push(...results)
-}
-
-export async function applyAttribGuard ({ model, teamIds, options }) {
-  const { uniq } = this.app.lib._
-  const { include } = this.app.lib.aneka
-  const { req } = options
-  const results = []
-
-  const guards = await this.getAttribGuards()
-  const filterFn = item => {
-    const bySiteId = item.siteIds.includes(req.site.id + '')
-    const byModel = item.models.includes(model.name)
-    const byTeamId = item.teamIds.length === 0 || include(item.teamIds, teamIds)
-    return bySiteId && byModel && byTeamId
-  }
-
-  let item = guards.global.filter(filterFn)[0]
-  if (item) results.push(...item.hiddenCols)
-  item = guards.local.filter(filterFn)[0]
-  if (item) results.push(...item.hiddenCols)
-  options.hidden = options.hidden ?? []
-  if (results.length > 0) options.hidden.push(...results)
-  options.hidden = uniq(options.hidden)
-}
-
-export async function rebuildFilter (model, filter = {}, options = {}) {
-  const { isEmpty, get } = this.app.lib._
-  const { req } = options
-  const hasSiteId = model.hasProperty('siteId')
-  const hasUserId = model.hasProperty('userId')
-  const hasTeamId = model.hasProperty('teamId')
-  const teams = get(req, 'user.teams', [])
-  const teamIds = teams.map(team => team.id + '')
-  const aliases = teams.map(team => team.alias)
-  const q = { $and: [] }
-
-  filter.query = filter.query ?? {}
-  if (!isEmpty(filter.query)) {
-    if (filter.query.$and) q.$and.push(...filter.query.$and)
-    else q.$and.push(filter.query)
-  }
-  if (req.routeOptions.config.xSite) return
-  if (hasSiteId) q.$and.push({ siteId: req.site.id + '' })
-  if (aliases.includes('administrator')) {
-    filter.query = q
-    return
-  }
-  if (!req.user) {
-    filter.query = q
-    return
-  }
-
-  const condUserId = {
-    $or: [
-      { userId: req.user.id + '' },
-      { userId: { $eq: null } }
-    ]
-  }
-
-  const condTeamId = {
-    $or: [
-      { teamId: { $in: teamIds } },
-      { teamId: { $eq: null } }
-    ]
-  }
-
-  if (hasTeamId) {
-    if (hasUserId) q.$and.push({ $or: [condTeamId, condUserId] })
-    else q.$and.push(condTeamId)
-  } else if (hasUserId) q.$and.push(condUserId)
-
-  await applyModelGuard.call(this, { model, q, teamIds, options })
-  await applyAttribGuard.call(this, { model, teamIds, options })
-  filter.query = q
-}
-
-export async function handler (model, filter, options = {}) {
-  const { isEmpty } = this.app.lib._
-  const { req = {} } = options
-  if (options.noAutoFilter || isEmpty(req) || isEmpty(req.site)) return
-  await rebuildFilter.call(this, model, filter, options)
-}
-
-const doboBeforeDriverFindRecord = {
-  level: 1000,
-  handler
-}
-
-export default doboBeforeDriverFindRecord

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

@@ -1,23 +0,0 @@
-import { rebuildFilter } from './dobo@before-driver-find-record.js'
-
-export async function checker (model, id, options = {}) {
-  const { isEmpty } = this.app.lib._
-  const { req = {} } = options
-  if (options.noAutoFilter || isEmpty(req) || isEmpty(req.site)) return
-
-  const filter = {}
-  await rebuildFilter.call(this, model, filter, options)
-  if (filter.query.$and) filter.query.$and.push({ id })
-  else filter.query.id = id
-  const row = await model.findOneRecord(filter, { count: false })
-  if (!row) throw this.app.dobo.error('recordNotFound%s%s', id, this.name, { statusCode: 404 })
-}
-
-const doboBeforeDriverGetRecord = {
-  level: 1000,
-  handler: async function (model, id, options) {
-    await checker.call(this, model, id, options)
-  }
-}
-
-export default doboBeforeDriverGetRecord

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

@@ -1,10 +0,0 @@
-import { checker } from './dobo@before-driver-get-record.js'
-
-const doboBeforeDriverRemoveRecord = {
-  level: 1000,
-  handler: async function (model, id, options = {}) {
-    await checker.call(this, model, id, options.req)
-  }
-}
-
-export default doboBeforeDriverRemoveRecord