From 4b38b5263b5028f728d953b0dfa200d96ee2126e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 11 Mar 2024 13:14:02 +0100
Subject: [PATCH 1/3] Allow group members edits to admins
---
.../portal/users/users/[userId].svelte | 35 ++++++++++---------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index 1d15b13107..eb0305e959 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -39,9 +39,10 @@
name: {
width: "1fr",
},
- ...(readonly
+ ...(!isAdmin
? {}
- : {
+ : // Add
+ {
_id: {
displayName: "",
width: "auto",
@@ -90,7 +91,9 @@
$: internalGroups = $groups?.filter(g => !g?.scimInfo?.isSync)
$: isSSO = !!user?.provider
- $: readonly = !sdk.users.isAdmin($auth.user) || user?.scimInfo?.isSync
+ $: isAdmin = sdk.users.isAdmin($auth.user)
+ $: isScim = user?.scimInfo?.isSync
+ $: readonly = !isAdmin || isScim
$: privileged = sdk.users.isAdminOrGlobalBuilder(user)
$: nameLabel = getNameLabel(user)
$: filteredGroups = getFilteredGroups(internalGroups, searchTerm)
@@ -322,23 +325,23 @@
<Layout gap="S" noPadding>
<div class="tableTitle">
<Heading size="S">Groups</Heading>
- {#if internalGroups?.length}
+ {#if internalGroups?.length && isAdmin}
<div bind:this={popoverAnchor}>
<Button on:click={popover.show()} secondary>Add to group</Button>
</div>
+ <Popover align="right" bind:this={popover} anchor={popoverAnchor}>
+ <UserGroupPicker
+ labelKey="name"
+ bind:searchTerm
+ list={filteredGroups}
+ selected={user.userGroups}
+ on:select={e => addGroup(e.detail)}
+ on:deselect={e => removeGroup(e.detail)}
+ iconComponent={GroupIcon}
+ extractIconProps={item => ({ group: item, size: "S" })}
+ />
+ </Popover>
{/if}
- <Popover align="right" bind:this={popover} anchor={popoverAnchor}>
- <UserGroupPicker
- labelKey="name"
- bind:searchTerm
- list={filteredGroups}
- selected={user.userGroups}
- on:select={e => addGroup(e.detail)}
- on:deselect={e => removeGroup(e.detail)}
- iconComponent={GroupIcon}
- extractIconProps={item => ({ group: item, size: "S" })}
- />
- </Popover>
</div>
<Table
schema={groupSchema}
From 8e69f05071921717c2841f351b57eb9443105451 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 11 Mar 2024 15:16:07 +0100
Subject: [PATCH 2/3] Update pro ref
---
packages/pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/pro b/packages/pro
index 4e66a0f704..71b8e60f7c 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 4e66a0f7042652763c238b10367310b168905f87
+Subproject commit 71b8e60f7c4c80e9711569416450ab8f4a7fa7d1
From 4f5eb6110ac8dedd94efad5516d51750adb0c134 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 11 Mar 2024 16:46:33 +0100
Subject: [PATCH 3/3] Update pro ref
---
packages/pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/pro b/packages/pro
index 71b8e60f7c..e565db07f6 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 71b8e60f7c4c80e9711569416450ab8f4a7fa7d1
+Subproject commit e565db07f6c51868087e88dfebde0328493443e6