sumba 2.17.0 → 2.18.0

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

@@ -135,6 +135,7 @@
   "statusDisabled": "Disabled",
   "statusOpen": "Open",
   "statusClosed": "Closed",
+  "allSites": "All Sites",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/extend/bajo/intl/id.json

@@ -136,6 +136,7 @@
   "statusDisabled": "Dimatikan",
   "statusOpen": "Terbuka",
   "statusClosed": "Tertutup",
+  "allSites": "Semua Situs",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/extend/dobo/feature/site-id.js

@@ -5,7 +5,7 @@ async function siteId (opts = {}) {
       type: 'string',
       maxLength: 50,
       ref: {
-        site: {
+        siteDetail: {
           model: 'SumbaSite',
           field: 'id',
           type: '1:1'

package/extend/waibuDb/schema/download.js

@@ -2,7 +2,7 @@ async function download () {
   return {
     common: {
       disabled: ['create', 'update', 'get'],
-      formatter: {
+      format: {
         description: async function (val, rec) {
           const sentence = `<c:a target="_blank" href="sumba:/your-stuff/download/get/${rec.file}" content="${val}" @click.stop />`
           return await this.component.buildSentence(sentence)

package/extend/waibuDb/schema/site.js

@@ -1,24 +1,4 @@
 async function site (req = {}) {
-  const isInterSite = (req.url ?? '').includes('/_is_/')
-  let details
-  let edit
-  if (!isInterSite) {
-    details = {
-      control: {
-        noBackBtn: true,
-        noCloneBtn: true,
-        editHref: 'waibuAdmin:/site/site?edit=true'
-      }
-    }
-    edit = {
-      control: {
-        noBackBtn: true,
-        noCloneBtn: true,
-        detailsHref: 'waibuAdmin:/site/site'
-      },
-      readonly: ['id', 'createdAt', 'updatedAt']
-    }
-  }
   const result = {
     common: {
       attachment: true,
@@ -29,10 +9,6 @@ async function site (req = {}) {
         { name: 'address', fields: ['address1:12', 'address2:12', 'city:6-md 8-sm', 'zipCode:2-md 4-sm', 'provinceState:4-md', 'country:6-md', 'phone:6-md', 'website:12'] },
         { name: 'socialMedia', fields: ['socX:3-md 6-sm', 'socInstagram:3-md 6-sm', 'socFacebook:3-md 6-sm', 'socLinkedIn:3-md 6-sm'] }
       ]
-    },
-    view: {
-      details,
-      edit
     }
   }
   return result

package/extend/waibuDb/schema/team-setting.js

@@ -8,7 +8,7 @@ async function teamUser () {
       calcFields: [
         { name: 'team', type: 'string' }
       ],
-      valueFormatter: {
+      formatValue: {
         team: (val, rec) => {
           return rec._ref.team.name
         }

package/extend/waibuDb/schema/user-setting.js

@@ -8,7 +8,7 @@ async function teamUser ({ req } = {}) {
       calcFields: [
         { name: 'user', type: 'string' }
       ],
-      valueFormatter: {
+      formatValue: {
         user: (val, rec) => {
           return rec._ref.user.name
         }

package/extend/waibuDb/schema/user.js

@@ -7,7 +7,7 @@ async function user ({ req } = {}) {
         { name: 'address', fields: ['address1:12', 'address2:12', 'city:6-md 8-sm', 'zipCode:2-md 4-sm', 'provinceState:4-md', 'country:6-md', 'phone:6-md', 'website:12'] },
         { name: 'socialMedia', fields: ['socX:3-md 6-sm', 'socInstagram:3-md 6-sm', 'socFacebook:3-md 6-sm', 'socLinkedIn:3-md 6-sm'] }
       ],
-      valueFormatter: {
+      formatValue: {
         token: async function (val, rec) {
           const { hash } = this.app.bajoExtra
           return await hash(rec.salt)

package/extend/waibuMpa/extend/waibuAdmin/route/site.js

@@ -11,7 +11,51 @@ const manageSite = {
     req.params.id = req.site.id
     req.query.id = req.site.id
     req.params.base = ''
-    return await action.call(this, { req, reply, model, template })
+    const options = {
+      modelOpts: {
+        formatValue: true,
+        retainOriginalValue: true
+      },
+      schema: {
+        view: {
+          details: {
+            control: {
+              wdbBtnBack: {
+                disabled: true
+              },
+              wdbBtnClone: {
+                disabled: true
+              },
+              wdbBtnDelete: {
+                disabled: true
+              },
+              wdbBtnEdit: {
+                href: 'waibuAdmin:/site/site?edit=true'
+              }
+            }
+          },
+          edit: {
+            control: {
+              wdbBtnBack: {
+                disabled: true
+              },
+              wdbBtnClone: {
+                disabled: true
+              },
+              wdbBtnDelete: {
+                disabled: true
+              },
+              wdbBtnDetails: {
+                href: 'waibuAdmin:/site/site'
+              }
+            },
+            readonly: ['id', 'createdAt', 'updatedAt']
+          }
+        }
+      }
+    }
+
+    return await action.call(this, { req, reply, model, template, options })
   }
 }
 

package/extend/waibuMpa/route/help/trouble-tickets/details/@id.js

@@ -26,7 +26,7 @@ const id = {
     schema.view.disabled = ['update', 'remove']
     schema.view.fields = ['createdAt']
     schema.view.label = { createdAt: 'conversation' }
-    schema.view.formatter = {
+    schema.view.format = {
       createdAt: async function (val, rec) {
         const message = this.app.bajoMarkdown ? this.app.bajoMarkdown.parseContent(rec.message) : rec.message
         const isMe = rec.userId === req.user.id

package/extend/waibuMpa/route/help/trouble-tickets/list.js

@@ -11,7 +11,7 @@ const list = {
     schema.view.disabled = ['update', 'remove']
     schema.view.fields = ['createdAt', 'subject', 'status']
     schema.view.label = { subject: 'Your Message' }
-    schema.view.formatter = {
+    schema.view.format = {
       subject: (val, rec) => {
         return `<strong>${val}</strong><br />${getExcerpt(rec.message, 35)}`
       }

package/index.js

@@ -209,7 +209,8 @@ async function factory (pkgName) {
         title: 'manageSite',
         children: [
           { title: 'siteProfile', href: `waibuAdmin:/${prefix}/site` },
-          { title: 'siteSetting', href: `waibuAdmin:/${prefix}/site-setting/list` }
+          { title: 'siteSetting', href: `waibuAdmin:/${prefix}/site-setting/list` },
+          { title: 'allSites', href: `waibuAdmin:/${prefix}/all-sites/list` }
         ]
       }, {
         title: 'manageUser',
@@ -236,25 +237,13 @@ async function factory (pkgName) {
       }, {
         title: 'misc',
         children: [
-          { title: 'manageDownload', href: `waibuAdmin:/${prefix}/download/list` }
-        ]
-      }, {
-        title: 'manageAllSite',
-        interSite: true,
-        href: `waibuAdmin:/${prefix}/_is_/site/list`
-      }, {
-        title: '-',
-        interSite: true
-      }, {
-        title: 'misc',
-        interSite: true,
-        children: [
-          { title: 'userSession', href: `waibuAdmin:/${prefix}/_is_/session/list` }
+          { title: 'manageDownload', href: `waibuAdmin:/${prefix}/download/list` },
+          { title: 'userSession', href: `waibuAdmin:/${prefix}/session/list` }
         ]
       }]
       if (this.app.bajoCache) {
         const item = items.find(i => i.title === 'misc')
-        if (item) item.children.push({ title: 'cacheStorage', href: `waibuAdmin:/${prefix}/_is_/cache/list` })
+        if (item) item.children.push({ title: 'cacheStorage', href: `waibuAdmin:/${prefix}/cache/list` })
       }
       return items
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 2026-04-11
+
+- [2.18.0] Some major rewrites :/
+
 ## 2026-04-07
 
 - [2.17.0] Change all ```opts.fieldName``` to ```opts.field``` in features