sumba 1.1.9 → 1.1.10

package/bajo/hook/dobo@before-record-find.js

@@ -7,7 +7,7 @@ export async function rebuildFilter (model, filter, req) {
   const hasSiteId = await hasColumn('siteId', model)
   const hasUserId = await hasColumn('userId', model)
   const hasTeamId = await hasColumn('teamId', model)
-  const isAdmin = find(req.user.teams, { alias: 'administrator' }) && useAdmin.includes(get(req, 'routeOptions.config.ns'))
+  const isAdmin = find(get(req, 'user.teams', []), { alias: 'administrator' }) && useAdmin.includes(get(req, 'routeOptions.config.ns'))
   if (!(hasSiteId || hasUserId || hasTeamId)) return filter
   const q = { $and: [] }
   if (!isEmpty(filter.query)) {

package/bajo/hook/waibu-mpa.sumba@after-build-locals.js

@@ -2,14 +2,16 @@ async function afterBuildLocals (locals, req) {
   const { routePath } = this.app.waibu
   const items = []
   if (req.user) {
-    items.push({ icon: 'person', tooltip: 'yourProfile', href: routePath('sumba:/my-stuff/profile') })
-    items.push({ icon: 'key', tooltip: 'changePassword', href: routePath('sumba:/my-stuff/change-password') })
-    items.push({ component: 'navItemSignout', tooltip: 'signout', bottom: true })
+    items.push({ icon: 'person', 't:tooltip': 'yourProfile', href: routePath('sumba:/my-stuff/profile') })
+    items.push({ icon: 'key', 't:tooltip': 'changePassword', href: routePath('sumba:/my-stuff/change-password') })
+    items.push({ component: 'navItemSignout', 't:tooltip': 'signout', bottom: true })
   } else {
-    items.push({ icon: 'signin', tooltip: 'signin', href: routePath('sumba:/signin') })
-    items.push({ icon: 'key', tooltip: 'forgotPassword', href: routePath('sumba:/user/forgot-password') })
-    items.push({ icon: 'personAdd', tooltip: 'newUserSignup', href: routePath('sumba:/user/signup') })
+    items.push({ icon: 'signin', 't:tooltip': 'signin', href: routePath('sumba:/signin') })
+    items.push({ icon: 'key', 't:tooltip': 'forgotPassword', href: routePath('sumba:/user/forgot-password') })
+    items.push({ icon: 'personAdd', 't:tooltip': 'newUserSignup', href: routePath('sumba:/user/signup') })
   }
+  items.push({ icon: 'envelope', 't:tooltip': 'contactForm', href: routePath('sumba:/help/contact-form') })
+  items.push({ icon: 'chat', 't:tooltip': 'troubleTickets', href: routePath('sumba:/help/trouble-tickets') })
   for (const item of items) {
     if (locals._meta.url.startsWith(item.href)) item.active = true
   }

package/bajo/intl/en-US.json

@@ -81,10 +81,17 @@
   "moreInfoContactAdmin": "Please <c:a href='sumba:/help/contact-form'>contact</c:a> your Admin for more info, thank you!",
   "restricted": "Restricted",
   "fullscreen": "Fullscreen",
+  "myStuff": "My Stuff",
+  "site": "Site",
+  "user": "User",
+  "catQuestion": "General Question",
+  "catMisc": "Misc",
+  "catTechnical": "Technical Problem",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",
     "verifyNewPassword": "Verify New Password",
+    "verifyPassword": "Verify Password",
     "usernameEmail": "Username/Email",
     "apiKey": "API Key",
     "hostname": "Hostname",

package/bajo/intl/id.json

@@ -82,6 +82,12 @@
   "moreInfoContactAdmin": "Mohon <c:a href='sumba:/help/contact-form'>hubungi</c:a> Admin Anda untuk keterangan lebih lanjut, terima kasih!",
   "restricted": "Pembatasan",
   "fullscreen": "Layar Penuh",
+  "myStuff": "Perkakas Ku",
+  "site": "Situs",
+  "user": "Pengguna",
+  "catQuestion": "Pertanyaan Umum",
+  "catMisc": "Lain-lain",
+  "catTechnical": "Masalah Teknis",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/bajoTemplate/partial/layout/footer.html

@@ -6,9 +6,12 @@
       <c:nav-item t:content="privacy" href="sumba:/info/privacy"/>
       <c:nav-item t:content="terms" href="sumba:/info/terms-conditions"/>
     </c:nav>
+    <% if (!(_meta.routeOpts.pathSrc.startsWith('/my-profile') || _meta.routeOpts.pathSrc.startsWith('/info') ||
+    _meta.routeOpts.pathSrc.startsWith('/help'))) { %>
     <c:nav flex="justify-content:center">
       <c:nav-dropdown-darkmode />
       <c:nav-dropdown-language />
     </c:nav>
+    <% } %>
   </small>
 </c:footer>

package/bajoTemplate/partial/layout/navbar.html

@@ -1,18 +1,10 @@
-<c:navbar position="type:sticky-top" background="color:primary-subtle" expandable padding="x-3" border="side:bottom">
-  <c:grid-row dim="width-100">
-    <c:grid-col col="1-md 2-lg"></c:grid-col>
-    <c:grid-col col="10-md 8-lg">
-      <c:navbar-brand content="<%= page.title %>" />
-      <c:nav tag="ul">
-      </c:nav>
-      <c:nav tag="ul" dim="width:100" flex="justify-content:end">
-        <c:nav-dropdown-user no-menu />
-        <c:nav-divider />
-        <c:nav-toggle-fullscreen />
-        <c:nav-dropdown-darkmode dropdown-menu="end" />
-        <c:nav-dropdown-language dropdown-menu="end" />
-      </c:nav>
-    </c:grid-col>
-    <c:grid-col col="1-md 2-lg"></c:grid-col>
-  </c:grid-row>
+<c:navbar background="color:secondary-subtle" position="type:sticky-top" expandable padding="x-3" border="side:bottom">
+  <c:navbar-brand content="<%= page.title %>" />
+  <c:nav tag="ul">
+  </c:nav>
+  <c:nav tag="ul" dim="width:100" flex="justify-content:end">
+    <c:nav-toggle-fullscreen />
+    <c:nav-dropdown-darkmode dropdown-menudir="end" />
+    <c:nav-dropdown-language dropdown-menudir="end" />
+  </c:nav>
 </c:navbar>

package/bajoTemplate/partial/layout/sidebar.html

@@ -1,3 +1,3 @@
-<c:sidebar background="color:primary-subtle" mini border="side:end" auto-fill expanded>
-  <c:app-launcher-trigger x-data @click="wbs.appLauncher()" border="side:bottom" img-style="width:100%;height:100%" />
+<c:sidebar text="color:light" background="color:secondary" mini border="side:end" auto-fill expanded>
+  <c:app-launcher-trigger x-data @click="wbs.appLauncher()" border="side:bottom" img-dim-height="56" />
 </c:sidebar>

package/bajoTemplate/template/info/privacy.md

@@ -106,7 +106,7 @@ We use both Session and Persistent Cookies for the purposes set out below:
 
 
 
-For more information about the cookies we use and your choices regarding cookies, please visit our [Cookie Policy](cookie-policy) or the Cookies section of our Privacy Policy.
+For more information about the cookies we use and your choices regarding cookies, please visit our [Cookie Policy](sumba:/info/cookie-policy) or the Cookies section of our Privacy Policy.
 
 #### Use of Your Personal Data
 

package/dobo/fixture/contact-form-cat.json

@@ -2,18 +2,6 @@
   "name": "QUESTION",
   "level": 2,
   "siteId": "?:SumbaSite::alias:default"
-}, {
-  "name": "INQUIRY",
-  "level": 1,
-  "siteId": "?:SumbaSite::alias:default"
-}, {
-  "name": "BILLING",
-  "level": 4,
-  "siteId": "?:SumbaSite::alias:default"
-}, {
-  "name": "API",
-  "level": 3,
-  "siteId": "?:SumbaSite::alias:default"
 }, {
   "name": "MISC",
   "level": 5,

package/dobo/fixture/ticket-cat.json

@@ -0,0 +1,7 @@
+[{
+  "name": "TECHNICAL",
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "MISC",
+  "siteId": "?:SumbaSite::alias:default"
+}]

package/dobo/schema/site.json

@@ -1,4 +1,5 @@
 {
+  "buildLevel": 1,
   "properties": [{
     "name": "hostname",
     "type": "string",

package/dobo/schema/user.json

@@ -1,4 +1,5 @@
 {
+  "buildLevel": 2,
   "properties": [{
     "name": "username",
     "type": "string",

package/lib/check-iconset.js

@@ -1,10 +1,13 @@
 async function checkIconset (req, reply) {
   const { get } = this.lib._
+  const mpa = this.app.waibuMpa
 
   if (!req.site) return
-  const globalIconset = get(this.app, 'waibuMpa.config.iconset.default')
-  req.iconset = get(req, 'site.setting.waibuMpa.iconset', globalIconset)
-  // if (get(req, 'site.setting.allowUserIconset')) req.iconset = get(req, 'user.setting.iconset', req.iconset)
+  if (mpa.iconsets.length === 1) req.iconset = mpa.iconsets[0]
+  else {
+    const siteIconset = get(req, 'site.setting.waibuMpa.iconset')
+    req.iconset = get(mpa, 'config.iconset.default', siteIconset)
+  }
 }
 
 export default checkIconset

package/lib/check-theme.js

@@ -1,10 +1,14 @@
 async function checkTheme (req, reply) {
   const { get } = this.lib._
+  const mpa = this.app.waibuMpa
 
   if (!req.site) return
-  const globalTheme = get(this.app, 'waibuMpa.config.theme.default')
-  req.theme = get(req, 'site.setting.waibuMpa.theme', globalTheme)
-  // if (get(req, 'site.setting.waibuMpa.allowUserTheme')) req.theme = get(req, 'user.setting.theme', req.theme)
+  if (mpa.themes.length === 1) req.theme = mpa.themes[0]
+  else {
+    const siteTheme = get(req, 'site.setting.waibuMpa.theme')
+    req.theme = get(mpa, 'config.theme.set', siteTheme)
+    req.theme = req.theme ?? mpa.themes[0]
+  }
 }
 
 export default checkTheme

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {

package/bajo/hook/waibu@after-init.js

@@ -1,12 +0,0 @@
-async function afterInitWaibu () {
-  const { isSet } = this.app.bajo
-
-  if (!isSet(this.app.waibu.config.home)) {
-    this.app.waibu.config.home = {
-      path: 'sumba:/home',
-      forward: true
-    }
-  }
-}
-
-export default afterInitWaibu

package/bajoTemplate/template/info/about-us.id.md

@@ -1,4 +0,0 @@
----
-layout: sumba.layout:/info.html
-title: aboutUs
----

package/dobo/fixture/trouble-cat.json

@@ -1,13 +0,0 @@
-[{
-  "name": "TECHNICAL",
-  "siteId": "?:SumbaSite::alias:default"
-}, {
-  "name": "BILLING",
-  "siteId": "?:SumbaSite::alias:default"
-}, {
-  "name": "API",
-  "siteId": "?:SumbaSite::alias:default"
-}, {
-  "name": "MISC",
-  "siteId": "?:SumbaSite::alias:default"
-}]