From 82ebc9526f39731582b1904392d649b3fa7c7e4c Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Sun, 26 Jun 2022 20:46:31 +0100 Subject: [PATCH] convert to new ListItem component --- packages/bbui/src/Table/Table.svelte | 2 + .../portal/manage/groups/[groupId].svelte | 83 +++++++------------ .../groups/_components/GroupAppsRow.svelte | 73 ---------------- .../manage/groups/_components/UserRow.svelte | 66 --------------- .../builder/portal/manage/groups/index.svelte | 1 - .../_components/GroupsTableRenderer.svelte | 1 - .../_components/NameTableRenderer.svelte | 14 +++- .../_components/RoleTableRenderer.svelte | 15 +++- .../builder/portal/manage/users/index.svelte | 19 +++-- 9 files changed, 65 insertions(+), 209 deletions(-) delete mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte delete mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index 3b77e2a43f..29d9772d33 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -376,6 +376,8 @@ class="spectrum-Table-cell" class:spectrum-Table-cell--divider={!!schema[field].divider} style={cellStyles[field]} + on:click={e => + schema[field].noPropagation && e.stopPropagation()} > -
- {#if group?.users?.length} + + {#if group?.users.length} {#each group.users as user} -
- -
+ removeUser(user._id)} + hoverable + size="L" + name="Close" + /> {/each} {:else} -
-
- -
- You have no users in this team -
-
-
+ {/if} -
+
-
+ {#if app_list.length} {#each app_list as app} -
- -
+ +
+ +
+ {app.access} +
+
+ {/each} {:else} -
-
- -
- You have no users in this team -
-
-
+ {/if} -
+ diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte deleted file mode 100644 index adb725b703..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/GroupAppsRow.svelte +++ /dev/null @@ -1,73 +0,0 @@ - - -
-
- -
-
-
-
- {app.name} -
- {app.access} -
-
-
-
-
- - {app.access} -
- - diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte deleted file mode 100644 index f067260448..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte +++ /dev/null @@ -1,66 +0,0 @@ - - -
-
-
- -
-
-
-
-
- {user.email} -
- {user.access} -
-
-
-
-
- removeUser(user._id)} hoverable size="L" name="Close" /> -
- - diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte index 43680d0c2a..2a8c1b973f 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte @@ -43,7 +43,6 @@ onMount(async () => { try { await groups.actions.init() - console.log($groups) } catch (error) { notifications.error("Error getting User groups") } diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte index 885277a6eb..0f08496dee 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte @@ -1,7 +1,6 @@
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte index c80bead9f8..d212bb6f6a 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte @@ -1,14 +1,21 @@
- {#if value?.name} + {#if value}
- + x[0]) + .join("")} + />
- {value.name} + {value} {:else}
Invite pending...
{/if} @@ -17,6 +24,7 @@ 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 c31cc778f0..af3e745161 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -19,16 +19,20 @@ import NameTableRenderer from "./_components/NameTableRenderer.svelte" import SettingsTableRenderer from "./_components/SettingsTableRenderer.svelte" import RoleTableRenderer from "./_components/RoleTableRenderer.svelte" + import { goto } from "@roxi/routify" const schema = { name: {}, email: {}, - role: {}, - userGroups: { displayName: "User groups" }, + role: { noPropagation: true, sortable: false }, + userGroups: { sortable: false, displayName: "User groups" }, apps: {}, - settings: { width: "50px", displayName: "", align: "Right" }, - // access: {}, - // group: {} + settings: { + sortable: false, + width: "50px", + displayName: "", + align: "Right", + }, } const accessTypes = [ @@ -71,6 +75,7 @@ }) return { ...user, + name: user.firstName ? user.firstName + " " + user.lastName : "", userGroups, } }) @@ -118,17 +123,19 @@ $goto(`./${detail._id}`)} {schema} data={enrichedUsers} allowEditColumns={false} allowEditRows={false} - allowSelectRows={false} + allowSelectRows={true} showHeaderBorder={false} customRenderers={[ { column: "userGroups", component: GroupsTableRenderer }, { column: "apps", component: AppsTableRenderer }, { column: "name", component: NameTableRenderer }, { column: "settings", component: SettingsTableRenderer }, + { column: "role", component: RoleTableRenderer }, ]} />