waibu-db 1.2.8 → 1.2.10

package/bajo/intl/en-US.json

@@ -28,7 +28,7 @@
   "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!",
-  "dbModels": "Database Models",
+  "dbModels": "Misc Database",
   "checkAll": "Check All",
   "uncheckAll": "Uncheck All",
   "attachment": "Attachment",

package/bajo/intl/id.json

@@ -28,7 +28,7 @@
   "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!",
-  "dbModels": "Model Database",
+  "dbModels": "Database Lainnya",
   "checkAll": "Cek Semua",
   "uncheckAll": "Uncheck Semua",
   "attachment": "Attachment",

package/index.js

@@ -52,6 +52,46 @@ async function factory (pkgName) {
         await recordUpdate(dmodel, id, { status: 'FAIL' })
       }
     }
+
+    adminMenu = async (locals, req) => {
+      const { getPluginPrefix } = this.app.waibu
+      const { pascalCase } = this.lib.aneka
+      const { getAppTitle } = this.app.waibuMpa
+      const { camelCase, map, pick, groupBy, keys, kebabCase, filter, get } = this.lib._
+
+      const prefix = getPluginPrefix(this.name)
+      const schemas = filter(this.app.dobo.schemas, s => {
+        const byModelFind = !s.disabled.includes('find')
+        let modelDisabled = get(this, `app.${s.ns}.config.waibuAdmin.modelDisabled`)
+        if (modelDisabled) {
+          const allModels = map(filter(this.app.dobo.schemas, { ns: s.ns }), 'name')
+          if (modelDisabled === 'all') modelDisabled = allModels
+          else modelDisabled = map(modelDisabled, m => pascalCase(`${this.app[s.ns].alias} ${m}`))
+        } else modelDisabled = []
+        const byDbDisabled = !modelDisabled.includes(s.name)
+        return byModelFind && byDbDisabled
+      })
+      const omenu = groupBy(map(schemas, s => {
+        const item = pick(s, ['name', 'ns'])
+        item.nsTitle = getAppTitle(s.ns)
+        return item
+      }), 'nsTitle')
+      const menu = []
+      for (const k of keys(omenu).sort()) {
+        const items = omenu[k]
+        const plugin = this.app[items[0].ns]
+        menu.push({
+          title: k,
+          children: map(items, item => {
+            return {
+              title: camelCase(item.name.slice(plugin.alias.length)),
+              href: `waibuAdmin:/${prefix}/${kebabCase(item.name)}/list`
+            }
+          })
+        })
+      }
+      return menu
+    }
   }
 }
 

package/package.json

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

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

@@ -89,7 +89,7 @@ function customLayout ({ action, schema, ext, layout, readonly }) {
 
 function applyLayout (action, schema, ext) {
   const { defaultsDeep } = this.lib.aneka
-  const { set, get, isEmpty, find } = this.lib._
+  const { set, get, isEmpty, find, kebabCase } = this.lib._
   const { fields, card, calcFields } = 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))
@@ -121,6 +121,13 @@ function applyLayout (action, schema, ext) {
       if (['string', 'text'].includes(prop.type) && prop.maxLength) set(result, 'attr.maxlength', prop.maxLength)
       if (readonly.includes(f)) result.component = 'form-plaintext'
     }
+    for (const k in result.attr ?? {}) {
+      const newKey = kebabCase(k)
+      if (k !== newKey) {
+        result.attr[newKey] = result.attr[k]
+        delete result.attr[k]
+      }
+    }
     widget[f] = result
   }
   set(schema, 'view.widget', widget)

package/plugin-method/admin-menu.js

@@ -1,45 +0,0 @@
-function modelsMenu (locals, req) {
-  const { getPluginPrefix } = this.app.waibu
-  const { pascalCase } = this.lib.aneka
-  const { getAppTitle } = this.app.waibuMpa
-  const { camelCase, map, pick, groupBy, keys, kebabCase, filter, get } = this.lib._
-
-  const prefix = getPluginPrefix(this.name)
-  const schemas = filter(this.app.dobo.schemas, s => {
-    const byModelFind = !s.disabled.includes('find')
-    let modelDisabled = get(this, `app.${s.ns}.config.waibuAdmin.modelDisabled`)
-    if (modelDisabled) {
-      const allModels = map(filter(this.app.dobo.schemas, { ns: s.ns }), 'name')
-      if (modelDisabled === 'all') modelDisabled = allModels
-      else modelDisabled = map(modelDisabled, m => pascalCase(`${this.app[s.ns].alias} ${m}`))
-    } else modelDisabled = []
-    const byDbDisabled = !modelDisabled.includes(s.name)
-    return byModelFind && byDbDisabled
-  })
-  const omenu = groupBy(map(schemas, s => {
-    const item = pick(s, ['name', 'ns'])
-    item.nsTitle = getAppTitle(s.ns)
-    return item
-  }), 'nsTitle')
-  const menu = []
-  for (const k of keys(omenu).sort()) {
-    const items = omenu[k]
-    const plugin = this.app[items[0].ns]
-    menu.push({
-      title: k,
-      children: map(items, item => {
-        return {
-          title: camelCase(item.name.slice(plugin.alias.length)),
-          href: `waibuAdmin:/${prefix}/${kebabCase(item.name)}/list`
-        }
-      })
-    })
-  }
-  return menu
-}
-
-async function adminMenu (locals, req) {
-  return modelsMenu.call(this, locals, req)
-}
-
-export default adminMenu