sumba 2.27.1 → 2.27.3

package/extend/bajo/hook.js

@@ -23,16 +23,16 @@ async function clearCacheUser (id, result) {
 
 async function applyModelGuard ({ model, q, teamIds, options }) {
   const { get, set, orderBy, intersection, without } = this.app.lib._
-  const { include } = this.app.lib.aneka
+  const { includes } = this.app.lib.aneka
   const { req } = options
   const results = []
 
   const guards = await this.getModelGuards()
   const columns = model.getNonVirtualProperties().map(prop => prop.name)
   const filterFn = item => {
-    const bySiteId = item.siteIds.includes(req.site.id + '')
+    const bySiteId = item.siteIds ? item.siteIds.includes(req.site.id + '') : true
     const byModel = item.models.includes(model.name)
-    const byTeamId = item.teamIds.length === 0 || include(item.teamIds, teamIds)
+    const byTeamId = item.teamIds ? includes(item.teamIds, teamIds) : true
     const byColumn = columns.includes(item.column)
     return bySiteId && byModel && byTeamId && byColumn
   }
@@ -54,7 +54,8 @@ async function applyModelGuard ({ model, q, teamIds, options }) {
     for (const item of items) {
       newValues.push(...item.value)
     }
-    if (newValues.length > 0) values = intersection(values, newValues)
+    if (values.length === 0) values = newValues
+    else if (newValues.length > 0) values = intersection(values, newValues)
     items = guards.local.filter(item => item.column === col && item.negation)
     for (const item of items) {
       values = without(values, ...item.value)
@@ -69,15 +70,15 @@ async function applyModelGuard ({ model, q, teamIds, options }) {
 
 export async function applyAttribGuard ({ model, teamIds, options }) {
   const { uniq } = this.app.lib._
-  const { include } = this.app.lib.aneka
+  const { includes } = this.app.lib.aneka
   const { req } = options
   const results = []
 
   const guards = await this.getAttribGuards()
   const filterFn = item => {
-    const bySiteId = item.siteIds.includes(req.site.id + '')
+    const bySiteId = item.siteIds ? item.siteIds.includes(req.site.id + '') : true
     const byModel = item.models.includes(model.name)
-    const byTeamId = item.teamIds.length === 0 || include(item.teamIds, teamIds)
+    const byTeamId = item.teamIds ? includes(item.teamIds, teamIds) : true
     return bySiteId && byModel && byTeamId
   }
 

package/extend/waibuDb/schema/user.js

@@ -1,32 +1,56 @@
 async function user ({ req } = {}) {
   const { merge } = this.app.lib._
+  const { routePath } = this.app.waibu
   const details = {
+    layout: [
+      { name: 'meta', fields: ['id:3', 'createdAt:3', 'updatedAt:3', 'status:3'] },
+      { name: 'account', fields: ['username:3', 'email:3', 'provider:3', 'password:3', 'firstName:3', 'lastName:3', 'apiKey:6'] },
+      { 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'] }
+    ],
     forceVisible: ['password', 'token'],
     format: {
       password: function (val, rec) {
-        return `<a href="waibuAdmin:/site/reset-user-password?username=${rec.username}">${req.t('resetPassword')}</a>`
+        return '*************'
+        // return `<a href="waibuAdmin:/site/reset-user-password?username=${rec.username}">${req.t('resetPassword')}</a>`
       }
     },
     widget: {
+      username: {
+        attr: {
+          id: 'fusername'
+        }
+      },
       password: {
-        component: 'form-plaintext'
+        component: 'form-plaintext',
+        addons: [{
+          attr: {
+            'x-data': true,
+            '@click': `location.href='${routePath('waibuAdmin:/site/reset-user-password?username=')}' + document.getElementById('fusername').textContent`,
+            icon: 'arrowsRepeat'
+          },
+          type: 'button',
+          position: 'append'
+        }]
+      },
+      apiKey: {
+        attr: {
+          id: 'fapi-key',
+          text: 'truncate'
+        },
+        addons: [{
+          attr: {
+            'x-data': true,
+            '@click': "await wbs.copyToClipboard('#fapi-key', true)",
+            icon: 'copy'
+          },
+          type: 'button',
+          position: 'append'
+        }]
       }
     }
   }
   return {
-    common: {
-      layout: [
-        { name: 'meta', fields: ['id:3', 'createdAt:3', 'updatedAt:3', 'status:3'] },
-        { name: 'account', fields: ['username:3', 'email:3', 'provider:3', 'password:3', 'firstName:3', 'lastName:3'] },
-        { 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: {
-        token: {
-          component: 'form-plaintext'
-        }
-      }
-    },
     view: {
       list: {
         qs: {
@@ -44,6 +68,12 @@ async function user ({ req } = {}) {
       },
       details,
       add: {
+        layout: [
+          { name: 'meta', fields: ['id:3', 'createdAt:3', 'updatedAt:3', 'status:3'] },
+          { name: 'account', fields: ['username:4', 'email:4', 'password:4', 'firstName:6', 'lastName:6'] },
+          { 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'] }
+        ],
         forceVisible: ['password'],
         hidden: ['id', 'createdAt', 'updatedAt', 'provider']
       },

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 2026-06-01
+
+- [2.27.3] Bug fix in ```user.js``` schema
+
 ## 2026-05-30
 
 - [2.27.0] Move all ```sumbaUser``` hooks to model hooks
@@ -7,6 +11,7 @@
 - [2.27.0] Bug fix in ```create-new-site.js```
 - [2.27.0] Bug fix in ```team-user.json``` fixture
 - [2.27.1] Bug fix in ```util.pathToCheck()```
+- [2.27.2] Bug fix in ```hook.js```
 
 ## 2026-05-29