sumba 2.2.4 → 2.3.1

package/extend/bajo/hook/waibu-mpa@pre-parsing.js

@@ -6,30 +6,10 @@ import checkTeam from '../../../lib/check-team.js'
 const preParsing = {
   level: 10,
   handler: async function (req, reply) {
-    // const { routePath } = this.app.waibu
-
     await checkTheme.call(this, req, reply)
     await checkIconset.call(this, req, reply)
     await checkUserId.call(this, req, reply, 'waibuMpa')
     await checkTeam.call(this, req, reply, 'waibuMpa')
-    /*
-    req.menu = req.menu ?? {}
-    if (req.user) {
-      req.menu.user = [
-        { value: routePath('sumba:/your-stuff/change-password', req), text: req.t('Change Password') },
-        { value: routePath('sumba:/your-stuff/profile', req), text: req.t('yourProfile') },
-        '-',
-        { value: routePath('sumba:/signout', req), text: req.t('signout') }
-      ]
-    } else {
-      req.menu.user = [
-        { value: routePath('sumba:/signin', req), text: req.t('signin') },
-        '-',
-        { value: routePath('sumba:/user/signup', req), text: req.t('signup') },
-        { value: routePath('sumba:/user/forgot-password', req), text: req.t('forgotPassword') }
-      ]
-    }
-    */
   }
 }
 

package/extend/bajo/hook/waibu@on-request.js

@@ -1,8 +1,8 @@
 const onRequest = {
   level: 10,
   handler: async function (req, reply) {
-    const hostname = req.hostname.split(':')[0]
-    req.site = await this.getSite(hostname)
+    const { getHostname } = this.app.waibu
+    req.site = await this.getSite(getHostname(req))
   }
 }
 

package/extend/bajo/intl/en-US.json

@@ -109,7 +109,10 @@
   "downloadList": "Download List",
   "manageDownload": "Manage Download",
   "userSession": "User Session",
-  "XHandler": "Twitter Account",
+  "XHandler": "Twitter/X Account",
+  "unverified": "Unverified",
+  "active": "Active",
+  "inactive": "Inactive",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/extend/bajo/intl/id.json

@@ -110,6 +110,10 @@
   "downloadList": "Daftar Unduh",
   "manageDownload": "Kelola Unduhan",
   "userSession": "Sesi Pengguna",
+  "XHandler": "Akun Twitter/X",
+  "unverified": "Belum Terverifikasi",
+  "active": "Aktif",
+  "inactive": "Non Aktif",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/extend/dobo/feature/address.js

@@ -23,10 +23,7 @@ async function address (opts = {}) {
       index: true
     }, {
       name: 'country',
-      type: 'string',
-      maxLength: 2,
-      index: true,
-      rules: ['uppercase', { rule: 'length', params: 2 }]
+      type: 'sumba:country'
     }, {
       name: 'phone',
       type: 'string',

package/extend/dobo/feature/country.js

@@ -1,11 +1,15 @@
 async function country (opts = {}) {
+  const { readConfig } = this.app.bajo
   opts.fieldName = opts.fieldName ?? 'country'
+  const countries = await readConfig('bajoCommonDb:/extend/dobo/fixture/country.json', { ignoreError: true, defValue: [] })
+  const values = countries.map(item => ({ value: item.id, text: item.name.replaceAll('\'', '') }))
   return {
     properties: [{
       name: opts.fieldName,
       type: 'string',
       maxLength: 2,
       index: opts.index ?? true,
+      values,
       rules: ['uppercase', { rule: 'length', params: 2 }]
     }],
     rules: [{ rule: 'trim', fields: [opts.fieldName] }]

package/extend/dobo/model/site-setting.json

@@ -4,5 +4,9 @@
     "key,,50,true,true",
     "value,text"
   ],
+  "indexes": [{
+    "fields": ["ns", "key", "siteId"],
+    "type": "unique"
+  }],
   "features": ["sumba:siteId", "dobo:updatedAt"]
 }

package/extend/waibuDb/schema/site.json

@@ -10,7 +10,7 @@
     ],
     "widget": {
       "country": {
-        "component": "form-select-country"
+        "component": "form-select-ext"
       }
     }
   },

package/extend/waibuMpa/extend/waibuAdmin/route/site-setting/@action.js

@@ -0,0 +1,11 @@
+const action = {
+  method: ['GET', 'POST'],
+  title: 'siteSetting',
+  handler: async function (req, reply) {
+    const { importModule } = this.app.bajo
+    const crudSkel = await importModule('waibuAdmin:/lib/crud-skel.js')
+    return await crudSkel.call(this, 'SumbaSiteSetting', req, reply)
+  }
+}
+
+export default action

package/index.js

@@ -182,6 +182,8 @@ async function factory (pkgName) {
           { title: 'manageTeam', href: `waibuAdmin:/${prefix}/team/list` },
           { title: 'manageTeamUser', href: `waibuAdmin:/${prefix}/team-user/list` },
           { title: 'manageDownload', href: `waibuAdmin:/${prefix}/download/list` },
+          { title: '-' },
+          { title: 'siteSetting', href: `waibuAdmin:/${prefix}/site-setting/list` },
           { title: 'resetUserPassword', href: `waibuAdmin:/${prefix}/reset-user-password` }
         ]
       }, {
@@ -403,7 +405,7 @@ async function factory (pkgName) {
 
       const mergeSetting = async (site) => {
         const { defaultsDeep } = this.app.lib.aneka
-        const { parseObject } = this.app.lib
+        const { parseObject, dayjs } = this.app.lib
         const { trim, get, filter } = this.app.lib._
         const defSetting = {}
         const nsSetting = {}
@@ -412,20 +414,27 @@ async function factory (pkgName) {
           ns: { $in: names },
           siteId: site.id
         }
-        const all = await this.app.dobo.getModel('SumbaSiteSetting').findRecord({ query, limit: -1 })
+        const all = await this.app.dobo.getModel('SumbaSiteSetting').findAllRecord({ query })
         for (const ns of names) {
           nsSetting[ns] = {}
           defSetting[ns] = get(this, `app.${ns}.config.siteSetting`, {})
           const items = filter(all, { ns })
           for (const item of items) {
             let value = trim([item.value] ?? '')
-            if (['[', '{'].includes(value[0])) value = JSON.parse(value)
-            else if (Number(value)) value = Number(value)
+            if (['[', '{'].includes(value[0])) {
+              try {
+                value = parseObject(JSON.parse(value))
+              } catch (err) {}
+            } else if (Number(value)) value = Number(value)
             else if (['true', 'false'].includes(value)) value = value === 'true'
+            else {
+              const dt = dayjs(value)
+              if (dt.isValid()) value = dt.toDate()
+            }
             nsSetting[ns][item.key] = value
           }
         }
-        site.setting = parseObject(defaultsDeep({}, nsSetting, defSetting))
+        site.setting = defaultsDeep({}, nsSetting, defSetting)
         // additional fields
         const country = await this.app.dobo.getModel('CdbCountry').getRecord(site.country, { noHook: true })
         site.countryName = (country ?? {}).name ?? site.country

package/lib/check-iconset.js

@@ -4,7 +4,7 @@ async function checkIconset (req, reply) {
 
   if (!req.site) return
   const siteIconset = get(req, 'site.setting.waibuMpa.iconset')
-  req.iconset = get(mpa, 'config.iconset.set', siteIconset)
+  req.iconset = siteIconset ?? get(mpa, 'config.iconset.set', 'default')
   const hiconset = req.headers['x-iconset']
   if (isString(hiconset) && mpa.getIconset(hiconset)) req.iconset = hiconset
   req.iconset = req.iconset ?? 'default'

package/lib/check-theme.js

@@ -4,7 +4,7 @@ async function checkTheme (req, reply) {
 
   if (!req.site) return
   const siteTheme = get(req, 'site.setting.waibuMpa.theme')
-  req.theme = get(mpa, 'config.theme.set', siteTheme)
+  req.theme = siteTheme ?? get(mpa, 'config.theme.set', 'default')
   const htheme = req.headers['x-theme']
   if (isString(htheme) && mpa.getTheme(htheme)) req.theme = htheme
   req.theme = req.theme ?? 'default'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.2.4",
+  "version": "2.3.1",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -20,6 +20,7 @@
   "keywords": [
     "sumba",
     "bajo",
+    "bajoCommonDb",
     "framework",
     "addons",
     "multidomain"

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-02-17
+
+- [2.3.0] Add admin menu links to ```siteSetting```
+- [2.3.0] Bug fix on ```getSite()```
+- [2.3.0] Add unique index on model ```SumbaSiteSetting```
+- [2.3.0] Add admin subroute to manage site setting
+- [2.3.0] Bug fix on ```req.theme``` and ```req.iconset``` resolver
+- [2.3.1] Update translations
+- [2.3.1] Bug fix on ```sumba:country``` feature
+
 ## 2026-02-09
 
 - [2.2.3] Bug fix on sidebar menu