sumba 1.2.3 → 1.2.5

package/lib/collect-routes.js

@@ -2,7 +2,8 @@ export async function collect ({ type = '', handler, container, file, ns, dir })
   const { readConfig } = this.app.bajo
   const { routePath, routePathHandlers } = this.app.waibu
   const { camelCase, find, isString, isEmpty } = this.lib._
-  const items = await readConfig(file, { ignoreError: true })
+  let items = await readConfig(file, { ignoreError: true })
+  if (isEmpty(items)) items = []
 
   for (let item of items) {
     if (isString(item)) item = { path: item }

package/package.json

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

package/waibuDb/schema/user.json

@@ -1,8 +1,8 @@
 {
   "common": {
     "layout": [
-      { "name": "meta", "fields": ["id", "createdAt", "updatedAt"] },
-      { "name": "account", "fields": ["username", "email", "password", "status", "firstName", "lastName"] },
+      { "name": "meta", "fields": ["id:3", "createdAt:3", "updatedAt:3", "status:3"] },
+      { "name": "account", "fields": ["username", "email", "provider", "password", "firstName", "lastName"] },
       { "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"] }
     ],
@@ -18,7 +18,7 @@
         "sort": "username:1",
         "limit": 10
       },
-      "fields": ["createdAt", "status", "username", "email", "firstName", "lastName", "city", "zipCode", "provinceState", "country", "phone"],
+      "fields": ["createdAt", "status", "username", "provider", "email", "firstName", "lastName", "city", "zipCode", "provinceState", "country", "phone"],
       "stat": {
         "aggregate": [
           { "fields": ["status"], "group": "status", "aggregate": ["count"] },
@@ -53,7 +53,7 @@
           }
         }
       },
-      "readonly": ["id", "createdAt", "updatedAt", "username"]
+      "readonly": ["id", "createdAt", "updatedAt", "username", "provider"]
     }
   }
 }

package/waibuMpa/extend/waibuAdmin/route/reset-user-password.js

@@ -33,7 +33,7 @@ const resetUserPassword = {
         error = err
       }
     }
-    return reply.view('sumba.template:/_admin/reset-user-password.html', { form, error })
+    return await reply.view('sumba.template:/_admin/reset-user-password.html', { form, error })
   }
 }
 

package/waibuMpa/route/help/contact-form.js

@@ -12,13 +12,13 @@ const contactForm = {
       try {
         const { data } = await recordCreate({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
         req.flash('notify', req.t('contactFormSubmitted'))
-        return reply.view('sumba.template:/help/contact-form/success.html', { form: req.body, data })
+        return await reply.view('sumba.template:/help/contact-form/success.html', { form: req.body, data })
       } catch (err) {
         error = err
       }
     }
     const cats = await recordFind({ model: 'SumbaContactFormCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
-    return reply.view('sumba.template:/help/contact-form/form.html', { form, error, cats })
+    return await reply.view('sumba.template:/help/contact-form/form.html', { form, error, cats })
   }
 }
 

package/waibuMpa/route/help/trouble-tickets/add.js

@@ -17,7 +17,7 @@ const add = {
       }
     }
     const cats = await recordFind({ model: 'SumbaTicketCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
-    return reply.view('sumba.template:/help/trouble-tickets/add.html', { form, error, cats })
+    return await reply.view('sumba.template:/help/trouble-tickets/add.html', { form, error, cats })
   }
 }
 

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

@@ -33,7 +33,7 @@ const id = {
         return `<c:div margin="bottom-3"><c:badge background="color:${isMe ? 'primary' : 'secondary'}" t:content="${isMe ? 'you' : 'us'}" /> <small>${req.format(val, 'datetime')}</small></c:div> ${message}`
       }
     }
-    return reply.view('sumba.template:/help/trouble-tickets/details.html', { list, schema, master, form, error })
+    return await reply.view('sumba.template:/help/trouble-tickets/details.html', { list, schema, master, form, error })
   }
 }
 

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

@@ -16,7 +16,7 @@ const list = {
         return `<strong>${val}</strong><br />${getExcerpt(rec.message, 35)}`
       }
     }
-    return reply.view('sumba.template:/help/trouble-tickets/list.html', { list, schema })
+    return await reply.view('sumba.template:/help/trouble-tickets/list.html', { list, schema })
   }
 }
 

package/waibuMpa/route/info/@item.js

@@ -1,7 +1,7 @@
 const infoItem = {
   method: 'GET',
   handler: async function (req, reply) {
-    return reply.view(`sumba.template:/info/${req.params.item}.md`)
+    return await reply.view(`sumba.template:/info/${req.params.item}.md`)
   }
 }
 

package/waibuMpa/route/signin.js

@@ -13,7 +13,7 @@ const signin = {
         error = err
       }
     }
-    return reply.view('sumba.template:/signin.html', { form: { username, referer }, error })
+    return await reply.view('sumba.template:/signin.html', { form: { username, referer }, error })
   }
 }
 

package/waibuMpa/route/signout.js

@@ -18,7 +18,7 @@ const signout = {
       req.flash('notify', req.t('signoutSuccessfully'))
       return reply.redirectTo(url, { query, params })
     }
-    return reply.view('sumba.template:/signout.html', { form: { referer } })
+    return await reply.view('sumba.template:/signout.html', { form: { referer } })
   }
 }
 

package/waibuMpa/route/user/activation.js

@@ -19,7 +19,7 @@ const userActivation = {
         error = err
       }
     }
-    return reply.view('sumba.template:/user/activation.html', { form, error })
+    return await reply.view('sumba.template:/user/activation.html', { form, error })
   }
 }
 

package/waibuMpa/route/user/forgot-password/@fpl.js

@@ -27,7 +27,7 @@ const forgotPasswordLink = {
 
     const form = defaultsDeep(req.body, {})
     const user = await getUser.call(this, req, reply)
-    if (isString(user)) return reply.view(user)
+    if (isString(user)) return await reply.view(user)
     form.username = user.username
     let error
     if (req.method === 'POST') {
@@ -56,7 +56,7 @@ const forgotPasswordLink = {
         error = err
       }
     }
-    return reply.view('sumba.template:/user/fpl.html', { form, error })
+    return await reply.view('sumba.template:/user/fpl.html', { form, error })
   }
 }
 

package/waibuMpa/route/user/forgot-password.js

@@ -3,7 +3,7 @@ const model = 'SumbaUser'
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    if (!this.app.masohiMail) return reply.view('sumba.template:/user/forgot-password.html')
+    if (!this.app.masohiMail) return await reply.view('sumba.template:/user/forgot-password.html')
     const { sendMail } = this.app.waibu
     const { defaultsDeep } = this.lib.aneka
     const { dayjs } = this.lib
@@ -32,7 +32,7 @@ const profile = {
         error = err
       }
     }
-    return reply.view('sumba.template:/user/forgot-password.html', { form, error })
+    return await reply.view('sumba.template:/user/forgot-password.html', { form, error })
   }
 }
 

package/waibuMpa/route/user/signup.js

@@ -26,12 +26,12 @@ const signup = {
         req.body.provider = 'local'
         const { data } = await recordCreate({ model: 'SumbaUser', req, reply, options: { validation, noFlash: true, forceNoHidden: true } })
         req.flash('notify', req.t('userCreated'))
-        return reply.view('sumba.template:/user/signup/success.html', { form: req.body, data })
+        return await reply.view('sumba.template:/user/signup/success.html', { form: req.body, data })
       } catch (err) {
         error = err
       }
     }
-    return reply.view('sumba.template:/user/signup/form.html', { form, error })
+    return await reply.view('sumba.template:/user/signup/form.html', { form, error })
   }
 }
 

package/waibuMpa/route/your-stuff/change-password.js

@@ -36,7 +36,7 @@ const profile = {
         error = err
       }
     }
-    return reply.view('sumba.template:/your-stuff/change-password.html', { form, error })
+    return await reply.view('sumba.template:/your-stuff/change-password.html', { form, error })
   }
 }
 

package/waibuMpa/route/your-stuff/profile/edit.js

@@ -22,7 +22,7 @@ const profile = {
         error = err
       }
     }
-    return reply.view('sumba.template:/your-stuff/profile/edit.html', { form, error })
+    return await reply.view('sumba.template:/your-stuff/profile/edit.html', { form, error })
   }
 }
 

package/waibuMpa/route/your-stuff/profile.js

@@ -7,7 +7,7 @@ const profile = {
     const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options })
     const form = resp.data
     form.token = await hash(form.salt)
-    return reply.view('sumba.template:/your-stuff/profile/view.html', { form })
+    return await reply.view('sumba.template:/your-stuff/profile/view.html', { form })
   }
 }
 

package/waibuMpa/route/your-stuff/reset-api-key.js

@@ -33,7 +33,7 @@ const resetApiKey = {
         error = err
       }
     }
-    return reply.view('sumba.template:/your-stuff/reset-api-key.html', { form, error })
+    return await reply.view('sumba.template:/your-stuff/reset-api-key.html', { form, error })
   }
 }