waibu-db 1.1.19 → 1.1.20

package/bajo/intl/en-US.json

@@ -29,6 +29,9 @@
   "clonePrevious": "Clone previous",
   "actionPermanentlyDisabled%s": "Sorry, action '%s' is permanently disabled at database level. For more information, please contact your Admin immediately, thank you!",
   "dbModels": "Database Models",
+  "checkAll": "Check All",
+  "uncheckAll": "Uncheck All",
+  "attachment": "Attachment",
   "op": {
     "equals": "Equals",
     "notEquals": "Not Equals",

package/bajo/intl/id.json

@@ -29,6 +29,9 @@
   "clonePrevious": "Duplikasi sebelumnya",
   "actionPermanentlyDisabled%s": "Sorry, action '%s' is permanently disabled at database level. For more information, please contact your Admin immediately, thank you!",
   "dbModels": "Model Database",
+  "checkAll": "Cek Semua",
+  "uncheckAll": "Uncheck Semua",
+  "attachment": "Attachment",
   "op": {
     "equals": "Sama Dengan",
     "notEquals": "Tidak Sama Dengan",

package/bajoTemplate/partial/crud/_add-attachment.html

@@ -0,0 +1,3 @@
+<c:fieldset id="attachment" <%= schema.view.card === false ? '' : 'card' %> t:legend="attachment" grid-gutter="3">
+  <c:form-file name="file" multiple no-label <%= _.isString(schema.view.attachment) ? ('accept="' + schema.view.attachment + '"') : '' %> />
+</c:fieldset>

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

@@ -0,0 +1,3 @@
+<c:fieldset <%= schema.view.card === false ? '' : 'card' %> t:legend="attachment" grid-gutter="3">
+  <!-- include waibuDb.partial:/crud/_list-attachment.html|<%= JSON.stringify({ readonly: true }) %> -->
+</c:fieldset>

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

@@ -0,0 +1,43 @@
+<c:fieldset id="attachment" t:legend="attachment" grid-gutter="3"
+  x-data="{
+    selected: [],
+    checkAll (check = true) {
+      if (!check) {
+        this.selected = []
+        return
+      }
+      const all = document.querySelectorAll('#attachment input[type=checkbox]')
+      this.selected = _.map(all, item => item.value)
+    },
+    toggleBtn () {
+      const el = this.$refs.removeatt
+      if (this.selected.length > 0) el.classList.remove('disabled')
+      else el.classList.add('disabled')
+    },
+    remove () {
+      this.$refs.action.value = 'removeatt'
+      this.$refs.value.value = JSON.stringify(this.selected)
+      document.getElementById('main-form').submit()
+    }
+  }"
+  x-init="$watch('selected', val => toggleBtn())"
+  <%= schema.view.card === false ? '' : 'card' %>
+>
+  <input x-ref="action" type="hidden" name="_action" />
+  <input x-ref="value" type="hidden" name="_value" />
+  <c:grid-col col="12">
+    <c:grid-row gutter="3">
+      <c:grid-col col="8-md 12-sm">
+        <c:form-file name="file" multiple no-label <%= _.isString(schema.view.attachment) ? ('accept="' + schema.view.attachment + '"') : '' %> />
+      </c:grid-col>
+      <c:grid-col col="4-md 12-sm" flex="align-items:center">
+        <c:btn-group margin="end-2">
+          <c:btn size="sm" color="secondary-outline" t:content="checkAll" @click="checkAll()"/>
+          <c:btn size="sm" color="secondary-outline" t:content="uncheckAll" @click="checkAll(false)"/>
+        </c:btn-group>
+        <c:btn margin="end-2" size="sm" class="disabled" x-ref="removeatt" color="danger-outline" t:content="Remove" @click="remove()"/>
+      </c:grid-col>
+    </c:grid-row>
+  </c:grid-col>
+  <!-- include waibuDb.partial:/crud/_list-attachment.html -->
+</c:fieldset>

package/bajoTemplate/partial/crud/_list-attachment.html

@@ -0,0 +1,9 @@
+<% for (const att of attachments) { %>
+<c:grid-col col="4-lg 6-md">
+  <% if (attr.readonly) { %>
+  <a href="<%= decodeURI(att.url) %>" target="_blank"><%= att.fileName %></a>
+  <% } else { %>
+  <c:form-check x-model="selected" value="<%= att.fullPath %>" label="<a href='<%= att.url %>' target='_blank'><%= att.fileName %></a>" />
+  <% } %>
+</c:grid-col>
+<% } %>

package/bajoTemplate/partial/crud/add-handler.html

@@ -1,4 +1,7 @@
 <c:wdb-form id="main-form" method="POST" enctype="multipart/form-data">
+  <% if (schema.view.attachment) { %>
+  <!-- include waibuDb.partial:/crud/_add-attachment.html -->
+  <% } %>
   <!-- include waibuDb.partial:/crud/_add-btns.html -->
 </c:wdb-form>
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/bajoTemplate/partial/crud/details-handler.html

@@ -1,3 +1,7 @@
-<c:wdb-form tag="div" id="main-form" />
+<c:wdb-form tag="div" id="main-form">
+  <% if (schema.view.attachment) { %>
+  <!-- include waibuDb.partial:/crud/_details-attachment.html -->
+  <% } %>
+</c:wdb-form>
 <!-- include waibuDb.partial:/crud/_details-btns.html -->
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/bajoTemplate/partial/crud/edit-handler.html

@@ -1,4 +1,7 @@
 <c:wdb-form id="main-form" method="POST" enctype="multipart/form-data">
+  <% if (schema.view.attachment) { %>
+  <!-- include waibuDb.partial:/crud/_edit-attachment.html -->
+  <% } %>
   <!-- include waibuDb.partial:/crud/_edit-btns.html -->
 </c:wdb-form>
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/lib/crud/details-handler.js

@@ -1,3 +1,5 @@
+import attachmentHandler from './helper/attachment-handler.js'
+
 async function detailsHandler ({ req, reply, model, params = {}, id, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
   const { pascalCase } = this.app.bajo
   const { recordGet, getSchemaExt } = this.app.waibuDb
@@ -12,7 +14,8 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const resp = await recordGet({ model, req, id, options })
   const form = resp.data
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema }) : undefined
-  merge(params, { form, schema, addOns })
+  const attachments = await attachmentHandler.call(this, { schema, id })
+  merge(params, { form, schema, addOns, attachments })
   return reply.view(template, params)
 }
 

package/lib/crud/edit-handler.js

@@ -1,33 +1,48 @@
+import attachmentHandler from './helper/attachment-handler.js'
+
 async function editHandler ({ req, reply, model, id, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
-  const { pascalCase } = this.app.bajo
+  const { pascalCase, getPluginDataDir } = this.app.bajo
   const { recordUpdate, recordGet, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { merge, defaultsDeep } = this.lib._
+  const { fs } = this.lib
+  const { merge, defaultsDeep, isEmpty, omit } = this.lib._
   const options = {}
+  let error
+  let resp
+  let form
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'edit', options, { params })
   if (schema.disabled.includes('update')) return reply.view(templateDisabled, { action: 'edit' })
   // req.query.attachment = true
   options.fields = schema.view.fields
-  let error
-  let resp
-  let form
   id = id ?? req.params.id ?? req.query.id
   if (req.method === 'GET') {
     const old = await recordGet({ model, req, id, options })
     form = defaultsDeep(req.body, old.data)
   } else {
-    form = req.body
-    try {
-      resp = await recordUpdate({ model, req, id, reply, options })
-      form = resp.data
-      return reply.redirectTo(buildUrl({ url: req.url, base: req.params.base ?? req.query.base ?? 'list', params: { page: 1 }, exclude: ['id'] }))
-    } catch (err) {
-      error = err
+    form = omit(req.body, ['_action', '_value'])
+    if (req.body._action === 'removeatt' && !isEmpty(req.body._value)) {
+      const root = `${getPluginDataDir('dobo')}/attachment`
+      for (const item of req.body._value) {
+        try {
+          const file = `${root}/${item}`
+          await fs.unlink(file)
+        } catch (err) {}
+      }
+      if (req && req.flash) req.flash('notify', req.t('attachmentRemoved'))
+    } else {
+      try {
+        resp = await recordUpdate({ model, req, id, reply, options })
+        form = resp.data
+        return reply.redirectTo(buildUrl({ url: req.url, base: req.params.base ?? req.query.base ?? 'list', params: { page: 1 }, exclude: ['id'] }))
+      } catch (err) {
+        error = err
+      }
     }
   }
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error }) : undefined
-  merge(params, { form, schema, error, addOns })
+  const attachments = await attachmentHandler.call(this, { schema, id })
+  merge(params, { form, schema, error, addOns, attachments })
   return reply.view(template, params)
 }
 

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

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

package/package.json

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

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

@@ -19,11 +19,14 @@ function getCommons (action, schema, ext, opts = {}) {
   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))
+  if (!schema.attachment || action === 'list') attachment = false
   hidden.push('siteId', ...schema.hidden, ...(opts.hidden ?? []))
   hidden = uniq(hidden)
   pull(hidden, ...forceVisible)
   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)