sumba 1.1.19 → 1.1.21

package/bajo/intl/en-US.json

@@ -98,6 +98,7 @@
   "manageSite": "Manage Site",
   "manageUser": "Manage User",
   "manageTeam": "Manage Team",
+  "manageTeamUser": "Manage Team Member",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",
@@ -110,7 +111,8 @@
     "subject": "Subject",
     "message": "Message",
     "cat": "Category",
-    "waPhone": "WA Phone"
+    "waPhone": "WA Phone",
+    "teamId": "Team ID"
   },
   "validation": {
     "password": {

package/bajo/intl/id.json

@@ -99,6 +99,7 @@
   "manageSite": "Kelola Situs",
   "manageUser": "Kelola Pengguna",
   "manageTeam": "Kelola Tim",
+  "manageTeamUser": "Manage Anggota Tim",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",
@@ -111,7 +112,8 @@
     "subject": "Judul",
     "message": "Pesan",
     "cat": "Kategori",
-    "waPhone": "WA Phone"
+    "waPhone": "WA Phone",
+    "teamId": "ID Tim"
   },
   "validation": {
     "password": {

package/dobo/fixture/team-user.json

@@ -1,5 +1,5 @@
 [{
   "userId": "?:SumbaUser::username:admin",
-  "parentId": "?:SumbaTeam::alias:administrator",
+  "teamId": "?:SumbaTeam::alias:administrator",
   "siteId": "?:SumbaSite::alias:default"
 }]

package/dobo/schema/team-user.json

@@ -1,15 +1,25 @@
 {
-  "properties": [
-  ],
+  "properties": [{
+    "name": "teamId",
+    "type": "string",
+    "maxLength": 50,
+    "required": true,
+    "rel": {
+      "team": {
+        "schema": "SumbaTeam",
+        "propName": "id",
+        "type": "one-to-one"
+      }
+    }
+  }],
   "indexes": [{
-    "fields": ["userId", "siteId", "id"],
+    "fields": ["userId", "siteId", "teamId"],
     "unique": true
   }],
   "feature": {
     "createdAt": true,
     "updatedAt": true,
     "sumba.siteId": true,
-    "sumba.userId": true,
-    "sumba.parentId": true
+    "sumba.userId": true
   }
 }

package/package.json

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

package/plugin/factory.js

@@ -47,7 +47,7 @@ async function factory (pkgName) {
             '/help': 'sumba:/help/contact-form',
             '/help/trouble-tickets': 'sumba:/help/trouble-tickets/list'
           },
-          pages: [{
+          menuHandler: [{
             title: 'account',
             level: 9998,
             children: [
@@ -78,6 +78,7 @@ async function factory (pkgName) {
         },
         waibuAdmin: {
           menuHandler: 'sumba:adminMenu',
+          menuCollapsible: true,
           modelDisabled: 'all'
         },
         auth: {
@@ -145,33 +146,25 @@ async function factory (pkgName) {
 
     adminMenu = async (locals, req) => {
       if (!this.app.waibuAdmin) return
-      const { buildAccordionMenu } = this.app.waibuAdmin
-
-      const allMenus = async (locals, req) => {
-        const { runHook } = this.app.bajo
-        const { getPluginPrefix } = this.app.waibu
-        const prefix = getPluginPrefix(this.name)
-        const menu = [{
-          title: 'supportSystem',
-          children: [
-            { title: 'contactForm', href: `waibuAdmin:/${prefix}/contact-form/list` },
-            { title: 'contactFormCat', href: `waibuAdmin:/${prefix}/contact-form-cat/list` },
-            { title: 'ticket', href: `waibuAdmin:/${prefix}/ticket/list` },
-            { title: 'ticketCat', href: `waibuAdmin:/${prefix}/ticket-cat/list` }
-          ]
-        }, {
-          title: 'management',
-          children: [
-            { title: 'manageSite', href: `waibuAdmin:/${prefix}/site/list` },
-            { title: 'manageUser', href: `waibuAdmin:/${prefix}/user/list` },
-            { title: 'manageTeam', href: `waibuAdmin:/${prefix}/team/list` }
-          ]
-        }]
-        await runHook(`${this.name}:afterAdminMenu`, menu, locals, req)
-        return menu
-      }
-
-      return await buildAccordionMenu(await allMenus.call(this, locals, req), locals, req)
+      const { getPluginPrefix } = this.app.waibu
+      const prefix = getPluginPrefix(this.name)
+      return [{
+        title: 'supportSystem',
+        children: [
+          { title: 'contactForm', href: `waibuAdmin:/${prefix}/contact-form/list` },
+          { title: 'contactFormCat', href: `waibuAdmin:/${prefix}/contact-form-cat/list` },
+          { title: 'ticket', href: `waibuAdmin:/${prefix}/ticket/list` },
+          { title: 'ticketCat', href: `waibuAdmin:/${prefix}/ticket-cat/list` }
+        ]
+      }, {
+        title: 'management',
+        children: [
+          { title: 'manageSite', href: `waibuAdmin:/${prefix}/site/list` },
+          { title: 'manageUser', href: `waibuAdmin:/${prefix}/user/list` },
+          { title: 'manageTeam', href: `waibuAdmin:/${prefix}/team/list` },
+          { title: 'manageTeamUser', href: `waibuAdmin:/${prefix}/team-user/list` }
+        ]
+      }]
     }
 
     getUser = async (rec, safe = true) => {

package/waibuDb/schema/team-user.js

@@ -0,0 +1,32 @@
+async function teamUser () {
+  return {
+    common: {
+      hidden: ['siteId'],
+      layout: [
+        { name: 'meta', fields: ['id', 'createdAt', 'updatedAt'] },
+        { name: 'general', fields: ['userId:6-md', 'teamId:6-md'] }
+      ]
+    },
+    view: {
+      list: {
+        fields: ['userId', 'teamId', 'createdAt', 'updatedAt'],
+        stat: {
+          aggregate: [
+            { fields: ['userId'], group: 'userId', aggregate: ['count'] },
+            { fields: ['teamId'], group: 'teamId', aggregate: ['count'] }
+          ]
+        }
+      },
+      details: {
+      },
+      add: {
+        hidden: ['id', 'createdAt', 'updatedAt']
+      },
+      edit: {
+        readonly: ['id', 'createdAt', 'updatedAt']
+      }
+    }
+  }
+}
+
+export default teamUser

package/waibuDb/schema/team.json

@@ -0,0 +1,31 @@
+{
+  "common": {
+    "hidden": ["siteId"],
+    "layout": [
+      { "name": "meta", "fields": ["id", "createdAt", "updatedAt", "status"] },
+      { "name": "general", "fields": ["alias:6-md", "name:6-md"] }
+    ]
+  },
+  "view": {
+    "list": {
+      "qs": {
+        "sort": "alias:1",
+        "limit": 10
+      },
+      "fields": ["alias", "name", "status", "createdAt", "updatedAt"],
+      "stat": {
+        "aggregate": [
+          { "fields": ["status"], "group": "status", "aggregate": ["count"] }
+        ]
+      }
+    },
+    "details": {
+    },
+    "add": {
+      "hidden": ["id", "createdAt", "updatedAt", "status"]
+    },
+    "edit": {
+      "readonly": ["id", "createdAt", "updatedAt", "alias"]
+    }
+  }
+}

package/waibuMpa/extend/waibuAdmin/route/team/@action.js

@@ -0,0 +1,11 @@
+const action = {
+  method: ['GET', 'POST'],
+  title: 'manageTeam',
+  handler: async function (req, reply) {
+    const { importModule } = this.app.bajo
+    const crudSkel = await importModule('waibuAdmin:/lib/crud-skel.js')
+    return await crudSkel.call(this, 'SumbaTeam', req, reply)
+  }
+}
+
+export default action

package/waibuMpa/extend/waibuAdmin/route/team-user/@action.js

@@ -0,0 +1,11 @@
+const action = {
+  method: ['GET', 'POST'],
+  title: 'manageTeamUser',
+  handler: async function (req, reply) {
+    const { importModule } = this.app.bajo
+    const crudSkel = await importModule('waibuAdmin:/lib/crud-skel.js')
+    return await crudSkel.call(this, 'SumbaTeamUser', req, reply)
+  }
+}
+
+export default action

package/dobo/feature/parent-id.js

@@ -1,19 +0,0 @@
-async function parentId (opts = {}) {
-  return {
-    properties: [{
-      name: 'parentId',
-      type: 'string',
-      maxLength: 50,
-      rel: {
-        site: {
-          schema: 'SumbaSite',
-          propName: 'id',
-          type: 'one-to-one'
-        }
-      },
-      index: true
-    }]
-  }
-}
-
-export default parentId