sumba 2.16.0 → 2.18.0

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

@@ -131,6 +131,11 @@
   "protectedArea": "Protected Area",
   "pleaseAuthenticate": "Please authenticate yourself, thank you!",
   "manageAllSite": "Manage All Sites",
+  "statusEnabled": "Enabled",
+  "statusDisabled": "Disabled",
+  "statusOpen": "Open",
+  "statusClosed": "Closed",
+  "allSites": "All Sites",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/extend/bajo/intl/id.json

@@ -132,6 +132,11 @@
   "protectedArea": "Wilayah Dilindungi",
   "pleaseAuthenticate": "Silahkan melakukan otentikasi terlebih dahulu, terima kasih!",
   "manageAllSite": "Kelola Semua Situs",
+  "statusEnabled": "Dihidupkan",
+  "statusDisabled": "Dimatikan",
+  "statusOpen": "Terbuka",
+  "statusClosed": "Tertutup",
+  "allSites": "Semua Situs",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/extend/dobo/feature/country.js

@@ -1,8 +1,8 @@
 async function country (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'country'
+  opts.field = opts.field ?? 'country'
   return {
     properties: [{
-      name: opts.fieldName,
+      name: opts.field,
       type: 'string',
       maxLength: 2,
       index: opts.index ?? true,
@@ -10,7 +10,7 @@ async function country (opts = {}) {
       rules: ['uppercase', { rule: 'length', params: 2 }],
       rulesMsg: { 'any.only': 'validCountryCodeRequired' }
     }],
-    rules: [{ rule: 'trim', fields: [opts.fieldName] }]
+    rules: [{ rule: 'trim', fields: [opts.field] }]
   }
 }
 

package/extend/dobo/feature/email.js

@@ -1,8 +1,8 @@
 async function email (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'email'
+  opts.field = opts.field ?? 'email'
   return {
     properties: [{
-      name: opts.fieldName ?? 'email',
+      name: opts.field ?? 'email',
       type: 'string',
       maxLength: 50,
       rules: ['email']

package/extend/dobo/feature/lat-lng.js

@@ -2,20 +2,20 @@ import { latLngHook } from '../../../lib/util.js'
 
 async function latLng (opts = {}) {
   const { merge } = this.app.lib._
-  opts.fieldNameLat = opts.fieldNameLat ?? 'lat'
-  opts.fieldNameLng = opts.fieldNameLng ?? 'lng'
+  opts.fieldLat = opts.fieldLat ?? 'lat'
+  opts.fieldLng = opts.fieldLng ?? 'lng'
   opts.scale = opts.scale ?? 5
   opts.precision = opts.precision ?? 8
   return {
     properties: [{
-      name: opts.fieldNameLat,
+      name: opts.fieldLat,
       type: 'double',
       required: opts.required ?? true,
       index: opts.required ?? true,
       precision: opts.precision,
       scale: opts.scale
     }, {
-      name: opts.fieldNameLng,
+      name: opts.fieldLng,
       type: 'double',
       required: opts.required ?? true,
       index: opts.required ?? true,
@@ -24,12 +24,12 @@ async function latLng (opts = {}) {
     }],
     hook: {
       beforeCreate: async function (body) {
-        await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldNameLat }))
-        await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldNameLng }))
+        await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldLat }))
+        await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldLng }))
       },
       beforeUpdate: async function (body) {
-        await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldNameLat }))
-        await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldNameLng }))
+        await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldLat }))
+        await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldLng }))
       }
     }
   }

package/extend/dobo/feature/lat.js

@@ -1,12 +1,12 @@
 import { latLngHook } from '../../../lib/util.js'
 
 async function lat (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'lat'
+  opts.field = opts.field ?? 'lat'
   opts.scale = opts.scale ?? 5
   opts.precision = opts.precision ?? 8
   return {
     properties: [{
-      name: opts.fieldName,
+      name: opts.field,
       type: 'double',
       required: opts.required ?? true,
       index: opts.required ?? true,

package/extend/dobo/feature/lng.js

@@ -1,12 +1,12 @@
 import { latLngHook } from '../../../lib/util.js'
 
 async function lng (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'lng'
+  opts.field = opts.field ?? 'lng'
   opts.scale = opts.scale ?? 5
   opts.precision = opts.precision ?? 8
   return {
     properties: [{
-      name: opts.fieldName,
+      name: opts.field,
       type: 'double',
       required: opts.required ?? true,
       index: opts.required ?? true,

package/extend/dobo/feature/phone.js

@@ -1,8 +1,8 @@
 async function phone (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'phone'
+  opts.field = opts.field ?? 'phone'
   return {
     properties: [{
-      name: opts.fieldName ?? 'phone',
+      name: opts.field ?? 'phone',
       type: 'string',
       maxLength: 50
     }]

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

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

package/extend/dobo/feature/slug.js

@@ -2,36 +2,36 @@ import slug from 'slug'
 
 async function autoInc (body, opts) {
   const { set, last } = this.app.lib._
-  const query = set({}, opts.fieldName, { $regex: new RegExp('^' + body[opts.fieldName]) })
-  const sort = set({}, opts.fieldName, -1)
+  const query = set({}, opts.field, { $regex: new RegExp('^' + body[opts.field]) })
+  const sort = set({}, opts.field, -1)
   const options = { noHook: true, skipCache: true, thrownNotFound: false }
   const resp = await this.findOneRecord({ query, sort }, options)
-  if (resp) return body[opts.fieldName]
-  const rslugs = resp[opts.fieldName].split('-')
-  const slugs = body[opts.fieldName].split('-')
+  if (resp) return body[opts.field]
+  const rslugs = resp[opts.field].split('-')
+  const slugs = body[opts.field].split('-')
   let num
-  if (Number(last(rslugs)) && body[opts.fieldName] === rslugs.slice(0, rslugs.length - 1).join('-')) {
+  if (Number(last(rslugs)) && body[opts.field] === rslugs.slice(0, rslugs.length - 1).join('-')) {
     num = Number(rslugs.pop()) + 1
-    body[opts.fieldName] = `${rslugs.join('-')}-${num}`
+    body[opts.field] = `${rslugs.join('-')}-${num}`
   } else {
     const idx = slugs.length - 1
     num = Number(slugs[idx])
-    if (!num) body[opts.fieldName] += '-1'
+    if (!num) body[opts.field] += '-1'
     else {
       slugs[idx] = num + 1
-      body[opts.fieldName] = slugs.join('-')
+      body[opts.field] = slugs.join('-')
     }
   }
   return await autoInc.call(this, body, opts)
 }
 
 async function mainFn (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'slug'
+  opts.field = opts.field ?? 'slug'
   opts.fieldSource = opts.fieldSource ?? ['name']
   opts.autoInc = true
   return {
     properties: [{
-      name: opts.fieldName ?? 'slug',
+      name: opts.field ?? 'slug',
       type: 'string',
       maxLength: 255,
       index: 'unique'
@@ -40,7 +40,7 @@ async function mainFn (opts = {}) {
       beforeCreate: async function (body) {
         const { error } = this.app.bajo
         const { isEmpty, isString } = this.app.lib._
-        if (isEmpty(body[opts.fieldName])) {
+        if (isEmpty(body[opts.field])) {
           if (isString(opts.fieldSource)) opts.fieldSource = [opts.fieldSource]
           const source = []
           opts.fieldSource.forEach(s => {
@@ -50,9 +50,9 @@ async function mainFn (opts = {}) {
             const details = [{ field: opts.fieldSource.join(', '), error: 'required' }]
             throw error('\'%s\' is required', opts.fieldSource.join(', '), { details })
           }
-          body[opts.fieldName] = slug(source.join(' '))
+          body[opts.field] = slug(source.join(' '))
         }
-        if (opts.autoInc) body[opts.fieldName] = await autoInc.call(this, body, opts)
+        if (opts.autoInc) body[opts.field] = await autoInc.call(this, body, opts)
       }
     }
   }

package/extend/dobo/feature/status.js

@@ -1,17 +1,20 @@
 async function status (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'status'
+  opts.field = opts.field ?? 'status'
+  opts.required = opts.required ?? true
+  opts.values = opts.values ?? ['UNVERIFIED', 'ACTIVE', 'INACTIVE']
   return {
     properties: [{
-      name: opts.fieldName ?? 'status',
+      name: opts.field ?? 'status',
       type: 'string',
       maxLength: 50,
       index: true,
-      values: opts.values ?? ['UNVERIFIED', 'ACTIVE', 'INACTIVE']
+      required: opts.required,
+      values: opts.values
     }],
     hook: {
       beforeCreate: async function (body) {
         const { isSet } = this.app.lib.aneka
-        if (!isSet(body[opts.fieldName])) body[opts.fieldName] = opts.default
+        if (!isSet(body[opts.field])) body[opts.field] = opts.default
       }
     }
   }

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

@@ -8,14 +8,16 @@ async function teamId (opts = {}) {
       ref: {
         site: {
           model: 'SumbaSite',
-          propName: 'id',
+          field: 'id',
           type: '1:1',
           fields: ['id', 'alias', 'hostname', 'title']
         },
         team: {
           model: 'SumbaTeam',
-          propName: 'id',
+          field: 'id',
           type: '1:1',
+          labelField: 'name',
+          searchField: 'name',
           fields: ['id', 'name']
         }
       },

package/extend/dobo/feature/ts.js

@@ -1,8 +1,8 @@
 async function ts (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'ts'
+  opts.field = opts.field ?? 'ts'
   return {
     properties: [{
-      name: opts.fieldName ?? 'ts',
+      name: opts.field ?? 'ts',
       type: 'timestamp',
       required: opts.required ?? true,
       index: opts.index ?? true

package/extend/dobo/feature/url.js

@@ -1,18 +1,18 @@
 async function hook (body, options) {
   const { isSet } = this.app.lib.aneka
-  let val = body[options.fieldName]
+  let val = body[options.field]
   if (!isSet(val)) return
   const [, ...params] = val.split('://')
   if (params.length === 0) val = options.defProto + '://' + val
-  body[options.fieldName] = val
+  body[options.field] = val
 }
 
 async function url (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'url'
+  opts.field = opts.field ?? 'url'
   opts.defProto = opts.defProto ?? 'http'
   return {
     properties: [{
-      name: opts.fieldName ?? 'url',
+      name: opts.field ?? 'url',
       type: 'string'
     }],
     hook: {

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

@@ -7,7 +7,9 @@ async function userId (opts = {}) {
       ref: {
         user: {
           model: 'SumbaUser',
-          propName: 'id',
+          field: 'id',
+          labelField: 'username',
+          searchField: 'username',
           type: '1:1'
         }
       },

package/extend/dobo/model/ticket.json

@@ -1,7 +1,20 @@
 {
   "properties": [
     "subject,,255,true,true",
-    "cat,,50,true",
+    {
+      "name": "cat",
+      "type": "string",
+      "maxLength": 50,
+      "index": true,
+      "required": true,
+      "ref": {
+        "cat": {
+          "model": "SumbaTicketCat",
+          "searchField": "name",
+          "labelField": "name"
+        }
+      }
+    },
     "message,text,,,true"
   ],
   "features": [

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,
@@ -28,16 +8,7 @@ async function site (req = {}) {
         { name: 'personInCharge', fields: ['picName:3-md 6-sm:Name', 'picRole:3-md 6-sm:Role', 'picPhone:3-md 6-sm:Phone', 'picEmail:3-md 6-sm:Email'] },
         { 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'] }
-      ],
-      widget: {
-        country: {
-          component: 'form-select-ext'
-        }
-      }
-    },
-    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/team-user.js

@@ -5,44 +5,22 @@ async function teamUser () {
         { name: 'meta', fields: ['id', 'createdAt', 'updatedAt'] },
         { name: 'general', fields: ['userId:6-md', 'teamId:6-md'] }
       ],
-      calcFields: [
-        { name: 'user', type: 'string' },
-        { name: 'team', type: 'string' }
-      ],
-      valueFormatter: {
-        user: (val, rec) => {
-          return rec._ref.user.username
-        },
-        team: (val, rec) => {
-          return rec._ref.team.name
-        }
-      },
       widget: {
         userId: {
-          component: 'form-select-ext',
           attr: {
-            remoteUrl: 'sumba.restapi:/manage/user',
-            remoteSearchField: 'username',
-            remoteLabelField: 'username',
-            remoteApiKey: true,
-            ref: 'user:username'
+            url: 'sumba.restapi:/manage/user'
           }
         },
         teamId: {
-          component: 'form-select-ext',
           attr: {
-            remoteUrl: 'sumba.restapi:/manage/team',
-            remoteSearchField: 'name',
-            remoteLabelField: 'name',
-            remoteApiKey: true,
-            ref: 'team:name'
+            url: 'sumba.restapi:/manage/team'
           }
         }
       }
     },
     view: {
       list: {
-        fields: ['user', 'team', 'createdAt', 'updatedAt'],
+        fields: ['userId', 'teamId', 'createdAt', 'updatedAt'],
         stat: {
           aggregate: [
             { fields: ['userId'], group: 'userId', aggregate: ['count'] },

package/extend/waibuDb/schema/ticket.json

@@ -0,0 +1,16 @@
+{
+  "common": {
+    "widget": {
+      "cat": {
+        "attr": {
+          "url": "sumba.restapi:/manage/ticket-cat"
+        }
+      },
+      "userId": {
+        "attr": {
+          "url": "sumba.restapi:/manage/user"
+        }
+      }
+    }
+  }
+}

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/extend/waibuRestApi/route/manage/ticket-cat/model-builder.json

@@ -0,0 +1,4 @@
+{
+  "model": "SumbaTicketCat",
+  "disabled": ["create", "update", "remove"]
+}

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/lib/util.js

@@ -178,8 +178,8 @@ export async function checkUserId (req, reply, source) {
 export async function latLngHook (body, options) {
   const { isSet } = this.app.lib.aneka
   const { round } = this.app.lib.aneka
-  if (!isSet(body[options.fieldName])) return
-  body[options.fieldName] = round(body[options.fieldName], options.scale)
+  if (!isSet(body[options.field])) return
+  body[options.field] = round(body[options.field], options.scale)
 }
 
 export async function checkinterSite (req, reply) {

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # 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
+- [2.17.0] Rewrite necessary changes on model reference to match the new architecture
+
 ## 2026-04-02
 
 - [2.16.0] Add ```SumbaUserSetting``` model and necessary handlings