sumba 2.0.0 → 2.1.0

package/extend/dobo/feature/status.js

@@ -9,8 +9,8 @@ async function status (opts = {}) {
       values: opts.values ?? ['UNVERIFIED', 'ACTIVE', 'INACTIVE']
     }],
     hook: {
-      beforeCreate: async function ({ body }) {
-        const { isSet } = this.lib.aneka
+      beforeCreate: async function (body) {
+        const { isSet } = this.app.lib.aneka
         if (!isSet(body[opts.fieldName])) body[opts.fieldName] = opts.default
       }
     }

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

@@ -4,11 +4,11 @@ async function teamId (opts = {}) {
       name: 'teamId',
       type: 'string',
       maxLength: 50,
-      rel: {
+      ref: {
         site: {
-          schema: 'SumbaSite',
+          model: 'SumbaSite',
           propName: 'id',
-          type: 'one-to-one'
+          type: '1:1'
         }
       },
       index: true

package/extend/dobo/feature/url.js

@@ -1,5 +1,5 @@
-async function hook (schema, body, options) {
-  const { isSet } = this.lib.aneka
+async function hook (body, options) {
+  const { isSet } = this.app.lib.aneka
   let val = body[options.fieldName]
   if (!isSet(val)) return
   const [, ...params] = val.split('://')
@@ -16,11 +16,11 @@ async function url (opts = {}) {
       type: 'string'
     }],
     hook: {
-      beforeCreate: async function ({ schema, body }) {
-        await hook.call(this, schema, body, opts)
+      beforeCreate: async function (body) {
+        await hook.call(this, body, opts)
       },
-      beforeUpdate: async function ({ schema, body }) {
-        await hook.call(this, schema, body, opts)
+      beforeUpdate: async function (body) {
+        await hook.call(this, body, opts)
       }
     }
   }

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

@@ -5,16 +5,16 @@ async function userId (opts = {}) {
       name: opts.fieldName,
       type: 'string',
       maxLength: 50,
-      rel: {
+      ref: {
         site: {
-          schema: 'SumbaSite',
+          model: 'SumbaSite',
           propName: 'id',
-          type: 'one-to-one'
+          type: '1:1'
         },
         user: {
-          schema: 'SumbaUser',
+          model: 'SumbaUser',
           propName: 'id',
-          type: 'one-to-one',
+          type: '1:1',
           fields: ['id', 'username', 'email', 'firstName', 'lastName']
         }
       },

package/extend/dobo/fixture/site.json

@@ -13,9 +13,5 @@
   "website": "http://www.your-domain.com",
   "phone": "+001-000000001",
   "waPhone": "+001-111111111",
-  "socX": "XHandler",
-  "socFacebook": "FBHandler",
-  "socInstagram": "InstagramHandler",
-  "socLinkedIn": "LIHandler",
   "status": "ACTIVE"
 }]

package/extend/dobo/fixture/team.json

@@ -2,5 +2,6 @@
   "alias": "administrator",
   "name": "Administrator",
   "siteId": "?:SumbaSite::alias:default",
-  "status": "ENABLED"
+  "status": "ENABLED",
+  "_immutable": true
 }]

package/extend/dobo/model/contact-form-cat.json

@@ -0,0 +1,3 @@
+{
+  "features": ["sumba:category", "sumba:siteId"]
+}

package/extend/dobo/model/contact-form.json

@@ -0,0 +1,16 @@
+{
+  "properties": [
+    "firstName,,50,true,true",
+    "lastName,,50,true,true",
+    "email,,50,true,true",
+    "cat,,50,true",
+    "subject,,255,,true",
+    "message,text"
+  ],
+  "features": [{
+      "name": "sumba:status",
+      "default": "NEW",
+      "values": ["NEW", "ACK"]
+    }, "sumba:userId", "sumba:siteId", "dobo:createdAt", "dobo:updatedAt"
+  ]
+}

package/extend/dobo/model/download.json

@@ -0,0 +1,19 @@
+{
+  "properties": [
+    "description,,50,true",
+    "file,text,,,true",
+    "type,,20,true",
+    "jobQueue,object",
+    {
+      "name": "size",
+      "type": "integer",
+      "default": 0,
+      "index": true
+    }
+  ],
+  "features": ["sumba:siteId", "sumba:userId", "dobo:createdAt", "dobo:updatedAt", {
+    "name": "sumba:status",
+    "default": "INQUEUE",
+    "values": ["INQUEUE", "PROCESSING", "COMPLETE", "FAIL"]
+  }]
+}

package/extend/dobo/model/site-setting.json

@@ -0,0 +1,8 @@
+{
+  "properties": [
+    "ns,,50,true,true",
+    "key,,50,true,true",
+    "value,text"
+  ],
+  "features": ["sumba:siteId", "dobo:updatedAt"]
+}

package/extend/dobo/{schema → model}/site.json

@@ -28,12 +28,8 @@
     "maxLength": 100,
     "rules": ["email"]
   }],
-  "feature": {
-    "sumba.personInCharge": true,
-    "sumba.address": true,
-    "sumba.social": true,
-    "sumba.status": { "default": "ACTIVE" },
-    "createdAt": true,
-    "updatedAt": true
-  }
+  "features": ["sumba:personInCharge", "sumba:address", "sumba:social", {
+    "name": "sumba:status",
+    "default": "ACTIVE"
+  }, "dobo:createdAt", "dobo:updatedAt"]
 }

package/extend/dobo/{schema → model}/team-user.json

@@ -4,23 +4,18 @@
     "type": "string",
     "maxLength": 50,
     "required": true,
-    "rel": {
+    "ref": {
       "team": {
-        "schema": "SumbaTeam",
+        "model": "SumbaTeam",
         "propName": "id",
-        "type": "one-to-one",
+        "type": "1:1",
         "fields": ["id", "name"]
       }
     }
   }],
   "indexes": [{
     "fields": ["userId", "siteId", "teamId"],
-    "unique": true
+    "type": "unique"
   }],
-  "feature": {
-    "createdAt": true,
-    "updatedAt": true,
-    "sumba.siteId": true,
-    "sumba.userId": true
-  }
+  "features": ["dobo:createdAt", "dobo:updatedAt", "sumba:siteId", "sumba:userId"]
 }

package/extend/dobo/model/team.json

@@ -0,0 +1,15 @@
+{
+  "properties": [
+    "alias,,20,,true",
+    "name,,50,true,true"
+  ],
+  "indexes": [{
+    "fields": ["alias", "siteId"],
+    "type": "unique"
+  }],
+  "features": ["dobo:createdAt", "dobo:updatedAt", "dobo:immutable", "sumba:siteId", {
+    "name": "sumba:status",
+    "default": "ENABLED",
+    "values": ["ENABLED", "DISABLED"]
+  }]
+}

package/extend/dobo/model/ticket-cat.json

@@ -0,0 +1,3 @@
+{
+  "features": ["sumba:category", "sumba:siteId"]
+}

package/extend/dobo/model/ticket-detail.json

@@ -0,0 +1,7 @@
+{
+  "properties": [
+    "masterId,,255,true,true",
+    "message,text"
+  ],
+  "features": ["dobo:createdAt", "sumba:userId", "sumba:siteId"]
+}

package/extend/dobo/model/ticket.json

@@ -0,0 +1,18 @@
+{
+  "properties": [
+    "subject,,255,true,true",
+    "cat,,50,true",
+    "message,text,,,true"
+  ],
+  "features": [
+    "dobo:createdAt",
+    "dobo:updatedAt",
+    "sumba:siteId",
+    "sumba:userId",
+    {
+      "name": "sumba:status",
+      "default": "OPEN",
+      "values": ["OPEN", "CLOSED"]
+    }
+  ]
+}

package/extend/dobo/{schema → model}/user.json

@@ -46,21 +46,24 @@
     "required": true,
     "index": true
   }],
-  "globalRules": [{ "rule": "trim", "fields": ["username", "firstName", "lastName"] }],
+  "rules": [{ "rule": "trim", "fields": ["username", "firstName", "lastName"] }],
   "indexes": [{
     "fields": ["username", "siteId"],
-    "unique": true
+    "type": "unique"
   }, {
     "fields": ["email", "siteId"],
-    "unique": true
+    "type": "unique"
   }],
   "hidden": ["password", "token"],
-  "feature": {
-    "sumba.address": true,
-    "sumba.social": true,
-    "sumba.status": { "default": "UNVERIFIED" },
-    "sumba.siteId": true,
-    "createdAt": true,
-    "updatedAt": true
-  }
+  "features": [
+    "sumba:address",
+    "sumba:social",
+    {
+      "name": "sumba:status",
+      "default": "UNVERIFIED"
+    },
+    "sumba:siteId",
+    "dobo:createdAt",
+    "dobo:updatedAt"
+  ]
 }

package/extend/masohiSocketIo/middleware/server/auth.js

@@ -1,7 +1,7 @@
 const auth = {
   level: 5,
   handler: async function (socket) {
-    const { camelCase } = this.lib._
+    const { camelCase } = this.app.lib._
     const { req } = socket
     const { session } = req
     const site = await this.getSite(session.siteId)

package/extend/waibuBootstrap/theme/component/factory/nav-dropdown-user.js

@@ -1,8 +1,8 @@
 async function navDropdownUser () {
   return class NavDropdownUser extends this.baseFactory {
     build = async () => {
-      const { has, omit, find, filter } = this.plugin.lib._
-      const { routePath } = this.plugin.app.waibu
+      const { has, omit, find, filter } = this.app.lib._
+      const { routePath } = this.app.waibu
       const { req } = this.component
       const icon = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name: 'person' } }) : ''
       let text = ''
@@ -14,7 +14,7 @@ async function navDropdownUser () {
         } else text = req.t('guest')
       }
       const html = []
-      const attr = omit(this.params.attr, ['text'])
+      const attr = omit(this.params.attr, ['text', 'noMenu'])
       attr.dropdown = true
       attr.content = `${icon} ${text}`
       if (this.params.attr.noMenu) {
@@ -22,7 +22,7 @@ async function navDropdownUser () {
         delete attr.dropdownMenu
         attr.href = routePath(this.component.req.user ? 'sumba:/your-stuff/profile' : 'sumba:/signin')
       } else {
-        const menu = find(this.plugin.app.sumba.config.waibuMpa.menuHandler, { title: 'account' })
+        const menu = find(this.app.sumba.config.waibuMpa.menuHandler, { title: 'account' })
         if (menu) {
           const items = filter(menu.children, c => {
             if (!has(c, 'visible')) return true
@@ -53,7 +53,7 @@ async function navDropdownUser () {
         }
       }
       this.params.noTag = true
-      this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html: html.join('\n') })
+      this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html: html.join('\n'), noEscape: true })
     }
   }
 }

package/extend/waibuDb/schema/download.js

@@ -8,7 +8,7 @@ async function download () {
           return await this.component.buildSentence(sentence)
         },
         size: function (val, rec) {
-          const { formatByte } = this.plugin.app.bajoExtra
+          const { formatByte } = this.app.bajoExtra
           return formatByte(rec.size)
         }
       }

package/extend/waibuDb/schema/site.json

@@ -6,7 +6,7 @@
       { "name": "General", "fields": ["hostname", "alias", "title", "orgName", "email", "status:4-md 6-sm"] },
       { "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", "country:6-md", "phone:6-md", "website:12"] },
-      { "name": "Social Media", "fields": ["socX:3-md 6-sm", "socInstagram:3-md 6-sm", "socFacebook:3-md 6-sm", "linkedIn:3-md 6-sm"] }
+      { "name": "Social Media", "fields": ["socX:3-md 6-sm", "socInstagram:3-md 6-sm", "socFacebook:3-md 6-sm", "socLinkedIn:3-md 6-sm"] }
     ],
     "widget": {
       "country": {
@@ -28,7 +28,7 @@
         "noCloneBtn": true,
         "detailsHref": "waibuAdmin:/site/site"
       },
-      "readonly": ["id", "createdAt", "updatedAt"]
+      "readonly": ["id", "createdAt", "updatedAt", "hostname"]
     }
   }
 }

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

@@ -11,10 +11,10 @@ async function teamUser () {
       ],
       valueFormatter: {
         user: (val, rec) => {
-          return rec._rel.user.username
+          return rec._ref.user.username
         },
         team: (val, rec) => {
-          return rec._rel.team.name
+          return rec._ref.team.name
         }
       },
       widget: {

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

@@ -5,10 +5,9 @@ const resetUserPassword = {
   title: 'resetUserPassword',
   handler: async function (req, reply) {
     const { importPkg } = this.app.bajo
-    const { recordFindOne, recordUpdate } = this.app.dobo
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const Joi = await importPkg('dobo:joi')
-    const model = 'SumbaUser'
+    const model = this.app.dobo.getModel('SumbaUser')
     const form = defaultsDeep(req.body, { username: req.query.username })
     let error
     if (req.method === 'POST') {
@@ -22,11 +21,11 @@ const resetUserPassword = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        const rec = await recordFindOne(model, { query: { username: req.body.username } })
+        const rec = await model.findOneRecord({ query: { username: req.body.username } })
         if (!rec) throw this.error('unknownUser', { details: [{ field: 'username', error: 'unknownUser' }], statusCode: 400 })
-        await recordUpdate(model, rec.id, { password: req.body.password }, { req, reply })
+        await model.updateRecord(rec.id, { password: req.body.password }, { req, reply })
         form.password = ''
         form.verifyPassword = ''
       } catch (err) {

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

@@ -9,7 +9,32 @@ const manageSite = {
     const template = `waibuDb.template:/crud/${req.query.edit ? 'edit' : 'details'}.html`
     const model = 'SumbaSite'
     req.params.id = req.site.id
+    req.query.id = req.site.id
     req.params.base = ''
+    /*
+    const options = {
+      schema: {
+        view: {
+          details: {
+            control: {
+              noBackBtn: true,
+              noCloneBtn: true,
+              noDeleteBtn: true,
+              editHref: '?edit=1'
+            }
+          },
+          edit: {
+            control: {
+              noDetailsBtn: true,
+              noCloneBtn: true,
+              noDeleteBtn: true,
+              backHref: '?details=1'
+            }
+          }
+        }
+      }
+    }
+    */
     return await action.call(this, { req, reply, model, template })
   }
 }

package/extend/waibuMpa/route/access-token.js

@@ -1,9 +1,8 @@
 const apiToken = {
   method: 'POST',
   handler: async function (req, reply) {
-    const { recordGet } = this.app.dobo
     if (!req.user) return ''
-    const rec = await recordGet('SumbaUser', req.user.id, { forceNoHidden: true, noCache: true })
+    const rec = await this.app.dobo.getModel('SumbaUser').getRecord(req.user.id, { forceNoHidden: true, noCache: true })
     return (await this.createJwtFromUserRecord(rec)).token
   }
 }

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

@@ -1,23 +1,23 @@
 const contactForm = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
-    const { pick } = this.lib._
-    const { recordCreate, recordFind } = this.app.waibuDb
+    const { defaultsDeep } = this.app.lib.aneka
+    const { pick } = this.app.lib._
+    const { createRecord, findRecord } = this.app.waibuDb
 
     const def = req.user ? pick(req.user, ['firstName', 'lastName', 'email']) : {}
     const form = defaultsDeep(req.body, def)
     let error
     if (req.method === 'POST') {
       try {
-        const { data } = await recordCreate({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
+        const { data } = await createRecord({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
         req.flash('notify', req.t('contactFormSubmitted'))
         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 } })
+    const cats = await findRecord({ model: 'SumbaContactFormCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
     return await reply.view('sumba.template:/help/contact-form/form.html', { form, error, cats })
   }
 }

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

@@ -3,20 +3,20 @@ const model = 'SumbaTicket'
 const add = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
-    const { recordCreate, recordFind } = this.app.waibuDb
+    const { defaultsDeep } = this.app.lib.aneka
+    const { createRecord, findRecord } = this.app.waibuDb
     const options = {}
     const form = defaultsDeep(req.body, {})
     let error
     if (req.method === 'POST') {
       try {
-        await recordCreate({ model, req, reply, options })
+        await createRecord({ model, req, reply, options })
         return reply.redirectTo('sumba:/help/trouble-tickets/list')
       } catch (err) {
         error = err
       }
     }
-    const cats = await recordFind({ model: 'SumbaTicketCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
+    const cats = await findRecord({ model: 'SumbaTicketCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
     return await reply.view('sumba.template:/help/trouble-tickets/add.html', { form, error, cats })
   }
 }

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

@@ -3,18 +3,18 @@ const model = 'SumbaTicketDetail'
 const id = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { cloneDeep } = this.lib._
-    const { recordCreate, recordFind, getSchemaExt } = this.app.waibuDb
+    const { cloneDeep } = this.app.lib._
+    const { createRecord, findRecord, getSchemaExt } = this.app.waibuDb
     const { schema } = await getSchemaExt(model, 'list')
 
-    const master = (await recordFind({ model: 'SumbaTicket', req, options: { dataOnly: true, query: { id: req.params.id }, limit: 1 } }))[0]
+    const master = (await findRecord({ model: 'SumbaTicket', req, options: { dataOnly: true, query: { id: req.params.id }, limit: 1 } }))[0]
     if (!master) throw this.error('_notFound')
     const form = cloneDeep(req.body)
     let error
     if (req.method === 'POST') {
       try {
         form.masterId = master.id + ''
-        await recordCreate({ model: 'SumbaTicketDetail', req, body: form })
+        await createRecord({ model: 'SumbaTicketDetail', req, body: form })
         return reply.redirectTo('sumba:/help/trouble-tickets/list')
       } catch (err) {
         error = err
@@ -22,7 +22,7 @@ const id = {
     }
     const query = { masterId: req.params.id + '' }
     const options = { count: true, query }
-    const list = await recordFind({ model, req, options })
+    const list = await findRecord({ model, req, options })
     schema.view.disabled = ['update', 'remove']
     schema.view.fields = ['createdAt']
     schema.view.label = { createdAt: 'conversation' }

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

@@ -3,11 +3,11 @@ const model = 'SumbaTicket'
 const list = {
   method: ['GET'],
   handler: async function (req, reply) {
-    const { recordFind, getSchemaExt } = this.app.waibuDb
+    const { findRecord, getSchemaExt } = this.app.waibuDb
     const { getExcerpt } = this.app.bajoTemplate
     const { schema } = await getSchemaExt(model, 'list')
     const options = { count: true }
-    const list = await recordFind({ model, req, options })
+    const list = await findRecord({ model, req, options })
     schema.view.disabled = ['update', 'remove']
     schema.view.fields = ['createdAt', 'subject', 'status']
     schema.view.label = { subject: 'Your Message' }

package/extend/waibuMpa/route/signout.js

@@ -1,23 +1,10 @@
 const signout = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { runHook } = this.app.bajo
-    // const { isEmpty } = this.lib._
-    const { getSessionId } = this.app.waibuMpa
-
     let { referer } = req.body || {}
     if (req.session.ref) referer = req.session.ref
     req.session.ref = null
-    if (req.method === 'POST') {
-      const sid = await getSessionId(req.headers.cookie)
-      req.session.userId = null
-      await runHook(`${this.name}:afterSignout`, sid, req)
-      const { query, params } = req
-      // const url = !isEmpty(referer) ? referer : this.config.redirect.home
-      const url = this.config.redirect.afterSignout
-      req.flash('notify', req.t('signoutSuccessfully'))
-      return reply.redirectTo(url, { query, params })
-    }
+    if (req.method === 'POST') return this.signout({ req, reply })
     return await reply.view('sumba.template:/signout.html', { form: { referer } })
   }
 }