User Profile (#858)

* First pass user profile

* 💚

* More collaborator tooltip improvements
This commit is contained in:
Tom Moor
2019-01-12 19:41:45 -08:00
committed by GitHub
parent ef583314e0
commit 8d3dc3a92e
10 changed files with 229 additions and 77 deletions

View File

@@ -10,7 +10,6 @@ Object {
"isAdmin": false,
"isSuspended": false,
"name": "User 1",
"username": "user1",
},
"ok": true,
"status": 200,
@@ -45,7 +44,6 @@ Object {
"isAdmin": false,
"isSuspended": false,
"name": "User 1",
"username": "user1",
},
"ok": true,
"status": 200,
@@ -77,15 +75,17 @@ Object {
"avatarUrl": "http://example.com/avatar.png",
"createdAt": "2018-01-01T00:00:00.000Z",
"id": "fa952cff-fa64-4d42-a6ea-6955c9689046",
"isAdmin": true,
"isSuspended": false,
"name": "Admin User",
"username": "admin",
},
Object {
"avatarUrl": "http://example.com/avatar.png",
"createdAt": "2018-01-01T00:00:00.000Z",
"id": "46fde1d4-0050-428f-9f0b-0bf77f4bdf61",
"isAdmin": false,
"isSuspended": false,
"name": "User 1",
"username": "user1",
},
],
"ok": true,
@@ -109,7 +109,6 @@ Object {
"isAdmin": false,
"isSuspended": false,
"name": "User 1",
"username": "user1",
},
Object {
"avatarUrl": "http://example.com/avatar.png",
@@ -119,7 +118,6 @@ Object {
"isAdmin": true,
"isSuspended": false,
"name": "Admin User",
"username": "admin",
},
],
"ok": true,
@@ -142,7 +140,6 @@ Object {
"isAdmin": true,
"isSuspended": false,
"name": "User 1",
"username": "user1",
},
"ok": true,
"status": 200,
@@ -177,7 +174,6 @@ Object {
"isAdmin": false,
"isSuspended": true,
"name": "User 1",
"username": "user1",
},
"ok": true,
"status": 200,
@@ -212,7 +208,6 @@ Object {
"isAdmin": false,
"isSuspended": false,
"name": "New name",
"username": "user1",
},
"ok": true,
"status": 200,

View File

@@ -5,8 +5,9 @@ Object {
"avatarUrl": "http://example.com/avatar.png",
"createdAt": undefined,
"id": "123",
"isAdmin": undefined,
"isSuspended": undefined,
"name": "Test User",
"username": "testuser",
}
`;
@@ -15,7 +16,8 @@ Object {
"avatarUrl": null,
"createdAt": undefined,
"id": "123",
"isAdmin": undefined,
"isSuspended": undefined,
"name": "Test User",
"username": "testuser",
}
`;

View File

@@ -7,11 +7,11 @@ type Options = {
type UserPresentation = {
id: string,
username: string,
name: string,
avatarUrl: ?string,
email?: string,
isAdmin?: boolean,
isAdmin: boolean,
isSuspended: boolean,
};
export default (
@@ -22,15 +22,14 @@ export default (
const userData = {};
userData.id = user.id;
userData.createdAt = user.createdAt;
userData.username = user.username;
userData.name = user.name;
userData.isAdmin = user.isAdmin;
userData.isSuspended = user.isSuspended;
userData.avatarUrl =
user.avatarUrl || (user.slackData ? user.slackData.image_192 : null);
if (options.includeDetails) {
userData.email = user.email;
userData.isAdmin = user.isAdmin;
userData.isSuspended = user.isSuspended;
}
return userData;