sumba 1.2.7 → 1.2.10

package/bajo/hook/waibu-mpa@pre-parsing.js

@@ -6,12 +6,13 @@ import checkTeam from '../../lib/check-team.js'
 const preParsing = {
   level: 10,
   handler: async function (req, reply) {
-    const { routePath } = this.app.waibu
+    // const { routePath } = this.app.waibu
 
     await checkTheme.call(this, req, reply)
     await checkIconset.call(this, req, reply)
     await checkUserId.call(this, req, reply, 'waibuMpa')
     await checkTeam.call(this, req, reply, 'waibuMpa')
+    /*
     req.menu = req.menu ?? {}
     if (req.user) {
       req.menu.user = [
@@ -28,6 +29,7 @@ const preParsing = {
         { value: routePath('sumba:/user/forgot-password', req), text: req.t('forgotPassword') }
       ]
     }
+    */
   }
 }
 

package/bajo/intl/en-US.json

@@ -105,6 +105,7 @@
   "resetPassword": "Reset Password",
   "contactFormSubmitted": "Contact form successfully submitted",
   "currentApiKey": "Current API Key",
+  "downloadList": "Download List",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",
@@ -122,7 +123,8 @@
     "socX": "X (Twitter)",
     "socInstagram": "Instagram",
     "socFacebook": "Facebook",
-    "socLinkedIn": "LinkedIn"
+    "socLinkedIn": "LinkedIn",
+    "size": "Size"
   },
   "validation": {
     "password": {

package/bajo/intl/id.json

@@ -106,6 +106,7 @@
   "resetPassword": "Reset Kata Sandi",
   "contactFormSubmitted": "Form kontak sukses dikirim",
   "currentApiKey": "Kunci API Saat Ini",
+  "downloadList": "Daftar Unduh",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",
@@ -123,7 +124,8 @@
     "socX": "X (Twitter)",
     "socInstagram": "Instagram",
     "socFacebook": "Facebook",
-    "socLinkedIn": "LinkedIn"
+    "socLinkedIn": "LinkedIn",
+    "size": "Besaran"
   },
   "validation": {
     "password": {

package/bajoTemplate/partial/app-launcher.html

@@ -1,6 +1,6 @@
 <c:navbar border="side:bottom">
   <c:nav tag="ul" dim="width:100" flex="justify-content:end">
-    <c:nav-dropdown-user no-menu />
+    <c:sumba-nav-dropdown-user no-menu />
     <c:nav-divider />
     <c:nav-toggle-fullscreen />
     <c:nav-dropdown-darkmode dropdown-menu="end" />

package/dobo/schema/download.json

@@ -1,21 +1,24 @@
 {
-  "properties": [{
-    "name": "description",
-    "type": "string",
-    "maxLength": 50
-  }, {
-    "name": "jobId",
-    "type": "string",
-    "maxLength": 50
-  }, {
-    "name": "jobDetails",
-    "type": "object"
-  }, {
-    "name": "status",
-    "type": "string",
-    "maxLength": 20,
-    "default": "NEW",
-    "values": ["NEW", "PROCESSING", "COMPLETE", "FAIL"]
-  }],
-  "feature": ["sumba.siteId", "sumba.userId", "createdAt", "updatedAt"]
+  "properties": [
+    "description::50:true",
+    "file:text:::true",
+    "type::20:true",
+    "jobQueue:object",
+    {
+      "name": "size",
+      "type": "integer",
+      "default": 0,
+      "index": true
+    }
+  ],
+  "feature": {
+    "sumba.siteId": true,
+    "sumba.userId": true,
+    "createdAt": true,
+    "updatedAt": true,
+    "sumba.status": {
+      "default": "INQUEUE",
+      "values": ["INQUEUE", "PROCESSING", "COMPLETE", "FAIL"]
+    }
+  }
 }

package/index.js

@@ -1,25 +1,4 @@
-async function getSetting (type, source) {
-  const { defaultsDeep } = this.lib.aneka
-  const { get } = this.lib._
-
-  const setting = defaultsDeep(get(this.config, `auth.${source}.${type}`, {}), get(this.config, `auth.common.${type}`, {}))
-  if (type === 'basic') setting.type = 'Basic'
-  return setting
-}
-
-async function getToken (type, req, source) {
-  const { isEmpty } = this.lib._
-
-  const setting = await getSetting.call(this, type, source)
-  let token = req.headers[setting.headerKey.toLowerCase()]
-  if (!['basic'].includes(type) && isEmpty(token)) token = req.query[setting.qsKey]
-  if (isEmpty(token)) {
-    const parts = (req.headers.authorization || '').split(' ')
-    if (parts[0] === setting.type) token = parts[1]
-  }
-  if (isEmpty(token)) return false
-  return token
-}
+import path from 'path'
 
 async function factory (pkgName) {
   const me = this
@@ -60,6 +39,7 @@ async function factory (pkgName) {
               // authenticated only
               { title: 'yourProfile', href: 'sumba:/your-stuff/profile', visible: 'auth' },
               { title: 'changePassword', href: 'sumba:/your-stuff/change-password', visible: 'auth' },
+              { title: 'downloadList', href: 'sumba:/your-stuff/download/list', visible: 'auth' },
               { title: '-', visible: 'auth' },
               { title: 'signout', href: 'sumba:/signout', visible: 'auth' }
             ]
@@ -138,12 +118,38 @@ async function factory (pkgName) {
     }
 
     init = async () => {
+      const { getPluginDataDir } = this.app.bajo
+      this.downloadDir = `${getPluginDataDir(this.name)}/download`
+      this.lib.fs.ensureDirSync(this.downloadDir)
       for (const type of ['secure', 'anonymous', 'team']) {
         this[`${type}Routes`] = this[`${type}Routes`] ?? []
         this[`${type}NegRoutes`] = this[`${type}NegRoutes`] ?? []
       }
     }
 
+    _getSetting = async (type, source) => {
+      const { defaultsDeep } = this.lib.aneka
+      const { get } = this.lib._
+
+      const setting = defaultsDeep(get(this.config, `auth.${source}.${type}`, {}), get(this.config, `auth.common.${type}`, {}))
+      if (type === 'basic') setting.type = 'Basic'
+      return setting
+    }
+
+    _getToken = async (type, req, source) => {
+      const { isEmpty } = this.lib._
+
+      const setting = await this._getSetting(type, source)
+      let token = req.headers[setting.headerKey.toLowerCase()]
+      if (!['basic'].includes(type) && isEmpty(token)) token = req.query[setting.qsKey]
+      if (isEmpty(token)) {
+        const parts = (req.headers.authorization || '').split(' ')
+        if (parts[0] === setting.type) token = parts[1]
+      }
+      if (isEmpty(token)) return false
+      return token
+    }
+
     adminMenu = async (locals, req) => {
       if (!this.app.waibuAdmin) return
       const { getPluginPrefix } = this.app.waibu
@@ -247,7 +253,7 @@ async function factory (pkgName) {
       const { getUser } = this
       const { recordFind } = this.app.dobo
 
-      let token = await getToken.call(this, 'apiKey', req, source)
+      let token = await this._getToken('apiKey', req, source)
       if (!isMd5(token)) return false
       token = await hash(token)
       const query = { token }
@@ -275,7 +281,7 @@ async function factory (pkgName) {
         reply.code(401)
       }
 
-      const setting = await getSetting.call(this, 'basic', source)
+      const setting = await this._getSetting('basic', source)
       let authInfo
       const parts = (req.headers.authorization ?? '').split(' ')
       if (parts[0] === setting.type) authInfo = parts[1]
@@ -308,8 +314,8 @@ async function factory (pkgName) {
 
       const fastJwt = await importPkg('bajoExtra:fast-jwt')
       const { createVerifier } = fastJwt
-      const setting = await getSetting.call(this, 'jwt', source)
-      const token = await getToken.call(this, 'jwt', req, source)
+      const setting = await this._getSetting('jwt', source)
+      const token = await this._getToken('jwt', req, source)
       if (isEmpty(token)) return false
       const verifier = createVerifier({
         key: setting.secret,
@@ -461,6 +467,27 @@ async function factory (pkgName) {
       if (cfg.minNumeric) passwd += generateId({ pattern: '0123456789', length: cfg.minNumeric })
       return passwd
     }
+
+    pushDownload = async ({ description, worker, data, source, req, file, type }) => {
+      const { getPlugin } = this.app.bajo
+      const { recordCreate } = getPlugin('waibuDb')
+      const { push } = getPlugin('bajoQueue')
+      description = description ?? file
+      const jobQueue = {
+        worker,
+        source,
+        payload: {
+          type: 'object',
+          data
+        }
+      }
+      if (!type) type = path.extname(file)
+      if (type[0] === '.') type = type.slice(1)
+      const body = { file, description, jobQueue, type }
+      const rec = await recordCreate({ model: 'SumbaDownload', body, req, options: { noFlash: true } })
+      jobQueue.payload.data.download = { id: rec.data.id, file }
+      await push(jobQueue)
+    }
   }
 }
 

package/package.json

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

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

@@ -0,0 +1,61 @@
+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 { req } = this.component
+      const icon = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name: 'person' } }) : ''
+      let text = ''
+      if (has(this.params.attr, 'title')) {
+        if (req.user) {
+          if (this.params.attr.title === 'short') text = `${req.user.firstName} ${req.user.lastName[0]}.`
+          else if (['firstName', 'lastName', 'username'].includes(this.params.attr.title)) text = req.user[this.params.attr.title]
+          else text = `${req.user.firstName} ${req.user.lastName}`
+        } else text = req.t('guest')
+      }
+      const html = []
+      const attr = omit(this.params.attr, ['text'])
+      attr.dropdown = true
+      attr.content = `${icon} ${text}`
+      if (this.params.attr.noMenu) {
+        delete attr.dropdown
+        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' })
+        if (menu) {
+          const items = filter(menu.children, c => {
+            if (!has(c, 'visible')) return true
+            return c.visible === (req.user ? 'auth' : 'anon')
+          })
+          for (const item of items) {
+            if (item.title === 'yourProfile') {
+              if (this.params.attr.fancyProfile) {
+                const replacer = 'sumba.asset:/user-profile.png'
+                const profile = await this.component.buildSentence(`
+                  <div>
+                    <c:dropdown-item href="${item.href}">
+                      <c:img src="dobo:/attachment/SumbaUser/${req.user.id}/profile/main.png?notfound=${replacer}" responsive rounded />
+                      <c:div margin="top-1" text="align:center">${req.user.firstName} ${req.user.lastName}</c:div>
+                    </c:dropdown-item>
+                  </div>
+                `)
+                html.push(profile)
+              } else {
+                html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath(item.href) }, html: this.component.req.t(item.title) }))
+              }
+            } else if (item.title === '-') {
+              html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { divider: true } }))
+            } else {
+              html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath(item.href) }, html: this.component.req.t(item.title) }))
+            }
+          }
+        }
+      }
+      this.params.noTag = true
+      this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html: html.join('\n') })
+    }
+  }
+}
+
+export default navDropdownUser

package/waibuDb/schema/download.js

@@ -0,0 +1,27 @@
+async function download () {
+  return {
+    common: {
+      disabled: ['create', 'update', 'get'],
+      hidden: ['id'],
+      formatter: {
+        description: async function (val, rec) {
+          const sentence = `<c:a target="_blank" href="sumba:/your-stuff/download/get/${rec.file}" content="${val}" />`
+          return await this.component.buildSentence(sentence)
+        }
+      }
+    },
+    view: {
+      list: {
+        fields: ['description', 'type', 'size', 'status', 'updatedAt'],
+        stat: {
+          aggregate: [
+            { fields: ['type'], group: 'type', aggregate: ['count'] },
+            { fields: ['status'], group: 'status', aggregate: ['count'] }
+          ]
+        }
+      }
+    }
+  }
+}
+
+export default download

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

@@ -27,10 +27,11 @@ const id = {
     schema.view.fields = ['createdAt']
     schema.view.label = { createdAt: 'conversation' }
     schema.view.formatter = {
-      createdAt: (val, rec) => {
+      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
-        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}`
+        const sentence = `<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>`
+        return (await this.component.buildSentence(sentence)) + message
       }
     }
     return await reply.view('sumba.template:/help/trouble-tickets/details.html', { list, schema, master, form, error })

package/waibuMpa/route/your-stuff/download/@action.js

@@ -0,0 +1,12 @@
+const download = {
+  method: ['GET', 'POST'],
+  handler: async function (req, reply) {
+    const { importModule } = this.app.bajo
+    const crudSkel = await importModule('waibuAdmin:/lib/crud-skel.js')
+    const layoutTpl = 'main.layout:/with-addons.html'
+    const tpl = 'waibuAdmin.template:/crud/list-notitle.html'
+    return await crudSkel.call(this, 'SumbaDownload', req, reply, { tpl, layoutTpl, title: req.t('downloadList') })
+  }
+}
+
+export default download

package/waibuMpa/route/your-stuff/download/get.js

@@ -0,0 +1,12 @@
+const get = {
+  method: ['GET'],
+  url: '/your-stuff/download/get/*',
+  handler: async function (req, reply) {
+    const { importModule } = this.app.bajo
+    const handler = await importModule('waibu:/lib/handle-download.js')
+    const file = `${this.downloadDir}/${req.params['*']}`
+    return await handler.call(this, file, req, reply)
+  }
+}
+
+export default get