sumba 1.2.13 → 1.2.15

package/bajo/intl/en-US.json

@@ -126,7 +126,9 @@
     "socInstagram": "Instagram",
     "socFacebook": "Facebook",
     "socLinkedIn": "LinkedIn",
-    "size": "Size"
+    "size": "Size",
+    "user": "User",
+    "team": "Team"
   },
   "validation": {
     "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",
@@ -127,7 +127,9 @@
     "socInstagram": "Instagram",
     "socFacebook": "Facebook",
     "socLinkedIn": "LinkedIn",
-    "size": "Besaran"
+    "size": "Besaran",
+    "user": "Pengguna",
+    "team": "Tim"
   },
   "validation": {
     "password": {

package/dobo/feature/user-id.js

@@ -9,7 +9,13 @@ async function userId (opts = {}) {
         site: {
           schema: 'SumbaSite',
           propName: 'id',
-          type: 'one-on-one'
+          type: 'one-to-one'
+        },
+        user: {
+          schema: 'SumbaUser',
+          propName: 'id',
+          type: 'one-to-one',
+          fields: ['id', 'username', 'email', 'firstName', 'lastName']
         }
       },
       index: true

package/dobo/schema/team-user.json

@@ -8,7 +8,8 @@
       "team": {
         "schema": "SumbaTeam",
         "propName": "id",
-        "type": "one-to-one"
+        "type": "one-to-one",
+        "fields": ["id", "name"]
       }
     }
   }],

package/dobo/schema/user.json

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

package/index.js

@@ -494,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.13",
+  "version": "1.2.15",
   "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/download.js

@@ -6,6 +6,10 @@ async function download () {
         description: async function (val, rec) {
           const sentence = `<c:a target="_blank" href="sumba:/your-stuff/download/get/${rec.file}" content="${val}" @click.stop />`
           return await this.component.buildSentence(sentence)
+        },
+        size: function (val, rec) {
+          const { formatByte } = this.plugin.app.bajoExtra
+          return formatByte(rec.size)
         }
       }
     },

package/waibuDb/schema/team-user.js

@@ -4,11 +4,45 @@ async function teamUser () {
       layout: [
         { name: 'meta', fields: ['id', 'createdAt', 'updatedAt'] },
         { name: 'general', fields: ['userId:6-md', 'teamId:6-md'] }
-      ]
+      ],
+      calcFields: [
+        { name: 'user', type: 'string' },
+        { name: 'team', type: 'string' }
+      ],
+      valueFormatter: {
+        user: (val, rec) => {
+          return rec._rel.user.username
+        },
+        team: (val, rec) => {
+          return rec._rel.team.name
+        }
+      },
+      widget: {
+        userId: {
+          component: 'form-select-ext',
+          attr: {
+            remoteUrl: 'sumba.restapi:/manage/user',
+            remoteSearchField: 'username',
+            remoteLabelField: 'username',
+            remoteApiKey: true,
+            rel: 'user:username'
+          }
+        },
+        teamId: {
+          component: 'form-select-ext',
+          attr: {
+            remoteUrl: 'sumba.restapi:/manage/team',
+            remoteSearchField: 'name',
+            remoteLabelField: 'name',
+            remoteApiKey: true,
+            rel: 'team:name'
+          }
+        }
+      }
     },
     view: {
       list: {
-        fields: ['userId', 'teamId', 'createdAt', 'updatedAt'],
+        fields: ['user', 'team', 'createdAt', 'updatedAt'],
         stat: {
           aggregate: [
             { fields: ['userId'], group: 'userId', aggregate: ['count'] },

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

@@ -41,7 +41,7 @@
     },
     "add": {
       "forceVisible": ["password"],
-      "hidden": ["id", "createdAt", "updatedAt"]
+      "hidden": ["id", "createdAt", "updatedAt", "provider"]
     },
     "edit": {
       "forceVisible": ["password"],

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"]
+}