waibu-db 2.17.2 → 2.18.1

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

@@ -116,27 +116,21 @@ async function table () {
         const lines = []
         if (selection) {
           const tag = selection === 'single' ? 'formRadio' : 'formCheck'
-          const attr = { 'x-model': 'selected', name: '_rt', value: d._orig.id, noLabel: true, noWrapper: true }
+          const attr = { 'x-model': 'selected', name: '_rt', value: d.id, noLabel: true, noWrapper: true }
           const type = find(schema.properties, { name: 'id' }).type
-          const prepend = `<td data-value="${d._orig.id}" data-key="id" data-type="${type}">`
+          const prepend = `<td data-value="${d.id}" data-key="id" data-type="${type}">`
           lines.push(await this.component.buildTag({ tag, attr, prepend, append: '</td>' }))
         }
         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 })
+          const prop = find(schema.properties, { name: f })
           if (!prop) continue
-          let dataValue = d._orig[f]
+          let dataValue = d[f]
           if (['datetime'].includes(prop.type) && dataValue instanceof Date && !isNaN(dataValue)) dataValue = escape(dataValue.toISOString())
           else if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
           else if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(dataValue))
           const refName = get(schema, `view.widget.${f}.attr.refName`)
-          let value = this.getRefValue({ field: f, data: d, refName }) ?? d[f]
-          const formatValue = get(schema, `view.formatValue.${f}`)
-          if (formatValue) {
-            value = await formatValue.call(this, value, d, { params: this.params, req })
-            dataValue = value
-          }
+          let value = this.getRefValue({ field: f, data: d, refName }) ?? get(d, `_fmt.${f}`, d[f])
           if (!get(schema, 'view.noEscape', []).includes(f)) value = escape(value)
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
@@ -150,9 +144,9 @@ async function table () {
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }
-        const attr = { id: `rec-${d._orig.id}` }
-        if (!disableds.includes('update') || !disableds.includes('remove') || !disableds.includes('get')) attr['@click'] = `toggle('${d._orig.id}')`
-        if (!disableds.includes('get')) attr['@dblclick'] = `goDetails('${d._orig.id}')`
+        const attr = { id: `rec-${d.id}` }
+        if (!disableds.includes('update') || !disableds.includes('remove') || !disableds.includes('get')) attr['@click'] = `toggle('${d.id}')`
+        if (!disableds.includes('get')) attr['@dblclick'] = `goDetails('${d.id}')`
         items.push(await this.component.buildTag({ tag: 'tr', attr, html: lines.join('\n') }))
       }
       html.push(await this.component.buildTag({ tag: 'tbody', attr: group.body, html: items.join('\n') }))

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

@@ -12,11 +12,10 @@ async function form () {
       const { get, has } = this.app.lib._
       const { stringifyAttribs } = this.app.waibuMpa
       attr.dataType = prop.type
-      const cmp = prop.ref ? 'wdb-lookup-select' : widget.component
       if (has(attr, 'name') && !has(attr, 'value')) {
-        attr.value = cmp === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
+        attr.value = widget.component === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
       }
-      return `<c:${cmp} ${stringifyAttribs(attr)} />`
+      return `<c:${widget.component} ${stringifyAttribs(attr)} />`
     }
 
     build = async () => {

package/extend/waibuBootstrap/theme/component/widget/lookup-select.js

@@ -21,10 +21,10 @@ async function lookupSelect () {
       }
 
       this.params.attr.url = this.params.attr.url ?? `waibuDb.restapi:/lookup/${kebabCase(ref.model)}`
-      const omitted = ['url', 'searchField', 'labelField', 'valueField']
-      const attr = omit(this.params.attr, omitted)
-      for (const k of omitted) {
-        attr[camelCase(`remote ${k}`)] = this.params.attr[k] ?? ref[k]
+      const keys = ['url', 'searchField', 'labelField', 'valueField']
+      const attr = omit(this.params.attr, keys)
+      for (const k of keys) {
+        attr[camelCase(`remote ${k}`)] = this.params.attr[k] ?? ref[k] ?? ref.field
       }
       const q = set({}, this.params.attr.searchField ?? get(ref, 'searchField', 'id'), ['__REGEXP__', '{searchItem}', 'i'])
       attr.remoteQuery = base64JsonEncode({ $and: [parseQuery(get(ref, 'query', {})), q] })
@@ -32,7 +32,7 @@ async function lookupSelect () {
       attr.clearBtn = true
       const sentence = `<c:form-select-ext ${Object.entries(attr).map(([k, v]) => `${kebabCase(k)}="${v}"`).join(' ')} />`
       this.params.html = await this.component.buildSentence(sentence, this.component.locals)
-      this.params.attr = omit(this.params.attr, ['model', 'field', ...omitted])
+      this.params.attr = omit(this.params.attr, ['model', 'field', ...keys])
     }
   }
 }

package/extend/waibuRestApi/route/@model/@id/get.js

@@ -1,5 +1,5 @@
-async function get (req, reply) {
-  return await this.getRecord({ req, reply })
+async function get (req, reply, options) {
+  return await this.getRecord({ req, reply, options, transaction: true })
 }
 
 export default get

package/extend/waibuRestApi/route/@model/@id/remove.js

@@ -1,5 +1,5 @@
-async function remove (req, reply) {
-  return await this.removeRecord({ req, reply })
+async function remove (req, reply, options) {
+  return await this.removeRecord({ req, reply, options, transaction: true })
 }
 
 export default remove

package/extend/waibuRestApi/route/@model/@id/update.js

@@ -1,5 +1,5 @@
-async function update (req, reply) {
-  return await this.updateRecord({ req, reply })
+async function update (req, reply, options) {
+  return await this.updateRecord({ req, reply, options, transaction: true })
 }
 
 export default update

package/extend/waibuRestApi/route/@model/create.js

@@ -1,5 +1,5 @@
-async function create (req, reply) {
-  return await this.createRecord({ req, reply })
+async function create (req, reply, options) {
+  return await this.createRecord({ req, reply, options, transaction: true })
 }
 
 export default create

package/extend/waibuRestApi/route/@model/find.js

@@ -1,5 +1,5 @@
-async function find (req, reply) {
-  return await this.findRecord({ req, reply })
+async function find (req, reply, options) {
+  return await this.findRecord({ req, reply, options, transaction: true })
 }
 
 export default find

package/extend/waibuRestApi/route/@model/stat/@stat/find.js

@@ -1,8 +1,8 @@
-async function stat (req, reply) {
+async function stat (req, reply, options) {
   const { camelCase } = this.app.lib._
   const method = camelCase(`create ${req.params.stat}`)
   if (!this[method]) throw this.error('_notFound')
-  return await this[method]({ req, reply })
+  return await this[method]({ req, reply, options })
 }
 
 export default stat

package/index.js

@@ -167,53 +167,6 @@ async function factory (pkgName) {
       return await this.findAllRecord({ model, req, options })
     }
 
-    formatRecord = async ({ data, req, schema, options = {} }) => {
-      const { isArray } = this.app.lib._
-      if (!isArray(data)) return await this.formatRow({ data, req, schema, options })
-      const items = []
-      for (const d of data) {
-        const item = await this.formatRow({ data: d, req, schema, options })
-        items.push(item)
-      }
-      return items
-    }
-
-    formatRow = async ({ data, req, schema, options = {} }) => {
-      const { get, find, isFunction, cloneDeep } = this.app.lib._
-      const { format, callHandler } = this.app.bajo
-      const { escape } = this.app.waibu
-      const fields = get(schema, 'view.fields', Object.keys(schema.properties))
-      const rec = cloneDeep(data)
-      const lang = get(req, 'lang')
-      const unitSys = get(req, 'site.setting.sumba.unitSys')
-      const timeZone = get(req, 'site.setting.sumba.timeZone', this.app.bajo.config.intl.format.datetime.timeZone)
-      for (const f of fields) {
-        if (f === '_ref') continue
-        let prop = find(schema.properties, { name: f })
-        if (!prop) prop = find(schema.view.calcFields, { name: f })
-        if (!prop) continue
-        const opts = {
-          lang: options.lang ?? lang,
-          longitude: ['lng', 'longitude'].includes(f),
-          latitude: ['lat', 'latitude'].includes(f),
-          speed: ['speed'].includes(f),
-          degree: ['course', 'heading'].includes(f),
-          distance: ['distance'].includes(f),
-          unitSys: options.unitSys ?? unitSys,
-          datetime: options.datetime ?? { timeZone },
-          date: options.date ?? { timeZone },
-          time: options.time ?? { timeZone }
-        }
-        rec[f] = format(data[f], prop.type, opts)
-        const vf = get(schema, `view.formatValue.${f}`)
-        if (vf) {
-          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])
-      }
-      return rec
-    }
-
     countRecord = countRecord
     createAggregate = createAggregate
     createHistogram = createHistogram

package/lib/crud/add-handler.js

@@ -17,7 +17,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
     const omitted = ['id', 'createdAt', 'updatedAt']
     if (req.query.mode === 'clone' && req.query.id) {
       const resp = await getRecord({ model, req, id: req.query.id, options: { fields: map(schema.properties, 'name'), ...opts } })
-      def = omit(resp.data._orig, omitted)
+      def = omit(resp.data, omitted)
     } else {
       const picked = map(schema.properties, 'name')
       def = omit(pick(req.query, picked), omitted)

package/lib/crud/all-handler.js

@@ -20,8 +20,7 @@ async function allHandler ({ model, action, req, reply, template, params = {}, o
   const { upperFirst, merge, keys } = this.app.lib._
   if (!keys(handler).includes(action)) throw this.error('_notFound')
   options.modelOpts = options.modelOpts ?? {}
-  options.modelOpts.formatValue = true
-  options.modelOpts.retainOriginalValue = true
+  options.modelOpts.fmt = true
   if (['delete', 'export'].includes(action)) {
     if (req.method === 'GET') throw this.error('_notFound')
     return await handler[action].call(this, { model, req, reply, options })

package/lib/crud/edit-handler.js

@@ -23,7 +23,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   const old = await getRecord({ model, req, id, options: opts })
   if (isEmpty(old.data)) return await reply.view(notFoundTpl, params)
   opts._data = old
-  const def = cloneDeep(old.data._orig)
+  const def = cloneDeep(old.data)
   for (const k in def) {
     if (isArray(def[k]) || isPlainObject(def[k])) def[k] = JSON.stringify(def[k])
   }

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

@@ -7,12 +7,10 @@ const defFormatter = {}
 function getCommons (action, schema, ext, options = {}) {
   const { defaultsDeep } = this.app.lib.aneka
   const { merge, map, get, set, without, uniq, pull } = this.app.lib._
-  const calcFields = get(ext, `view.${action}.calcFields`, get(ext, 'common.calcFields', []))
   const forceVisible = get(ext, `view.${action}.forceVisible`, get(ext, 'common.forceVisible', []))
   const widget = defaultsDeep(get(ext, `view.${action}.widget`), get(ext, 'common.widget', {}))
   const noEscape = get(ext, `view.${action}.noEscape`, get(ext, 'common.noEscape', []))
   const control = defaultsDeep(get(ext, `view.${action}.control`), get(ext, 'common.control', {}))
-  const formatValue = defaultsDeep(get(ext, `view.${action}.formatValue`), get(ext, 'common.formatValue', {}))
   const formatCell = defaultsDeep(get(ext, `view.${action}.formatCell`), get(ext, 'common.formatCell', {}))
   const format = defaultsDeep(get(ext, `view.${action}.format`), get(ext, 'common.format', {}))
   const card = get(ext, `view.${action}.card`, get(ext, 'common.card', true))
@@ -20,7 +18,7 @@ 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', []))
-  let attachment = get(ext, `view.${action}.attachment`, get(ext, 'common.attachment', false))
+  let attachment = get(ext, `view.${action}.attachment`, get(ext, 'common.attachment', schema.attachment))
   if (!schema.attachment || action === 'list') attachment = false
   hidden.push('siteId', ...schema.hidden, ...(options.hidden ?? []))
   hidden = uniq(hidden)
@@ -28,10 +26,8 @@ function getCommons (action, schema, ext, options = {}) {
   const allFields = without(map(schema.properties, 'name'), ...hidden)
   const forFields = get(ext, `view.${action}.fields`, get(ext, 'common.fields', allFields))
   set(schema, 'view.attachment', attachment)
-  set(schema, 'view.calcFields', calcFields)
   set(schema, 'view.noEscape', noEscape)
   set(schema, 'view.widget', widget)
-  set(schema, 'view.formatValue', formatValue)
   set(schema, 'view.formatCell', formatCell)
   set(schema, 'view.format', merge({}, defFormatter, format))
   set(schema, 'view.stat.aggregate', aggregate)
@@ -40,9 +36,8 @@ function getCommons (action, schema, ext, options = {}) {
   set(schema, 'view.x', x)
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
   let fields = []
-  const calcFieldNames = map(calcFields, 'name')
   for (const f of forFields) {
-    if (calcFieldNames.includes(f) || allFields.includes(f)) fields.push(f)
+    if (allFields.includes(f)) fields.push(f)
   }
   fields = uniq(without(fields, ...hidden))
 
@@ -52,7 +47,7 @@ function getCommons (action, schema, ext, options = {}) {
   if (noWrap === true) noWrap = fields
   else if (noWrap === false) noWrap = []
   set(schema, 'view.noWrap', noWrap)
-  return { fields, allFields, card, calcFields }
+  return { fields, allFields, card }
 }
 
 function autoLayout ({ action, schema, ext, layout }) {
@@ -91,14 +86,13 @@ function customLayout ({ action, schema, ext, layout, readonly }) {
 
 function applyLayout (action, schema, ext) {
   const { defaultsDeep } = this.app.lib.aneka
-  const { set, get, isEmpty, find, kebabCase } = this.app.lib._
-  const { fields, card, calcFields } = getCommons.call(this, action, schema, ext)
+  const { set, get, isEmpty, find } = this.app.lib._
+  const { fields, card } = getCommons.call(this, action, schema, ext)
   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 = {}
   for (const f of fields) {
-    let prop = find(schema.properties, { name: f })
-    if (!prop) prop = find(calcFields, { name: f })
+    const prop = find(schema.properties, { name: f })
     if (!prop) continue
     const result = schema.view.widget[f] ?? {}
     result.name = result.name ?? f
@@ -111,8 +105,11 @@ function applyLayout (action, schema, ext) {
     if (action === 'details') {
       result.component = 'form-plaintext'
     } else {
+      if (prop.ref) {
+        result.component = result.component ?? 'wdb-lookup-select'
+      }
       if (prop.type === 'boolean') {
-        result.component = 'form-select'
+        result.component = result.component ?? 'form-select'
         result.attr.options = 'false:no;true:yes'
       }
       if (prop.values) {
@@ -126,6 +123,7 @@ function applyLayout (action, schema, ext) {
       if (readonly.includes(f)) result.component = 'form-plaintext'
       if (!result.component) result.component = 'form-input'
     }
+    /*
     for (const k in result.attr ?? {}) {
       const newKey = kebabCase(k)
       if (k !== newKey) {
@@ -133,6 +131,7 @@ function applyLayout (action, schema, ext) {
         delete result.attr[k]
       }
     }
+    */
     widget[f] = result
   }
   set(schema, 'view.widget', widget)
@@ -182,7 +181,7 @@ async function getSchemaExt (modelName, view, options = {}) {
 
   const model = isString(modelName) ? this.app.dobo.getModel(modelName) : modelName
   const ns = model.plugin.ns
-  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'scanables', 'view', 'hidden'])
+  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'scanables', 'view', 'hidden', 'attachment'])
   const base = options.base ?? path.basename(model.file, path.extname(model.file))
   const parserOpts = { args: options.args }
   let ext = await readConfig(`${ns}:/extend/waibuDb/schema/${base}.*`, { ns, baseNs: 'waibuDb', parserOpts })

package/lib/util.js

@@ -38,7 +38,7 @@ export async function prepCrud ({ model, id, req, reply, transaction, options =
 
   const recId = id ?? params.id ?? req.query.id
   let mdl = model
-  if (isString(model)) {
+  if (!model || isString(model)) {
     model = model ?? pascalCase(params.model)
     mdl = this.app.dobo.getModel(model)
   }
@@ -59,7 +59,7 @@ export async function getOneRecord (model, id, filter, options) {
   const { cloneDeep, pick, isEmpty } = this.app.lib._
   let query = cloneDeep(filter.query || {})
   query = { $and: [query, { id }] }
-  const opts = pick(options, ['forceNoHidden', 'trx', 'req', 'refs', 'formatValue', 'retainOriginalValue'])
+  const opts = pick(options, ['forceNoHidden', 'trx', 'req', 'refs', 'fmt'])
   opts.dataOnly = false
   const data = await model.findOneRecord({ query }, opts)
   if (isEmpty(data.data) && options.throwNotFound) throw this.error('_notFound')

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+## 2026-04-25
+
+- [2.18.0] Change options to format value using the new key set by dobo
+- [2.18.0] Remove ```options.retainOriginalValue``` since it is not needed anymore
+- [2.18.0] Add all necessary ```options``` for all auto generated api endpoints
+
 ## 2026-04-23
 
 - [2.17.2] Bug fix in ```getSchemaExt()```