From 28405c7beb7ffb1edec3034b6c40250863382ca4 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 29 Jul 2022 13:21:42 +0100 Subject: [PATCH] handle undefined user name and avatar initials --- .../src/pages/builder/portal/_layout.svelte | 13 ++++-- .../portal/manage/users/[userId].svelte | 41 ++++++++++++++----- .../builder/portal/manage/users/index.svelte | 16 ++++---- .../overview/[application]/index.svelte | 2 +- 4 files changed, 49 insertions(+), 23 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 5da8b34700..dcebe0e2c9 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -45,6 +45,15 @@ }, ]) } + if (isEnabled(FEATURE_FLAGS.USER_GROUPS)) { + menu = menu.concat([ + { + title: "User Groups", + href: "/builder/portal/manage/groups", + }, + ]) + } + if (admin) { menu = menu.concat([ { @@ -52,10 +61,6 @@ href: "/builder/portal/manage/users", heading: "Manage", }, - { - title: "User Groups", - href: "/builder/portal/manage/groups", - }, { title: "Auth", href: "/builder/portal/manage/auth" }, { title: "Email", href: "/builder/portal/manage/email" }, diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index 28c5aa2593..ed30c0347d 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -41,6 +41,11 @@ let allAppList = [] let user $: fetchUser(userId) + + $: fullName = $userFetch?.data?.firstName + ? $userFetch?.data?.firstName + " " + $userFetch?.data?.lastName + : "" + $: hasGroupsLicense = $auth.user?.license.features.includes( Constants.Features.USER_GROUPS ) @@ -127,7 +132,7 @@ if (detail === "developer") { toggleFlags({ admin: { global: false }, builder: { global: true } }) } else if (detail === "admin") { - toggleFlags({ admin: { global: true }, builder: { global: false } }) + toggleFlags({ admin: { global: true }, builder: { global: true } }) } else if (detail === "appUser") { toggleFlags({ admin: { global: false }, builder: { global: false } }) } @@ -186,15 +191,25 @@
- -
- {$userFetch?.data?.firstName + - " " + - $userFetch?.data?.lastName} - {$userFetch?.data?.email} -
+ x[0]) + .join("")} + /> + + {#if fullName} +
+ {fullName} + + {$userFetch?.data?.email} +
+ {:else} +
+ {$userFetch?.data?.email} +
+ {/if}
@@ -372,4 +387,10 @@ display: flex; flex-direction: column; } + + .alignEmail { + display: flex; + align-items: center; + margin-left: var(--spacing-m); + } diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index 952acaf324..5a6c58aed1 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -72,19 +72,12 @@ name: {}, email: {}, role: { - noPropagation: true, sortable: false, }, ...(hasGroupsLicense && { userGroups: { sortable: false, displayName: "User groups" }, }), - apps: { width: "120px" }, - settings: { - sortable: false, - width: "60px", - displayName: "", - align: "Right", - }, + apps: {}, } $: userData = [] @@ -323,6 +316,13 @@