waibu-db 2.25.0 → 2.25.2

package/extend/bajoTemplate/partial/crud/_edit-btns.html

@@ -17,13 +17,13 @@
   </c:grid-col>
   <c:grid-col col="6-lg" flex="justify-content:end-lg align-items:center">
     <% if (!_getSetting('waibuDb:/control/wdbBtnDelete/disabled')) { %>
-    <c:wdb-btn-delete href="<%= _getSetting('waibuDb:/control/wdbBtnDelete/href', 'undefined') %>"  <%= _.get(form, '_immutable.0') === '*' ? 'disabled' : '' %>/>
+    <c:wdb-btn-delete href="<%= _getSetting('waibuDb:/control/wdbBtnDelete/href', 'undefined') %>"  <%= !_meta.routeOpts.xSite && _.get(form, '_immutable.0') === '*' ? 'disabled' : '' %>/>
     <% } %>
     <% if (!_getSetting('waibuDb:/control/wdbBtnReset/disabled')) { %>
-    <c:btn type="reset" color="secondary" t:content="reset" margin="start-2" <%= _.get(form, '_immutable.0') === '*' ? 'disabled' : '' %>/>
+    <c:btn type="reset" color="secondary" t:content="reset" margin="start-2" <%= !_meta.routeOpts.xSite && _.get(form, '_immutable.0') === '*' ? 'disabled' : '' %>/>
     <% } %>
     <% if (!_getSetting('waibuDb:/control/wdbBtnSubmit/disabled')) { %>
-    <c:btn type="submit" color="primary" t:content="submit" margin="start-2" <%= _.get(form, '_immutable.0') === '*' ? 'disabled' : '' %>/>
+    <c:btn type="submit" color="primary" t:content="submit" margin="start-2" <%= !_meta.routeOpts.xSite && _.get(form, '_immutable.0') === '*' ? 'disabled' : '' %>/>
     <% } %>
   </c:grid-col>
 </c:grid-row>

package/extend/waibuBootstrap/theme/component/widget/data-table.js

@@ -31,6 +31,7 @@ async function table () {
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
 
+      const hasXSite = get(req, 'routeOptions.config.xSite')
       const schema = get(locals, 'schema', {})
       const data = get(locals, 'list.data', [])
       const filter = get(locals, 'list.filter', {})
@@ -144,7 +145,7 @@ async function table () {
           const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
           if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
           else attr.text = `${noWrap}`
-          if (d._immutable && d._immutable.length > 0) {
+          if (!hasXSite && d._immutable && d._immutable.length > 0) {
             if (d._immutable[0] === '*' || d._immutable.includes(f)) attr.text += ' color:body-tertiary'
           }
           if (f === 'id') attr.text += ' color:body-tertiary'

package/extend/waibuBootstrap/theme/component/widget/form.js

@@ -22,6 +22,7 @@ async function form () {
     build = async () => {
       const { get, find, filter, forOwn, isEmpty, omit, isArray } = this.app.lib._
       const { base64JsonEncode } = this.app.waibu
+      const { req } = this.component
       const body = []
       const xModels = get(this.schema, 'view.x.model', [])
       const xOns = get(this.schema, 'view.x.on', [])
@@ -53,7 +54,9 @@ async function form () {
           if (widget.componentOpts) attr['c-opts'] = base64JsonEncode(widget.componentOpts)
           if (prop.virtual) widget.component = 'form-plaintext'
           const immutable = get(this, 'formData._immutable') || []
-          if ((immutable.length === 1 && immutable[0] === '*') || immutable.includes(prop.name)) widget.component = 'form-plaintext'
+          if (!req.routeOptions.config.xSite) {
+            if ((immutable.length === 1 && immutable[0] === '*') || immutable.includes(prop.name)) widget.component = 'form-plaintext'
+          }
           widget.addons = widget.addons ?? []
           if (!isArray(widget.addons)) widget.addons = [widget.addons]
           for (const ao of widget.addons) {

package/lib/method/get-schema-ext.js

@@ -16,9 +16,15 @@ function getCommons (action, schema, ext, options = {}) {
   const disabled = get(ext, `view.${action}.disabled`, get(ext, 'common.disabled', []))
   const x = defaultsDeep(get(ext, `view.${action}.x`), get(ext, 'common.x', {}))
   const aggregate = get(ext, `view.${action}.stat.aggregate`, get(ext, 'common.stat.aggregate', []))
+  const hasXSite = get(options, 'args.0.req.routeOptions.config.xSite')
+  const hasSiteId = schema.model.hasProperty('siteId')
+  const hasImmutable = schema.model.hasProperty('_immutable')
+
   let attachment = get(ext, `view.${action}.attachment`, get(ext, 'common.attachment', schema.attachment))
   if (!schema.options.attachment || action === 'list') attachment = false
-  hidden.push('siteId', ...schema.hidden, ...(options.hidden ?? []))
+  hidden.push(...schema.hidden, ...(options.hidden ?? []))
+  if (hasSiteId && !hasXSite) hidden.push('siteId')
+  if (hasImmutable && !hasXSite) hidden.push('_immutable')
   hidden = uniq(hidden)
   pull(hidden, ...forceVisible)
   const allFields = without(map(schema.properties, 'name'), ...hidden)
@@ -33,11 +39,7 @@ function getCommons (action, schema, ext, options = {}) {
   set(schema, 'view.control', control)
   set(schema, 'view.x', x)
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
-  let fields = []
-  for (const f of forFields) {
-    if (['_immutable'].includes(f)) continue
-    if (allFields.includes(f)) fields.push(f)
-  }
+  let fields = forFields.filter(f => allFields.includes(f))
   fields = uniq(without(fields, ...hidden))
 
   options.forceShowId = options.forceShowId ?? true
@@ -49,9 +51,9 @@ function getCommons (action, schema, ext, options = {}) {
   return { fields, allFields, card }
 }
 
-function autoLayout ({ action, schema, ext, layout }) {
+function autoLayout ({ action, schema, ext, layout, options }) {
   const { forOwn, keys } = this.app.lib._
-  const matches = ['id', 'createdAt', 'updatedAt']
+  const matches = ['id', 'createdAt', 'updatedAt', 'siteId']
   const meta = []
   const general = []
   forOwn(schema.view.widget, (w, f) => {
@@ -86,7 +88,7 @@ function customLayout ({ action, schema, ext, layout, readonly }) {
 async function applyLayout (action, schema, ext, options) {
   const { defaultsDeep } = this.app.lib.aneka
   const { set, get, isEmpty, find } = this.app.lib._
-  const { fields, card } = getCommons.call(this, action, schema, ext)
+  const { fields, card } = getCommons.call(this, action, schema, ext, options)
   const layout = get(ext, `view.${action}.layout`, get(ext, 'common.layout', []))
   const readonly = get(ext, `view.${action}.readonly`, get(ext, 'common.readonly', defReadonly))
   const widget = {}
@@ -152,8 +154,8 @@ async function applyLayout (action, schema, ext, options) {
     widget[f] = result
   }
   set(schema, 'view.widget', widget)
-  if (isEmpty(layout)) autoLayout.call(this, { layout, schema, action, ext })
-  else customLayout.call(this, { layout, schema, action, ext, readonly })
+  if (isEmpty(layout)) autoLayout.call(this, { layout, schema, action, ext, options })
+  else customLayout.call(this, { layout, schema, action, ext, readonly, options })
   set(schema, 'view.layout', layout)
   set(schema, 'view.fields', fields)
   set(schema, 'view.card', card)
@@ -200,10 +202,12 @@ async function getSchemaExt (modelName, view, options = {}) {
   const ns = model.plugin.ns
   const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'sortables', 'scanables', 'view', 'hidden', 'options'])
   schema.ns = ns
+  schema.model = model
   const parserOpts = { args: options.args }
   let ext = await readConfig(`${ns}:/extend/waibuDb/schema/${model.baseName}.*`, { ns, baseNs: 'waibuDb', parserOpts })
   ext = defaultsDeep(options.schema ?? {}, ext)
   await handler[view].call(this, schema, ext, options)
+  delete schema.model
   return { schema, ext, model }
 }
 

package/lib/util.js

@@ -79,7 +79,9 @@ export async function processHandler ({ action, model, handler, options } = {})
   }
 
   try {
-    if (options.trx === true) return await model.transaction(handler, action, options)
+    if (options.trx === true && ['createRecord', 'updateRecord', 'upsertRecord', 'removeRecord'].includes(action)) {
+      return await model.transaction(handler, action, options)
+    }
     return await handler()
   } catch (err) {
     if (options.suppressError.includes(action)) return suppressedReturn.call(this, err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "2.25.0",
+  "version": "2.25.2",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-06-17
+
+- [2.25.2] Bug fix in ```wdb-data-table``` widget
+- [2.25.2] Bug fix in ```wdb-form``` widget
+- [2.25.2] Bug fix in ```get-schema-ext.js```
+
+## 2026-06-13
+
+- [2.25.1] Bug fix in ```transaction```: only applicable to ```CUD```
+
 ## 2026-06-12
 
 - [2.25.0] Necessary updates to ```bajo@2.18.0``` specs