waibu-db 1.2.9 → 1.2.11

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

@@ -42,6 +42,7 @@ async function factory (pkgName) {
         ensureDir: true,
         fields
       }
+      options.filter.sort = 'id:1'
       const dmodel = 'SumbaDownload'
       try {
         await recordUpdate(dmodel, id, { status: 'PROCESSING' })
@@ -52,6 +53,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.9",
+  "version": "1.2.11",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

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

@@ -12,8 +12,10 @@ async function form () {
       const xModels = get(schema, 'view.x.model', [])
       const xOns = get(schema, 'view.x.on', [])
       for (const l of schema.view.layout) {
+        const fields = filter(l.fields, f => schema.view.fields.includes(f))
+        if (fields.length === 0) continue
         body.push(`<c:fieldset ${schema.view.card === false ? '' : 'card'} ${l.name[0] !== '_' ? ('t:legend="' + l.name + '"') : ''} grid-gutter="2">`)
-        for (const f of l.fields) {
+        for (const f of fields) {
           const w = schema.view.widget[f]
           let prop = find(schema.properties, { name: f })
           if (!prop) prop = find(schema.view.calcFields, { name: f })
@@ -21,7 +23,8 @@ async function form () {
           const attr = [`x-ref="${w.name}"`]
           if (xModels.includes(w.name)) attr.push(`x-model="${w.name}"`)
           forOwn(w.attr, (v, k) => {
-            attr.push(`${k}="${v}"`)
+            if (v === true) attr.push(k)
+            else attr.push(`${k}="${v}"`)
           })
           const xon = filter(xOns, { field: w.name })
           for (const o of xon) {

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