waibu-db 1.2.3 → 1.2.5

package/bajo/intl/en-US.json

@@ -32,6 +32,9 @@
   "checkAll": "Check All",
   "uncheckAll": "Uncheck All",
   "attachment": "Attachment",
+  "exportInQueue": "Data export in queue. Please check your download list for progress",
+  "tsv": "TSV",
+  "ndjson": "NDJSON",
   "op": {
     "equals": "Equals",
     "notEquals": "Not Equals",

package/bajo/intl/id.json

@@ -32,6 +32,9 @@
   "checkAll": "Cek Semua",
   "uncheckAll": "Uncheck Semua",
   "attachment": "Attachment",
+  "exportInQueue": "Ekspor data sedang dalam antrian. Silahkan cek daftar unduh Anda untuk perkembangan terakhir",
+  "tsv": "TSV",
+  "ndjson": "NDJSON",
   "op": {
     "equals": "Sama Dengan",
     "notEquals": "Tidak Sama Dengan",

package/bajoTemplate/partial/crud/_details-btns.html

@@ -16,7 +16,7 @@
       <c:wdb-btn-clone href="<%= schema.view.control.cloneHref ?? 'undefined' %>" />
       <% } %>
       <% if (!schema.view.control.noExportBtn) { %>
-      <c:wdb-btn-export selector="#main-form" handler="details" launch-on-end/>
+      <c:wdb-btn-export selector="#main-form" handler="details" launch-on-end no-save/>
       <% } %>
     </c:btn-group>
     <% } %>

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

@@ -10,7 +10,7 @@
       <% if (!schema.view.control.noCloneBtn) { %>
       <c:wdb-btn-clone href="<%= schema.view.control.cloneHref ?? 'undefined' %>" />
       <% } %>
-      <c:wdb-btn-export selector="#main-form" handler="edit" launch-on-end/>
+      <c:wdb-btn-export selector="#main-form" handler="edit" launch-on-end no-save />
     </c:btn-group>
   </c:grid-col>
   <c:grid-col col="6-lg" flex="justify-content:end-lg align-items:center">

package/index.js

@@ -5,7 +5,7 @@ async function factory (pkgName) {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'wdb'
-      this.dependencies = ['dobo', 'waibu']
+      this.dependencies = ['dobo', 'waibu', 'bajo-queue', 'dobo-extra']
       this.config = {
         waibu: {
           prefix: 'db',
@@ -25,6 +25,33 @@ async function factory (pkgName) {
         modelRestApi: false
       }
     }
+
+    exportData = async (params) => {
+      const { getPlugin } = this.app.bajo
+      const { get } = this.lib._
+      const { fs } = this.lib
+      const { recordUpdate } = this.app.dobo
+      const { exportTo } = this.app.doboExtra
+      const { downloadDir } = getPlugin('sumba')
+      const model = get(params, 'payload.data.name')
+      const fields = get(params, 'payload.data.opts.fields')
+      const { id, file } = get(params, 'payload.data.download', {})
+      const dest = `${downloadDir}/${file}`
+      const options = {
+        filter: get(params, 'payload.data.filter', {}),
+        ensureDir: true,
+        fields
+      }
+      const dmodel = 'SumbaDownload'
+      try {
+        await recordUpdate(dmodel, id, { status: 'PROCESSING' })
+        await exportTo(model, dest, options)
+        const { size } = fs.statSync(dest)
+        await recordUpdate(dmodel, id, { size, status: 'COMPLETE' })
+      } catch (err) {
+        await recordUpdate(dmodel, id, { status: 'FAIL' })
+      }
+    }
   }
 }
 

package/lib/crud/add-handler.js

@@ -34,6 +34,8 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   }
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error }) : undefined
   merge(params, { form, schema, error, addOns })
+  if (schema.template) template = schema.template
+  if (schema.layout) params.page.layout = schema.layout
   return await reply.view(template, params)
 }
 

package/lib/crud/details-handler.js

@@ -16,6 +16,8 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema }) : undefined
   const attachments = await attachmentHandler.call(this, { schema, id })
   merge(params, { form, schema, addOns, attachments })
+  if (schema.template) template = schema.template
+  if (schema.layout) params.page.layout = schema.layout
   return await reply.view(template, params)
 }
 

package/lib/crud/edit-handler.js

@@ -45,6 +45,8 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error }) : undefined
   const attachments = await attachmentHandler.call(this, { schema, id })
   merge(params, { form, schema, error, addOns, attachments })
+  if (schema.template) template = schema.template
+  if (schema.layout) params.page.layout = schema.layout
   return await reply.view(template, params)
 }
 

package/lib/crud/export-handler.js

@@ -1,14 +1,27 @@
+import prepCrud from '../prep-crud.js'
+
 async function exportHandler ({ req, reply, model, params = {}, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+  const { getPlugin } = this.app.bajo
+  const { dayjs } = this.lib
+  const { omit, kebabCase, get } = this.lib._
   const { pascalCase } = this.lib.aneka
   const { getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const options = {}
+  const { pushDownload } = getPlugin('sumba')
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', options, { params })
+  const { schema } = await getSchemaExt(model, 'add', { params })
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
-  options.fields = schema.view.fields
+  const data = prepCrud.call(getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
+  data.opts = omit(data.opts, ['req', 'reply'])
+  const source = `${this.name}:/export-handler`
+  const worker = 'waibuDb:exportData'
+  const type = get(data, 'input.ftype', 'json')
+  const settings = get(data, 'input.options', '').split(',')
+  const ext = settings.includes('zip') ? `${type}.gz` : type
+  const file = `${kebabCase(model)}_${dayjs().format('YYYYMMDDhhmmss')}.${ext}`
+  await pushDownload({ file, type, worker, source, data, req })
+  req.flash('notify', req.t('exportInQueue'))
   const url = buildUrl({ url: req.url, base: req.body.handler })
-  req.flash('notify', req.t('Data export in queue. You\'ll be notified once completed'))
   return reply.redirectTo(url)
 }
 

package/lib/crud/list-handler.js

@@ -21,6 +21,8 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
     if (!isArray(addOns)) addOns = [addOns]
   }
   merge(params, { list, schema, addOns })
+  if (schema.template) template = schema.template
+  if (schema.layout) params.page.layout = schema.layout
   return await reply.view(template, params)
 }
 

package/lib/prep-crud.js

@@ -1,5 +1,6 @@
 function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   const { parseFilter } = this.app.waibu
+  const { buildQuery, getInfo } = this.app.dobo
   const { pascalCase } = this.lib.aneka
   const { cloneDeep, has } = this.lib._
   const cfgWeb = this.app.waibu.getConfig()
@@ -20,6 +21,7 @@ function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
 
   const recId = id ?? params.id ?? req.query.id
   const name = pascalCase(model ?? params.model)
+  const { schema } = getInfo(name)
   const input = body ?? params.body
   opts.bboxLatField = req.query[cfgWeb.qsKey.bboxLatField]
   opts.bboxLngField = req.query[cfgWeb.qsKey.bboxLngField]
@@ -28,6 +30,7 @@ function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   if (options.limit) filter.limit = options.limit
   if (options.sort) filter.sort = options.sort
   if (options.page) filter.page = options.page
+  filter.query = buildQuery({ filter, schema })
   return { name, recId, input, opts, filter, attachment, stats, mimeType }
 }
 

package/package.json

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

package/plugin-method/format-record.js

@@ -1,4 +1,4 @@
-async function formatRow ({ data, req, component, schema, options = {} }) {
+async function formatRow ({ data, req, schema, options = {} }) {
   const { get, find, isFunction, cloneDeep } = this.lib._
   const { format, callHandler } = this.app.bajo
   const fields = get(schema, 'view.fields', Object.keys(schema.properties))
@@ -19,25 +19,19 @@ async function formatRow ({ data, req, component, schema, options = {} }) {
     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(req ?? this, data[f], data)
-      else rec[f] = await callHandler(vf, req, data[f], data)
-    }
-    const formatter = get(schema, `view.formatter.${f}`)
-    if (formatter && component) {
-      if (isFunction(formatter)) rec[f] = await formatter.call(req ?? this, data[f], data)
-      else rec[f] = await callHandler(formatter, req, data[f], data)
-      rec[f] = await component.buildSentence(rec[f])
+      if (isFunction(vf)) rec[f] = await vf.call(this, data[f], data)
+      else rec[f] = await callHandler(vf, { req, value: data[f], data })
     }
   }
   return rec
 }
 
-async function formatRecord ({ data, req, schema, component, options = {} }) {
+async function formatRecord ({ data, req, schema, options = {} }) {
   const { isArray } = this.lib._
-  if (!isArray(data)) return await formatRow.call(this, { data, req, schema, component, options })
+  if (!isArray(data)) return await formatRow.call(this, { data, req, schema, options })
   const items = []
   for (const d of data) {
-    const item = await formatRow.call(this, { data: d, req, schema, component, options })
+    const item = await formatRow.call(this, { data: d, req, schema, options })
     items.push(item)
   }
   return items

package/waibuBootstrap/theme/component/factory/btn-export.js

@@ -29,15 +29,22 @@ async function btnExport () {
           ftype: 'json',
           toggle (val) {
             if (val === 'clipboard') {
+              $refs.fkey.removeAttribute('disabled')
+              $refs.fvalue.removeAttribute('disabled')
               $refs.zip.setAttribute('disabled', '')
               $refs.xlsx.setAttribute('disabled', '')
-              $refs.xml.setAttribute('disabled', '')
+              $refs.tsv.setAttribute('disabled', '')
+              $refs.ndjson.setAttribute('disabled', '')
               _.pull(this.options, 'zip')
               if (!['json', 'csv'].includes(this.ftype)) this.ftype = 'json'
             } else {
+              $refs.fkey.setAttribute('disabled', '')
+              $refs.fvalue.setAttribute('disabled', '')
               $refs.zip.removeAttribute('disabled')
               $refs.xlsx.removeAttribute('disabled')
-              $refs.xml.removeAttribute('disabled')
+              $refs.tsv.removeAttribute('disabled')
+              $refs.ndjson.removeAttribute('disabled')
+              _.pull(this.options, 'fkey', 'fvalue')
             }
           },
           extractForm (selector) {
@@ -117,8 +124,8 @@ async function btnExport () {
           <c:grid-row gutter="2">
             <c:grid-col col="6-md">
               <c:fieldset t:legend="delivery" legend-type="6">
-                <c:form-radio x-model="delivery" value="file" t:label="saveAsFile" />
                 <c:form-radio x-model="delivery" value="clipboard" t:label="copyClipboard" />
+                <c:form-radio x-model="delivery" value="file" t:label="saveAsFile" ${this.params.attr.noSave ? 'disabled' : ''} />
               </c:fieldset>
               <c:fieldset t:legend="options" legend-type="6" margin="top-2">
                 <c:form-check x-ref="fkey" x-model="options" value="fkey" t:label="formattedField" />
@@ -130,8 +137,9 @@ async function btnExport () {
               <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="xml" x-model="ftype" value="xml" t:label="xml" />
+                <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:fieldset />
             </c:grid-col>
           </c:grid-row>

package/waibuBootstrap/theme/component/factory/query.js

@@ -10,7 +10,6 @@ async function query () {
       const { find, get, without, isEmpty, filter, upperFirst } = this.plugin.app.bajo.lib._
       const qsKey = this.plugin.app.waibu.config.qsKey
       const schema = get(this, 'component.locals.schema', {})
-      const count = get(this, 'component.locals.list.count', 0)
       if (schema.view.disabled.includes('find')) {
         this.params.html = ''
         return
@@ -21,7 +20,6 @@ async function query () {
       const id = generateId('alpha')
       const columns = []
       const models = []
-      const selects = ['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'in', 'contains', 'starts', 'ends', '!in', '!contains', '!starts', '!ends']
       for (const f of schema.view.fields) {
         if (!fields.includes(f)) continue
         const prop = find(schema.properties, { name: f })
@@ -29,7 +27,7 @@ async function query () {
         if (['float', 'double', 'integer', 'smallint'].includes(prop.type)) ops.push('eq', 'neq', 'gt', 'gte', 'lt', 'lte')
         else if (['datetime', 'date', 'time'].includes(prop.type)) ops.push('eq', 'neq', 'gt', 'gte', 'lt', 'lte')
         else if (['boolean'].includes(prop.type)) ops.push('eq', 'neq')
-        else ops.push(...selects)
+        else ops.push('eq', 'neq', 'in', 'contains', 'starts', 'ends', '!in', '!contains', '!starts', '!ends')
         if (ops.length === 0) continue
         const sels = ops.map(o => `<c:option>${o}</c:option>`)
         models.push(`${f}Op: 'eq'`, `${f}Val: ''`)
@@ -51,12 +49,12 @@ async function query () {
       this.params.noTag = true
       const container = this.params.attr.modal ? 'modal' : 'drawer'
       this.params.html = await this.component.buildSentence(`
-        <c:form-input ${count === 0 ? 'disabled' : ''} type="search" t:placeholder="query" id="${id}" x-data="{ query: '' }" x-init="
+        <c:form-input type="search" t:placeholder="query" id="${id}" x-data="{ query: '' }" x-init="
           const url = new URL(window.location.href)
           query = url.searchParams.get('${qsKey.query}') ?? ''
         " x-model="query" @on-query.window="query = $event.detail ?? ''" @keyup.enter="$dispatch('on-submit')">
           <c:form-input-addon>
-            <c:${container} ${count === 0 ? 'trigger-disabled' : ''} trigger-icon="${this.params.attr.icon ?? 'dotsThree'}" trigger-on-end t:title="queryBuilder" x-ref="query" x-data="{
+            <c:${container} trigger-icon="${this.params.attr.icon ?? 'dotsThree'}" trigger-on-end t:title="queryBuilder" x-ref="query" x-data="{
               fields: ${jsonStringify(fields, true)},
               builder: '',
               selected: [],
@@ -70,6 +68,7 @@ async function query () {
               },
               initBuilder () {
                 this.builder = document.getElementById('${id}').value
+                if (!this.builder.includes(':')) this.builder = ''
                 if (_.isEmpty(this.builder)) return
                 const tokens = _.merge({}, this.ops, {
                   in: ':[',
@@ -158,7 +157,7 @@ async function query () {
             </c:${container}>
           </c:form-input-addon>
           <c:form-input-addon>
-            <c:btn ${count === 0 ? 'disabled' : ''} t:content="submit" x-data="{
+            <c:btn t:content="submit" x-data="{
               submit () {
                 const val = document.getElementById('${id}').value ?? ''
                 const url = new URL(window.location.href)

package/waibuBootstrap/theme/component/factory/table.js

@@ -19,19 +19,33 @@ async function table () {
       return get(schema, 'view.noWrap', []).includes(field)
     }
 
+    _defFormatter = async ({ req, key, value, data, schema }) => {
+      const { get, find } = this.plugin.lib._
+      const { escape } = this.plugin.app.waibu
+      const prop = find(schema.properties, { name: key })
+      if (!prop) return value
+      if (prop.type === 'boolean') {
+        value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${data[key] ? 'Check' : ''}` } })) +
+          ' ' + (req.t(data[key] ? 'Yes' : 'No'))
+      } else if (['string', 'text'].includes(prop.type)) {
+        if (!get(schema, 'view.noEscape', []).includes(key)) value = escape(value)
+      }
+      return value
+    }
+
     build = async () => {
       const { req } = this.component
       const { escape } = this.plugin.app.waibu
       const { formatRecord } = this.plugin.app.waibuDb
       const { attrToArray, groupAttrs } = this.plugin.app.waibuMpa
-      const { get, omit, set, find, isEmpty, without, merge } = this.plugin.app.bajo.lib._
+      const { get, omit, set, find, isEmpty, without, merge } = this.plugin.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
 
       const schema = get(this, 'component.locals.schema', {})
       const data = get(this, 'component.locals.list.data', [])
-      const fdata = await formatRecord.call(this.plugin, { data, req, schema, component: this.component })
+      const fdata = await formatRecord.call(this.plugin, { data, req, schema })
       const filter = get(this, 'component.locals.list.filter', {})
       const count = get(this, 'component.locals.list.count', 0)
       if (count === 0) {
@@ -136,16 +150,10 @@ async function table () {
             if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
           }
           let value = fd[f]
-          if (prop.type === 'boolean') {
-            value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${d[f] ? 'Check' : ''}` } })) +
-              ' ' + (req.t(d[f] ? 'Yes' : 'No'))
-          } else {
-            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' }
           const cellFormatter = get(schema, `view.cellFormatter.${f}`)
-          if (cellFormatter) merge(attr, await cellFormatter.call(req, dataValue, d))
+          if (cellFormatter) merge(attr, await cellFormatter.call(this, dataValue, d))
           const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
           if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
           else attr.text = noWrap
@@ -154,6 +162,9 @@ async function table () {
             const item = find(lookup.values, set({}, lookup.id ?? 'id', d[f]))
             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)
+          else value = await this._defFormatter({ req, key: f, schema, value, data: d })
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }

package/waibuMpa/sumba/route/export/@action.js

@@ -1,14 +0,0 @@
-const action = {
-  method: ['GET', 'POST'],
-  title: 'Database Export',
-  handler: async function (req, reply) {
-    const { importModule } = this.app.bajo
-    const handler = await importModule('waibuDb:/lib/crud/all-handler.js')
-    const model = 'SumbaUser'
-    const { action } = req.params
-    const template = `sumba.template:/crud/${action}.html`
-    return handler.call(this, { model, req, reply, action, template })
-  }
-}
-
-export default action