sumba 1.2.12 → 1.2.14

package/bajo/intl/en-US.json

@@ -107,6 +107,7 @@
   "currentApiKey": "Current API Key",
   "downloadList": "Download List",
   "manageDownload": "Manage Download",
+  "userSession": "User Session",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/bajo/intl/id.json

@@ -99,7 +99,7 @@
   "manageSite": "Kelola Situs",
   "manageUser": "Kelola Pengguna",
   "manageTeam": "Kelola Tim",
-  "manageTeamUser": "Manage Anggota Tim",
+  "manageTeamUser": "Kelola Anggota Tim",
   "resetUserPassword": "Reset Kata Sandi Pengguna",
   "unknownUser": "Pengguna Tidak Dikenal/Tidak Valid",
   "socialMedia": "Media Sosial",
@@ -108,6 +108,7 @@
   "currentApiKey": "Kunci API Saat Ini",
   "downloadList": "Daftar Unduh",
   "manageDownload": "Kelola Unduhan",
+  "userSession": "Sesi Pengguna",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/dobo/schema/user.json

@@ -26,7 +26,6 @@
     "type": "string",
     "maxLength": 50,
     "index": true,
-    "required": true,
     "default": "local"
   }, {
     "name": "email",

package/index.js

@@ -172,6 +172,11 @@ async function factory (pkgName) {
           { title: 'manageDownload', href: `waibuAdmin:/${prefix}/download/list` },
           { title: 'resetUserPassword', href: `waibuAdmin:/${prefix}/reset-user-password` }
         ]
+      }, {
+        title: 'misc',
+        children: [
+          { title: 'userSession', href: `waibuAdmin:/${prefix}/session/list` }
+        ]
       }]
     }
 
@@ -489,6 +494,14 @@ async function factory (pkgName) {
       jobQueue.payload.data.download = { id: rec.data.id, file }
       await push(jobQueue)
     }
+
+    getApiKeyFromUserId = async id => {
+      const { hash } = this.app.bajoExtra
+      const { recordGet } = this.app.dobo
+      const options = { forceNoHidden: true, noHook: true, noCache: true, attachment: true, mimeType: true }
+      const resp = await recordGet('SumbaUser', id, options)
+      return await hash(resp.salt)
+    }
   }
 }
 

package/package.json

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

package/sumba/route/secure.json

@@ -8,4 +8,7 @@
 }, {
   "path": "/your-stuff/**/*",
   "routeHandler": "restapi"
+}, {
+  "path": "/manage/**/*",
+  "routeHandler": "restapi"
 }]

package/waibuDb/schema/team-user.js

@@ -4,7 +4,27 @@ async function teamUser () {
       layout: [
         { name: 'meta', fields: ['id', 'createdAt', 'updatedAt'] },
         { name: 'general', fields: ['userId:6-md', 'teamId:6-md'] }
-      ]
+      ],
+      widget: {
+        userId: {
+          component: 'form-select-ext',
+          attr: {
+            remoteUrl: 'sumba.restapi:/manage/user',
+            remoteSearchField: 'username',
+            remoteLabelField: 'username',
+            remoteApiKey: true
+          }
+        },
+        teamId: {
+          component: 'form-select-ext',
+          attr: {
+            remoteUrl: 'sumba.restapi:/manage/team',
+            remoteSearchField: 'name',
+            remoteLabelField: 'name',
+            remoteApiKey: true
+          }
+        }
+      }
     },
     view: {
       list: {

package/waibuDb/schema/team.json

@@ -24,7 +24,7 @@
       "hidden": ["id", "createdAt", "updatedAt", "status"]
     },
     "edit": {
-      "readonly": ["id", "createdAt", "updatedAt", "alias"]
+      "readonly": ["id", "createdAt", "updatedAt"]
     }
   }
 }

package/waibuDb/schema/user.json

@@ -22,6 +22,7 @@
       "stat": {
         "aggregate": [
           { "fields": ["status"], "group": "status", "aggregate": ["count"] },
+          { "fields": ["provider"], "group": "provider", "aggregate": ["count"] },
           { "fields": ["country"], "group": "country", "aggregate": ["count"] }
         ]
       }
@@ -40,7 +41,7 @@
     },
     "add": {
       "forceVisible": ["password"],
-      "hidden": ["id", "createdAt", "updatedAt"]
+      "hidden": ["id", "createdAt", "updatedAt", "provider"]
     },
     "edit": {
       "forceVisible": ["password"],

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

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

package/waibuRestApi/route/manage/team/model-builder.json

@@ -0,0 +1,4 @@
+{
+  "model": "SumbaTeam",
+  "disabled": ["create", "update", "remove"]
+}

package/waibuRestApi/route/manage/user/model-builder.json

@@ -0,0 +1,4 @@
+{
+  "model": "SumbaUser",
+  "disabled": ["create", "update", "remove"]
+}