sumba 1.1.15 → 1.1.17

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

@@ -2,14 +2,15 @@ const doboBeforeRecordCreate = {
   level: 1000,
   handler: async function (model, body, options = {}) {
     const { get } = this.lib._
-    const { hasColumn } = this
+    const { getField } = this.app.dobo
     const { req } = options
 
     if (options.noAutoFilter || !req) return
     const item = { siteId: 'site.id', userId: 'user.id' }
     for (const i in item) {
       const rec = get(req, item[i])
-      if (rec && await hasColumn(i, model)) body[i] = rec
+      const field = getField(i, model)
+      if (rec && field) body[i] = field.type === 'string' ? (rec + '') : rec
     }
   }
 }

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

@@ -2,11 +2,11 @@ const useAdmin = ['waibuAdmin']
 
 export async function rebuildFilter (model, filter, req) {
   const { isEmpty, map, find, get } = this.lib._
-  const { hasColumn } = this
+  const { hasField } = this.app.dobo
   filter.query = filter.query ?? {}
-  const hasSiteId = await hasColumn('siteId', model)
-  const hasUserId = await hasColumn('userId', model)
-  const hasTeamId = await hasColumn('teamId', model)
+  const hasSiteId = hasField('siteId', model)
+  const hasUserId = hasField('userId', model)
+  const hasTeamId = hasField('teamId', model)
   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: [] }

package/package.json

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

package/plugin/factory.js

@@ -49,7 +49,7 @@ async function factory (pkgName) {
           },
           pages: [{
             title: 'account',
-            level: 80,
+            level: 9998,
             children: [
               // anonymous only
               { title: 'signin', href: 'sumba:/signin', visible: 'anon' },
@@ -65,7 +65,7 @@ async function factory (pkgName) {
             ]
           }, {
             title: 'help',
-            level: 90,
+            level: 9999,
             children: [
               { title: 'contactForm', href: 'sumba:/help/contact-form' },
               { title: 'troubleTickets', href: 'sumba:/help/trouble-tickets', visible: 'auth' },
@@ -142,15 +142,6 @@ async function factory (pkgName) {
       }
     }
 
-    hasColumn = async (name, model) => {
-      const { getInfo } = this.app.dobo
-      const { find } = this.lib._
-      const { schema } = getInfo(model)
-
-      const result = find(schema.properties, { name })
-      return !!result
-    }
-
     getUser = async (rec, safe = true) => {
       const { recordGet } = this.app.dobo
       const { omit, isPlainObject } = this.lib._

package/waibuDb/schema/site.json

@@ -6,13 +6,7 @@
       { "name": "Person In Charge", "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", { "name": "country", "col": "6-md", "component": "form-select-country" }, "phone:6-md", "website:12"] },
       { "name": "Social Media", "fields": ["twitter:3-md 6-sm", "instagram:3-md 6-sm", "facebook:3-md 6-sm", "linkedIn:3-md 6-sm"] }
-    ],
-    "stat": {
-      "aggregate": [
-        { "fields": ["status"], "group": "status", "aggregate": ["count"] },
-        { "fields": ["country"], "group": "country", "aggregate": ["count"] }
-      ]
-    }
+    ]
   },
   "view": {
     "list": {
@@ -20,7 +14,13 @@
         "sort": "hostname:1",
         "limit": 10
       },
-      "fields": ["createdAt", "status", "hostname", "orgName", "email", "city", "zipCode", "provinceState", "country", "phone"]
+      "fields": ["createdAt", "status", "hostname", "orgName", "email", "city", "zipCode", "provinceState", "country", "phone"],
+      "stat": {
+        "aggregate": [
+          { "fields": ["status"], "group": "status", "aggregate": ["count"] },
+          { "fields": ["country"], "group": "country", "aggregate": ["count"] }
+        ]
+      }
     },
     "details": {
     },

package/waibuDb/schema/user.json

@@ -5,13 +5,7 @@
       { "name": "account", "fields": ["username", "email", "status:4-md 6-sm", "siteId:4-md 6-sm", "firstName", "lastName"] },
       { "name": "address", "fields": ["address1:12", "address2:12", "city:6-md 8-sm", "zipCode:2-md 4-sm", "provinceState:4-md", { "name": "country", "col": "6-md", "component": "form-select-country" }, "phone:6-md", "website:12"] },
       { "name": "socialMedia", "fields": ["twitter:3-md 6-sm", "instagram:3-md 6-sm", "facebook:3-md 6-sm", "linkedIn:3-md 6-sm"] }
-    ],
-    "stat": {
-      "aggregate": [
-        { "fields": ["status"], "group": "status", "aggregate": ["count"] },
-        { "fields": ["country"], "group": "country", "aggregate": ["count"] }
-      ]
-    }
+    ]
   },
   "view": {
     "list": {
@@ -19,7 +13,13 @@
         "sort": "username:1",
         "limit": 10
       },
-      "fields": ["createdAt", "status", "siteId", "username", "email", "firstName", "lastName", "city", "zipCode", "provinceState", "country", "phone"]
+      "fields": ["createdAt", "status", "siteId", "username", "email", "firstName", "lastName", "city", "zipCode", "provinceState", "country", "phone"],
+      "stat": {
+        "aggregate": [
+          { "fields": ["status"], "group": "status", "aggregate": ["count"] },
+          { "fields": ["country"], "group": "country", "aggregate": ["count"] }
+        ]
+      }
     },
     "details": {
     },