waibu-db 2.12.0 → 2.12.2

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

@@ -5,6 +5,7 @@
   <c:grid-col col="8-lg" flex="justify-content:end-lg">
     <c:btn-group margin="end-2">
       <c:wdb-btn-add text="nowrap"/>
+      <c:wdb-btn-details on-list text="nowrap"/>
       <c:wdb-btn-edit on-list menu-dir="end"/>
     </c:btn-group>
     <c:wdb-btn-delete on-list margin="end-2" />

package/extend/waibuBootstrap/theme/component/widget/btn-details.js

@@ -10,7 +10,7 @@ async function btnDetails () {
       const { isEmpty, get } = this.app.lib._
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
-      if (schema.view.disabled.includes('update')) {
+      if (schema.view.disabled.includes('get')) {
         this.params.html = ''
         return
       }

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

@@ -7,7 +7,9 @@ async function form () {
     build = async () => {
       const { get, find, filter, forOwn, isEmpty } = this.app.lib._
       const { base64JsonEncode } = this.app.waibu
+      const { req } = this.component
       const schema = get(this, 'component.locals.schema', {})
+      const data = get(this, 'component.locals.form', {})
       const body = []
       const xModels = get(schema, 'view.x.model', [])
       const xOns = get(schema, 'view.x.on', [])
@@ -31,7 +33,12 @@ async function form () {
             attr.push(`@${o.bind}="${o.handler}"`)
           }
           if (w.componentOpts) attr.push(`c-opts="${base64JsonEncode(w.componentOpts)}"`)
-          body.push(`<c:${w.component} ${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} data-type="${prop.type}" label-floating name="${w.name}" ${attr.join(' ')} />`)
+          if (schema.view.valueFormatter[f] && this.params.attr.method !== 'POST') {
+            const value = await schema.view.valueFormatter[f].call(this, data[f], data, { req })
+            body.push(`<c:${w.component} ${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} value="${value}" label-floating name="${w.name}" ${attr.join(' ')} />`)
+          } else {
+            body.push(`<c:${w.component} ${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} data-type="${prop.type}" label-floating name="${w.name}" ${attr.join(' ')} />`)
+          }
         }
         body.push('</c:fieldset>')
       }

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

@@ -165,7 +165,7 @@ async function table () {
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
           const cellFormatter = get(schema, `view.cellFormatter.${f}`)
-          if (cellFormatter) merge(attr, await cellFormatter.call(this, dataValue, d))
+          if (cellFormatter) merge(attr, await cellFormatter.call(this, dataValue, d, { params: this.params, req }))
           const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
           if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
           else attr.text = noWrap
@@ -175,7 +175,7 @@ async function table () {
             if (item) value = req.t(item[lookup.field ?? 'name'])
           }
           const formatter = get(schema, `view.formatter.${f}`)
-          if (formatter) value = await formatter.call(this, value, d, { params: this.params })
+          if (formatter) value = await formatter.call(this, value, d, { params: this.params, req })
           else value = await this._defFormatter({ req, key: f, schema, value, data: d, params: this.params })
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)

package/index.js

@@ -203,7 +203,7 @@ async function factory (pkgName) {
         rec[f] = format(data[f], prop.type, opts)
         const vf = get(schema, `view.valueFormatter.${f}`)
         if (vf) {
-          if (isFunction(vf)) rec[f] = await vf.call(this, data[f], data)
+          if (isFunction(vf)) rec[f] = await vf.call(this, data[f], data, { req })
           else rec[f] = await callHandler(vf, { req, value: data[f], data })
         } else if (['string', 'text'].includes(prop.type)) rec[f] = escape(rec[f])
       }

package/lib/crud/add-handler.js

@@ -6,7 +6,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   const { pick, map, merge, omit } = this.app.lib._
   const opts = merge({}, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
+  const { schema } = await getSchemaExt(model, 'add', merge({ args: [req] }, { params }, options))
   if (schema.disabled.includes('create')) return await reply.view(templateDisabled, { action: 'add' })
   // req.query.attachment = true
   opts.fields = schema.view.fields

package/lib/crud/delete-handler.js

@@ -5,14 +5,14 @@ async function deleteHandler ({ req, reply, model, params = {}, templateDisabled
   const { reduce, merge } = this.app.lib._
   const opts = merge({}, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
+  const { schema } = await getSchemaExt(model, 'delete', merge({ args: [req] }, { params }, options))
   if (schema.disabled.includes('remove')) return await reply.view(templateDisabled, { action: 'delete' })
   opts.fields = schema.view.fields
   delete req.query.query
   const ids = (req.body.ids ?? '').split(',')
   if (ids.length > 0) {
     const result = []
-    opts.noResult = true
+    // opts.noResult = true
     opts.noFlash = true
     for (const id of ids) {
       try {

package/lib/crud/details-handler.js

@@ -6,7 +6,7 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const { merge, isEmpty } = this.app.lib._
   const opts = merge({ refs: '*' }, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'details', merge({}, { params }, options))
+  const { schema } = await getSchemaExt(model, 'details', merge({ args: [req] }, { params }, options))
   if (schema.disabled.includes('get')) return await reply.view(templateDisabled, { action: 'details' })
   // req.query.attachment = true
   opts.fields = schema.view.fields

package/lib/crud/edit-handler.js

@@ -13,7 +13,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   let resp
   let form
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'edit', merge({}, { params }, options))
+  const { schema } = await getSchemaExt(model, 'edit', merge({ args: [req] }, { params }, options))
   if (schema.disabled.includes('update')) return await reply.view(templateDisabled, { action: 'edit' })
   // req.query.attachment = true
   opts.fields = schema.view.fields

package/lib/crud/export-handler.js

@@ -9,7 +9,7 @@ async function exportHandler ({ req, reply, model, params = {}, templateDisabled
   const { buildUrl } = this.app.waibuMpa
   const { pushDownload } = getPlugin('sumba')
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
+  const { schema } = await getSchemaExt(model, 'add', merge({ args: [req] }, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   const data = await prepCrud.call(getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
   data.opts = omit(data.opts, ['req', 'reply'])

package/lib/crud/list-handler.js

@@ -6,7 +6,7 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
 
   const opts = merge({}, { count: true, refs: '*' }, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'list', merge({}, { params }, options))
+  const { schema } = await getSchemaExt(model, 'list', merge({ args: [req] }, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   for (const key of ['sort', 'limit', 'fields']) {
     const sessKey = `wdb${model}${upperFirst(key)}`

package/lib/method/count-record.js

@@ -4,7 +4,7 @@ async function countRecord ({ model, req, reply, options = {}, transaction } = {
   const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     return await mdl.countRecord(filter, opts)
   }
 

package/lib/method/create-aggregate.js

@@ -9,7 +9,7 @@ async function createAggregate ({ model, req, reply, options = {}, transaction }
   params.aggregates = params.aggregates ?? ['count']
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     return await mdl.createAggregate(filter, params, opts)
   }
 

package/lib/method/create-histogram.js

@@ -9,7 +9,7 @@ async function createHistogram ({ model, req, reply, options = {}, transaction }
   params.aggregates = params.aggregates ?? ['count']
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     return await mdl.createHistogram(filter, params, opts)
   }
 

package/lib/method/find-all-record.js

@@ -4,7 +4,7 @@ async function findAllRecord ({ model, req, reply, options = {}, transaction } =
   const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     const ret = await mdl.findAllRecord(filter, opts)
     if (attachment) {
       for (const d of ret.data) {

package/lib/method/find-one-record.js

@@ -4,7 +4,7 @@ async function findOneRecord ({ model, req, reply, options = {}, transaction } =
   const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     const ret = await mdl.findOneRecord(filter, opts)
     if (attachment) ret.data._attachment = await mdl.findAttachment(ret.data.id, { stats, mimeType })
     return ret

package/lib/method/find-record.js

@@ -4,7 +4,7 @@ async function findRecord ({ model, req, reply, options = {}, transaction } = {}
   const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     const ret = await mdl.findRecord(filter, opts)
     if (attachment) {
       for (const d of ret.data) {

package/lib/method/get-record.js

@@ -5,7 +5,7 @@ async function getRecord ({ model, req, reply, id, options = {}, transaction } =
   const me = this
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     const data = await getOneRecord.call(me, mdl, recId, filter, opts)
     if (attachment) data._attachment = await mdl.findAttachment(data.id, { stats, mimeType })
     return data

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

@@ -165,6 +165,9 @@ const handler = {
   },
   edit: async function (schema, ext, options) {
     applyLayout.call(this, 'edit', schema, ext, options)
+  },
+  delete: async function (schema, ext, options) {
+    applyLayout.call(this, 'delete', schema, ext, options)
   }
 }
 

package/lib/method/remove-record.js

@@ -5,7 +5,7 @@ async function removeRecord ({ model, req, reply, id, options = {}, transaction
   const me = this
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     const resp = await getOneRecord.call(me, mdl, recId, filter, opts)
     opts._data = resp.data
     return await mdl.removeRecord(recId, opts)

package/lib/method/update-record.js

@@ -5,7 +5,7 @@ async function updateRecord ({ model, req, reply, id, body, options = {}, transa
   const me = this
 
   async function handler (trx) {
-    opts.trx = opts.trx || trx
+    if (opts.trx === true) opts.trx = trx
     const resp = await getOneRecord.call(me, mdl, recId, filter, opts)
     opts._data = resp.data
     const ret = await mdl.updateRecord(recId, input, opts)

package/lib/util.js

@@ -14,7 +14,6 @@ export async function prepCrud ({ model, body, id, req, reply, transaction, opti
   if (opts.suppressError === true) opts.suppressError = actions
   else if (isString(opts.suppressError)) opts.suppressError = [opts.suppressError]
   else opts.suppressError = opts.suppressError ?? []
-  opts.trx = options.trx
   const params = this.getParams(req, ...args)
   for (const k of ['count', 'fields']) {
     opts[k] = opts[k] ?? params[k]
@@ -23,7 +22,7 @@ export async function prepCrud ({ model, body, id, req, reply, transaction, opti
   opts.dataOnly = opts.dataOnly ?? false
   opts.req = req
   opts.reply = reply
-  opts.trx = opts.trx || transaction
+  opts.trx = opts.trx ?? options.trx ?? transaction ?? true
 
   let { attachment, stats, mimeType } = opts
   attachment = attachment ?? req.query.attachment

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-03-30
+
+- [2.12.3] Bug fix in transaction supports
+
+## 2026-03-27
+
+- [2.12.1] Bug fix in all ```view.formatter``` & ```view.valueFormatter```
+- [2.12.2] Bug fix in ```wdb-form``` & ```wdb-table``` widgets, now correctly use value from formatter if provided
+
 ## 2026-03-26
 
 - [2.11.0] Adding ```suppressError``` to model options