diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index e78437ee4..fbfcb8a02 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -285,6 +285,7 @@
{#if showEditColumn}
{#if allowSelectRows} @@ -352,6 +353,7 @@ > {#if showEditColumn}
{ toggleSelectRow(row) diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte index ff3519516..a720750d4 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserGroupsRow.svelte @@ -14,7 +14,6 @@ export let deleteGroup export let saveGroup let modal - function editGroup() { modal.show() } @@ -35,7 +34,9 @@
- {parseInt(group.userCount) || 0} user{parseInt(group.userCount) === 1 + {parseInt(group?.users?.length) || 0} user{parseInt( + group?.users?.length + ) === 1 ? "" : "s"}
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 index 65c40006a..f06726044 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/UserRow.svelte @@ -3,7 +3,6 @@ export let user export let removeUser - $: console.log(user)
@@ -14,9 +13,9 @@
-
+
{user.email} -
+
{user.access}
@@ -33,6 +32,16 @@ align-items: center; } + .text { + opacity: 0.5; + margin: var(--spacing-xs) 0 0 var(--spacing-m); + } + + .align-email { + display: flex; + align-items: center; + } + .name { text-decoration: none; overflow: hidden; diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AppsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AppsTableRenderer.svelte new file mode 100644 index 000000000..b007972a3 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AppsTableRenderer.svelte @@ -0,0 +1,29 @@ + + +
+
+ +
+ {#if value?.apps?.length === 0} +
+
No groups
+
+ {:else if value?.apps?.length === 1} + {value?.groups[0]?.name} + {:else} + {parseInt(value?.apps?.length) || 0} + {/if} +
+ + 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 new file mode 100644 index 000000000..57bd83480 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte @@ -0,0 +1,29 @@ + + +
+
+ +
+ {#if value?.groups?.length === 0} +
+
No groups
+
+ {:else if value?.groups?.length === 1} + {value.groups[0]?.name} + {:else} + {parseInt(value?.groups?.length) || 0} + {/if} +
+ + 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 new file mode 100644 index 000000000..c80bead9f --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/NameTableRenderer.svelte @@ -0,0 +1,29 @@ + + +
+ {#if value?.name} +
+ +
+ {value.name} + {:else} +
Invite pending...
+ {/if} +
+ + 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 50d4031af..669b82e48 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -1,12 +1,9 @@