waibu-bootstrap 1.2.11 → 1.2.13

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "waibu-bootstrap",
-  "version": "1.2.11",
-  "description": "Bootstrap suport for Waibu Framework",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "type": "module",
-  "bajo": {
-    "type": "plugin"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ardhi/waibu-bootstrap.git"
-  },
-  "keywords": [
-    "bootstrap",
-    "waibu",
-    "web",
-    "webserver",
-    "bajo",
-    "framework",
-    "fastify",
-    "modular"
-  ],
-  "author": "Ardhi Lukianto <ardhi@lukianto.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ardhi/waibu-bootstrap/issues"
-  },
-  "homepage": "https://github.com/ardhi/waibu-bootstrap#readme",
-  "dependencies": {
-    "bootstrap": "^5.3.3"
-  }
-}
+{
+  "name": "waibu-bootstrap",
+  "version": "1.2.13",
+  "description": "Bootstrap suport for Waibu Framework",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "type": "module",
+  "bajo": {
+    "type": "plugin"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ardhi/waibu-bootstrap.git"
+  },
+  "keywords": [
+    "bootstrap",
+    "waibu",
+    "web",
+    "webserver",
+    "bajo",
+    "framework",
+    "fastify",
+    "modular"
+  ],
+  "author": "Ardhi Lukianto <ardhi@lukianto.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ardhi/waibu-bootstrap/issues"
+  },
+  "homepage": "https://github.com/ardhi/waibu-bootstrap#readme",
+  "dependencies": {
+    "bootstrap": "^5.3.3"
+  }
+}

package/waibuMpa/theme/component/factory/app-launcher.js

@@ -9,7 +9,9 @@ async function appLauncher () {
     }
 
     build = async () => {
-      const { groupAttrs, attrToArray } = this.plugin.app.waibuMpa
+      const { locals } = this.component
+      const { routePath } = this.app.waibu
+      const { groupAttrs, attrToArray } = this.app.waibuMpa
       const menu = this.params.attr.menu ?? 'pages'
       const group = groupAttrs(this.params.attr, ['trigger'])
       let launcher = `<c:drawer id="${this.params.attr.id}" t:title="Modules" no-padding style="${menu === 'pages' ? 'width:350px' : ''}">\n`
@@ -18,7 +20,9 @@ async function appLauncher () {
       if (toolbar.length > 0) {
         if (menu === 'pages') toolbar.unshift('home')
         launcher += `<c:div padding="x-3 ${menu === 'home' ? 'bottom-3' : ''}">`
-        launcher += '<c:navbar padding="y-0">\n<c:nav tag="ul" dim="width:100" flex="justify-content:end">\n'
+        launcher += '<c:navbar padding="y-0"><c:nav tag="ul">\n'
+        if (locals._meta.isAdmin) launcher += '<c:nav-item text="color:danger" href="' + routePath('waibuAdmin:/') + '" icon="lock" padding="start-0" />\n'
+        launcher += '</c:nav>\n<c:nav tag="ul">\n'
         for (const t of toolbar) {
           if (t === 'home') launcher += '<c:nav-item href="/" icon="house" padding="end-2" />\n'
           if (t === 'user' && this.plugin.app.sumba) launcher += '<c:sumba-nav-dropdown-user padding="end-2" />\n'

package/waibuMpa/theme/component/factory/form-select-ext.js

@@ -117,22 +117,25 @@ async function formSelectExt () {
           }
         }`
       }
-
       this.params.attr['@load.window'] = `
         const opts = ${opts}
         instance = new TomSelect($refs.${xref}, opts)
         const val = $refs.${xref}.dataset.value
-        if (!_.isEmpty(val)) {
-          fetch('${group.remote.url}?query=${group.remote.valueField}:' + val, ${jsonStringify(fetchOpts, true)})
-            .then(resp => resp.json())
-            .then(json => {
-              if (json.data.length === 0) return
-              const opt = _.pick(json.data[0], ['${group.remote.valueField}', '${group.remote.labelField}'])
-              instance.addOption(opt)
-              instance.setValue(opt.${group.remote.valueField})
-            })
-        }
       `
+      if (group.remote) {
+        this.params.attr['@load.window'] += `
+          if (!_.isEmpty(val)) {
+            fetch('${group.remote.url}?query=${group.remote.valueField}:' + val, ${jsonStringify(fetchOpts, true)})
+              .then(resp => resp.json())
+              .then(json => {
+                if (json.data.length === 0) return
+                const opt = _.pick(json.data[0], ['${group.remote.valueField}', '${group.remote.labelField}'])
+                instance.addOption(opt)
+                instance.setValue(opt.${group.remote.valueField})
+              })
+          }
+        `
+      }
       this.params.attr.options = options
       this.params.attr = omit(this.params.attr, ['noDropdownInput', 'removeBtn', 'clearBtn', 'c-opts', 'remoteUrl', 'remoteSearchField', 'remoteLabelField', 'remoteValueField'])
       await build.call(this, buildFormSelect, this.params)