waibu-db 2.32.0 → 2.32.2

package/extend/bajo/intl/en-US.json

@@ -22,10 +22,10 @@
   "yes": "Yes",
   "no": "No",
   "db": "DB",
-  "excelXlsx": "Excel XLSX",
-  "csv": "CSV",
-  "xml": "XML",
-  "json": "JSON",
+  "fileXlsx": "Excel File",
+  "fileCsv": "CSV File",
+  "fileXml": "XML File",
+  "fileJson": "JSON File",
   "addMoreAfterSubmit": "Add more after submit",
   "clonePrevious": "Clone previous",
   "actionPermanentlyDisabled%s": "Sorry, action '%s' is permanently disabled at database level. For more information, please contact your Admin immediately, thank you!",
@@ -34,8 +34,8 @@
   "uncheckAll": "Uncheck All",
   "attachment": "Attachment",
   "exportInQueue": "Data export in queue. Please check your download list for progress",
-  "tsv": "TSV",
-  "ndjson": "NDJSON",
+  "fileTsv": "TSV File",
+  "fileNdjson": "NDJSON File",
   "dataValue": "Data value",
   "suppressedError": "Error occured and suppressed. Please check error log for details",
   "queryHint%s": "Search by %s",

package/extend/bajo/intl/id.json

@@ -22,10 +22,10 @@
   "yes": "Ya",
   "no": "Tidak",
   "db": "DB",
-  "excelXlsx": "Excel XLSX",
-  "csv": "CSV",
-  "xml": "XML",
-  "json": "JSON",
+  "fileXlsx": "Berkas Excel",
+  "fileCsv": "Berkas CSV",
+  "fileXml": "Berkas XML",
+  "fileJson": "Berkas JSON",
   "addMoreAfterSubmit": "Tambah lagi setelah kirim",
   "clonePrevious": "Duplikasi sebelumnya",
   "actionPermanentlyDisabled%s": "Sorry, action '%s' is permanently disabled at database level. For more information, please contact your Admin immediately, thank you!",
@@ -34,8 +34,8 @@
   "uncheckAll": "Uncheck Semua",
   "attachment": "Attachment",
   "exportInQueue": "Ekspor data sedang dalam antrian. Silahkan cek daftar unduh Anda untuk perkembangan terakhir",
-  "tsv": "TSV",
-  "ndjson": "NDJSON",
+  "fileTsv": "Berkas TSV",
+  "fileNdjson": "Berkas NDJSON",
   "dataValue": "Nilai data",
   "suppressedError": "Kesalahan terjadi dan tidak ditampilkan. Silahkan cek log kesalahan untuk detilnya",
   "queryHint%s": "Cari berdasarkan %s",

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

@@ -95,7 +95,7 @@ async function btnExport () {
           },
           async submit () {
             const instance = wbs.getInstance('Modal', $refs.export)
-            const handler = '${this.params.attr.handler ?? ''}'
+            const handler = '${this.params.attr.noBase ? '' : (this.params.attr.handler ?? '')}'
             if (this.delivery === 'clipboard') {
               const selector = '${this.params.attr.selector}'
               if (_.isEmpty(selector)) {
@@ -128,11 +128,11 @@ async function btnExport () {
             </c:grid-col>
             <c:grid-col col="6-md">
               <c:fieldset t:legend="fileType" legend-type="6">
-                <c:form-radio x-ref="xlsx" x-model="ftype" value="xlsx" t:label="excelXlsx" />
-                <c:form-radio x-ref="csv" x-model="ftype" value="csv" t:label="csv" />
-                <c:form-radio x-ref="tsv" x-model="ftype" value="tsv" t:label="tsv" />
-                <c:form-radio x-ref="json" x-model="ftype" value="json" t:label="json" />
-                <c:form-radio x-ref="ndjson" x-model="ftype" value="ndjson" t:label="ndjson" />
+                <c:form-radio x-ref="xlsx" x-model="ftype" value="xlsx" t:label="fileXlsx" />
+                <c:form-radio x-ref="csv" x-model="ftype" value="csv" t:label="fileCsv" />
+                <c:form-radio x-ref="tsv" x-model="ftype" value="tsv" t:label="fileTsv" />
+                <c:form-radio x-ref="json" x-model="ftype" value="json" t:label="fileJson" />
+                <c:form-radio x-ref="ndjson" x-model="ftype" value="ndjson" t:label="fileNdjson" />
               </c:fieldset />
             </c:grid-col>
           </c:grid-row>

package/index.js

@@ -87,34 +87,17 @@ async function factory (pkgName) {
      */
     exportData = async (params) => {
       const { get } = this.app.lib._
-      const { fs } = this.app.lib
       const { exportTo } = this.app.doboExtra
       const model = get(params, 'payload.data.name')
       const fields = get(params, 'payload.data.opts.fields')
-      const { id, file } = get(params, 'payload.data.download', {})
+      const file = get(params, 'payload.data.file', {})
       const options = {
         filter: get(params, 'payload.data.filter', {}),
         exportOpts: get(params, 'payload.data.exportOpts', []),
         opts: get(params, 'payload.data.opts', {}),
         fields
       }
-      options.filter.sort = 'id:1' // TODO: make this configurable
-      if (!this.app.sumba || !id) {
-        const result = await exportTo(model, file, options)
-        return result.file
-      }
-      const dmodel = this.app.dobo.getModel('SumbaDownload')
-      let dest
-      try {
-        await dmodel.updateRecord(id, { status: 'PROCESSING' })
-        const result = await exportTo(model, file, options)
-        dest = result.file
-        const { size } = fs.statSync(dest)
-        await dmodel.updateRecord(id, { size, status: 'COMPLETE' })
-      } catch (err) {
-        await dmodel.updateRecord(id, { status: 'FAIL' })
-      }
-      return dest
+      return await exportTo(model, file, options)
     }
 
     /**

package/lib/crud/export-handler.js

@@ -36,23 +36,29 @@ async function exportHandler (opts = {}) {
   const mdl = this.app.dobo.getModel(model)
   const { schema } = await getSchemaExt(model, 'add', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
-  const data = await prepCrud.call(this.app.getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
-  data.opts = omit(data.opts, ['req', 'reply'])
+  const crud = await prepCrud.call(this.app.getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
+  const data = {
+    name: model,
+    filter: crud.filter,
+    opts: omit(crud.opts, ['req', 'reply', 'model'])
+  }
   data.opts.lang = req.lang
   data.opts.fields = isEmpty(req.query.fields) ? get(schema, 'view.fields', []) : req.query.fields.split(',')
 
-  data.opts.timeZone = get(req, 'site.setting.sumba.timeZone', this.app.bajo.config.intl.format.datetime.timeZone)
-  data.opts.dateStyle = get(req, 'site.setting.sumba.dateStyle', this.app.bajo.config.intl.format.datetime.dateStyle)
-  data.opts.timeStyle = get(req, 'site.setting.sumba.timeStyle', this.app.bajo.config.intl.format.datetime.timeStyle)
-  const source = `${this.name}:/export-handler`
-  const worker = 'waibuDb:exportData'
-  const type = get(data, 'input.ftype', 'json')
-  data.exportOpts = get(data, 'input.options', '').split(',')
+  data.opts.datetime = get(opts, 'req.site.setting.bajo.intl.datetime', this.app.bajo.config.intl.datetime)
+  data.opts.date = get(opts, 'req.site.setting.bajo.intl.date', this.app.bajo.config.intl.date)
+  data.opts.time = get(opts, 'req.site.setting.bajo.intl.time', this.app.bajo.config.intl.time)
+  data.opts.timeZone = get(opts, 'req.site.setting.bajo.intl.timeZone', this.app.bajo.config.intl.timeZone)
+
+  const source = `${this.ns}:/export-handler`
+  const worker = `${this.ns}:exportData`
+  const type = get(crud, 'input.ftype', 'json')
+  data.exportOpts = get(crud, 'input.options', '').split(',')
   const ext = data.exportOpts.includes('zip') ? `${type}.gz` : type
-  // const file = `${kebabCase(model)}_${dayjs().format('YYYYMMDDhhmmss')}.${ext}`
   const file = `${kebabCase(model)}.${ext}`
   if (this.app.sumba) {
-    await this.app.sumba.download({ file, type, worker, source, data, req })
+    const description = kebabCase(model).split('-').map(w => w.charAt(0).toUpperCase() + w.slice(1)).join(' ')
+    await this.app.sumba.pushDownload({ file, description, type, worker, source, data, req })
     req.flash('notify', req.t('exportInQueue'))
   } else {
     const _opts = {
@@ -62,7 +68,7 @@ async function exportHandler (opts = {}) {
           opts: data.opts,
           exportOpts: data.exportOpts,
           filter: data.filter,
-          download: { file }
+          file
         }
       }
     }
@@ -70,7 +76,8 @@ async function exportHandler (opts = {}) {
     const { download } = await importModule('waibu:/lib/helper.js', { asDefaultImport: false })
     await download.call(this, destFile, req, reply, file)
   }
-  const url = buildUrl({ url: req.url, base: req.body.handler })
+  const base = isEmpty(req.body.handler) ? undefined : req.body.handler
+  const url = buildUrl({ url: req.url, base })
   return reply.redirectTo(url)
 }
 

package/lib/method/create-record.js

@@ -1,11 +1,11 @@
 import { prepCrud, processHandler } from '../util.js'
 
-async function createRecord ({ model, req, reply, options = {}, transaction } = {}) {
+async function createRecord ({ model, req, body, reply, options = {}, transaction } = {}) {
   const { model: mdl, opts, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx
-    const ret = await mdl.createRecord(req.body, { ...opts, partial: true, strict: true })
+    const ret = await mdl.createRecord(body ?? req.body, { ...opts, partial: true, strict: true })
     if (attachment) ret.data._attachment = await mdl.findAttachment(ret.data.id, { stats, mimeType })
     return ret
   }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 2026-07-29
+
+- [2.32.2] Bug fix in `export-handler.js`
+
+## 2026-07-28
+
+- [2.32.1] Bug fix in `exportData()`
+- [2.32.1] Bug fix in `btn-export.js`
+- [2.32.1] Bug fix in `export-handler.js`
+- [2.32.1] Bug fix in `create-record.js`
+
 ## 2026-07-27
 
 - [2.32.0] Add support for `sumba.download()` through `export-handler.js`