waibu-db 2.8.1 → 2.9.0

package/extend/bajoTemplate/partial/crud/not-found.html

@@ -0,0 +1 @@
+<c:alert color="warning" t:content="noRecordFound" margin="top-4"/>

package/extend/bajoTemplate/template/crud/not-found.html

@@ -0,0 +1,2 @@
+<c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('details') %>" />
+<!-- include waibuDb.partial:/crud/not-found.html -->

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

@@ -17,21 +17,14 @@ async function btnColumns () {
         return
       }
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
-      if (isEmpty(fields)) fields = schema.view.fields
+      if (isEmpty(fields)) fields = without(schema.view.fields, 'id')
       const items = []
       this.params.attr.color = this.params.attr.color ?? 'secondary-outline'
       if (isEmpty(this.params.attr.content)) this.params.attr.content = req.t('columns')
       for (const f of schema.view.fields) {
-        if (!fields.includes(f)) continue
         let prop = find(schema.properties, { name: f })
         if (!prop) prop = find(schema.view.calcFields, { name: f })
         if (!prop) continue
-        /*
-        if (f === 'id') {
-          items.push(await this.component.buildTag({ tag: 'formCheck', attr: { checked: true, label: req.t('ID'), value: f, disabled: true } }))
-          continue
-        }
-        */
         const attr = { 'x-model': 'selected', label: req.t(get(schema, `view.label.${f}`, `field.${f}`)), value: f }
         if (fields.includes(f)) attr.checked = true
         items.push(await this.component.buildTag({ tag: 'formCheck', attr }))

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

@@ -74,7 +74,7 @@ async function table () {
       }
       const qsKey = this.app.waibu.config.qsKey
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
-      if (isEmpty(fields)) fields = schema.view.fields
+      if (isEmpty(fields)) fields = without(schema.view.fields, 'id')
       let sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(this, `component.locals._meta.query.${qsKey.sort}`, '')
       if (isEmpty(sort) && filter.sort) {
         const keys = Object.keys(filter.sort)

package/lib/crud/all-handler.js

@@ -1,5 +1,4 @@
-import buildParams from './helper/build-params.js'
-import addOnsHandler from './helper/add-ons-handler.js'
+import { buildParams, addOnsHandler } from './helper.js'
 
 import addHandler from './add-handler.js'
 import deleteHandler from './delete-handler.js'

package/lib/crud/details-handler.js

@@ -1,9 +1,9 @@
-import attachmentHandler from './helper/attachment-handler.js'
+import { attachmentHandler, notFoundTpl } from './helper.js'
 
 async function detailsHandler ({ req, reply, model, params = {}, id, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.app.lib.aneka
   const { getRecord, getSchemaExt } = this.app.waibuDb
-  const { merge } = this.app.lib._
+  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))
@@ -13,6 +13,7 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   id = id ?? req.params.id ?? req.query.id
   delete req.query.query
   const resp = await getRecord({ model, req, id, options: opts })
+  if (isEmpty(resp.data)) return await reply.view(notFoundTpl, params)
   const form = resp.data
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, options }) : undefined
   const attachments = await attachmentHandler.call(this, { schema, id, options })

package/lib/crud/edit-handler.js

@@ -1,4 +1,4 @@
-import attachmentHandler from './helper/attachment-handler.js'
+import { attachmentHandler, notFoundTpl } from './helper.js'
 
 async function editHandler ({ req, reply, model, id, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.app.lib.aneka
@@ -20,6 +20,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   id = id ?? req.params.id ?? req.query.id
   delete req.query.query
   const old = await getRecord({ model, req, id, options: opts })
+  if (isEmpty(old.data)) return await reply.view(notFoundTpl, params)
   form = defaultsDeep(req.body, old.data)
   if (req.method !== 'GET') {
     form = omit(form, ['_action', '_value'])

package/lib/crud/{helper/add-ons-handler.js → helper.js}

@@ -1,47 +1,66 @@
-async function addOnsHandler ({ req, reply, data, schema, options = {} }) {
-  const { escape } = this.app.waibu
-  const { base64JsonEncode } = this.app.waibu
-  const { createAggregate } = this.app.waibuDb
-  const { get, map, pick, pullAt } = this.app.lib._
-  const opts = map(get(schema, 'view.stat.aggregate', []), item => {
-    const dbOpts = pick(item, ['fields', 'group', 'aggregate'])
-    const name = item.name ?? `field.${item.fields[0]}`
-    return { name, dbOpts }
-  })
-  if (opts.length === 0) return []
-  const dropped = []
-  for (const idx in opts) {
-    const o = opts[idx]
-    try {
-      const resp = await createAggregate({ model: schema.name, req, reply, options: o.dbOpts })
-      const data = []
-      for (const d of resp.data) {
-        const key = o.dbOpts.fields[0]
-        data.push({
-          name: escape(d[key]),
-          value: d[key + 'Count']
-        })
-      }
-      opts[idx].chartOpts = base64JsonEncode({
-        tooltip: {
-          trigger: 'item'
-        },
-        series: [{
-          type: 'pie',
-          data
-        }]
-      })
-    } catch (err) {
-      dropped.push(idx)
-    }
-  }
-  if (dropped.length > 0) pullAt(opts, dropped)
-  return map(opts, o => {
-    return {
-      data: { setting: o.chartOpts, name: o.name },
-      resource: 'waibuDb.partial:/crud/~echarts-window.html'
-    }
-  })
-}
-
-export default addOnsHandler
+export async function addOnsHandler ({ req, reply, data, schema, options = {} }) {
+  const { escape } = this.app.waibu
+  const { base64JsonEncode } = this.app.waibu
+  const { createAggregate } = this.app.waibuDb
+  const { get, map, pick, pullAt } = this.app.lib._
+  const opts = map(get(schema, 'view.stat.aggregate', []), item => {
+    const dbOpts = pick(item, ['fields', 'group', 'aggregate'])
+    const name = item.name ?? `field.${item.fields[0]}`
+    return { name, dbOpts }
+  })
+  if (opts.length === 0) return []
+  const dropped = []
+  for (const idx in opts) {
+    const o = opts[idx]
+    try {
+      const resp = await createAggregate({ model: schema.name, req, reply, options: o.dbOpts })
+      const data = []
+      for (const d of resp.data) {
+        const key = o.dbOpts.fields[0]
+        data.push({
+          name: escape(d[key]),
+          value: d[key + 'Count']
+        })
+      }
+      opts[idx].chartOpts = base64JsonEncode({
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [{
+          type: 'pie',
+          data
+        }]
+      })
+    } catch (err) {
+      dropped.push(idx)
+    }
+  }
+  if (dropped.length > 0) pullAt(opts, dropped)
+  return map(opts, o => {
+    return {
+      data: { setting: o.chartOpts, name: o.name },
+      resource: 'waibuDb.partial:/crud/~echarts-window.html'
+    }
+  })
+}
+
+export async function attachmentHandler ({ schema, id, options = {} }) {
+  if (!schema.view.attachment) return []
+  const model = this.app.dobo.getModel(schema.name)
+  return await model.listAttachment({ id })
+}
+
+export function buildParams ({ model, req, reply, action, options = {} }) {
+  const { camelCase, kebabCase, map, upperFirst, get } = this.app.lib._
+  const [, ...names] = map(kebabCase(model).split('-'), n => upperFirst(n))
+  const mdl = this.app.dobo.getModel(model)
+  const prefix = this.app.waibuMpa ? this.app.waibuMpa.getPluginTitle(mdl.plugin.ns, req) : mdl.plugin.ns
+  const modelTitle = req.t(prefix) + ': ' + req.t(camelCase(names.join(' ')))
+  const page = {
+    title: req.t(get(req, 'routeOptions.config.title', this.app[mdl.plugin.ns].title)),
+    modelTitle
+  }
+  return { page }
+}
+
+export const notFoundTpl = 'waibuDb.template:/crud/not-found.html'

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

@@ -175,7 +175,7 @@ async function getSchemaExt (modelName, view, options = {}) {
 
   const model = isString(modelName) ? this.app.dobo.getModel(modelName) : modelName
   const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view', 'hidden'])
-  const base = path.basename(model.file, path.extname(model.file))
+  const base = options.base ?? path.basename(model.file, path.extname(model.file))
   let ext = await readConfig(`${model.plugin.ns}:/extend/waibuDb/schema/${base}.*`, { ignoreError: true, options })
   const over = await readConfig(`main:/extend/waibuDb/extend/${model.plugin.ns}/schema/${base}.*`, { ignoreError: true, options })
   ext = defaultsDeep(options.schema ?? {}, over, ext)

package/lib/util.js

@@ -57,7 +57,7 @@ export async function getOneRecord (model, id, filter, options) {
   const { cloneDeep } = this.app.lib._
   let query = cloneDeep(filter.query || {})
   query = { $and: [query, { id }] }
-  const data = await model.findOneRecord({ query }, { dataOnly: true, noHook: true, noDynHook: true, noModelHook: true, forceNoHidden: options.forceNoHidden, trx: options.trx })
+  const data = await model.findOneRecord({ query }, { dataOnly: true, forceNoHidden: options.forceNoHidden, trx: options.trx, req: options.req })
   if (!data && options.throwNotFound) throw this.error('_notFound')
   return data
 }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,8 +1,16 @@
 # Changes
 
+## 2026-03-15
+
+- [2.9.0] Add ability to overwrite ```base``` through ```options```
+- [2.9.0] Bug fix in ```wdb-btn-columns``` widget
+- [2.9.0] Bug fix in ```wdb-table``` widget
+
 ## 2026-03-08
 
 - [2.8.1] Bug fix in ```build-params.js```
+- [2.8.2] Bug fixes for record not found
+- [2.8.3] Compine all helpers into one single file ```helper.js```
 
 ## 2026-03-05
 

package/lib/crud/helper/attachment-handler.js

@@ -1,7 +0,0 @@
-async function attachmentHandler ({ schema, id, options = {} }) {
-  if (!schema.view.attachment) return []
-  const model = this.app.dobo.getModel(schema.name)
-  return await model.listAttachment({ id })
-}
-
-export default attachmentHandler

package/lib/crud/helper/build-params.js

@@ -1,14 +0,0 @@
-function buildParams ({ model, req, reply, action, options = {} }) {
-  const { camelCase, kebabCase, map, upperFirst, get } = this.app.lib._
-  const [, ...names] = map(kebabCase(model).split('-'), n => upperFirst(n))
-  const mdl = this.app.dobo.getModel(model)
-  const prefix = this.app.waibuMpa ? this.app.waibuMpa.getPluginTitle(mdl.plugin.ns, req) : mdl.plugin.ns
-  const modelTitle = req.t(prefix) + ': ' + req.t(camelCase(names.join(' ')))
-  const page = {
-    title: req.t(get(req, 'routeOptions.config.title', this.app[mdl.plugin.ns].title)),
-    modelTitle
-  }
-  return { page }
-}
-
-export default buildParams