From 7891e99cf7d5850e96fc3bc44852389f1918ceef Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 23 Feb 2024 17:08:54 +0100
Subject: [PATCH] Allow editing non scim groups

---
 .../pages/builder/portal/users/groups/[groupId].svelte |  5 ++---
 .../portal/users/groups/_components/GroupUsers.svelte  | 10 +++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
index 553d5ffcd2..2543e6bb66 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
@@ -47,9 +47,8 @@
   let loaded = false
   let editModal, deleteModal
 
-  $: scimEnabled = $features.isScimEnabled
-  $: readonly = !sdk.users.isAdmin($auth.user) || scimEnabled
   $: group = $groups.find(x => x._id === groupId)
+  $: readonly = !sdk.users.isAdmin($auth.user) || group?.scimInfo?.isSync
   $: groupApps = $apps
     .filter(app =>
       groups.actions
@@ -135,7 +134,7 @@
     </div>
 
     <Layout noPadding gap="S">
-      <GroupUsers {groupId} {group} />
+      <GroupUsers {groupId} {readonly} />
     </Layout>
 
     <Layout noPadding gap="S">
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index 876ab5e228..fcb9eba9b2 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -5,14 +5,13 @@
   import { fetchData } from "@budibase/frontend-core"
   import { goto } from "@roxi/routify"
   import { API } from "api"
-  import { auth, features, groups } from "stores/portal"
+  import { groups } from "stores/portal"
   import { setContext } from "svelte"
   import ScimBanner from "../../_components/SCIMBanner.svelte"
   import RemoveUserTableRenderer from "../_components/RemoveUserTableRenderer.svelte"
-  import { sdk } from "@budibase/shared-core"
 
   export let groupId
-  export let group
+  export let readonly
 
   let emailSearch
   let fetchGroupUsers
@@ -50,9 +49,6 @@
     },
   ]
 
-  $: scimEnabled = $features.isScimEnabled && group.scimInfo?.isSync
-  $: readonly = !sdk.users.isAdmin($auth.user) || scimEnabled
-
   const removeUser = async id => {
     await groups.actions.removeUser(groupId, id)
     fetchGroupUsers.refresh()
@@ -64,7 +60,7 @@
 </script>
 
 <div class="header">
-  {#if !scimEnabled}
+  {#if !readonly}
     <EditUserPicker {groupId} onUsersUpdated={fetchGroupUsers.getInitialData} />
   {:else}
     <ScimBanner />