From 965a417a21e1ab5a15ce92573e265403212a4daf Mon Sep 17 00:00:00 2001 From: adrinr Date: Sun, 16 Apr 2023 18:45:09 +0100 Subject: [PATCH 1/2] Fix disabling fields on first load --- .../src/pages/builder/portal/users/groups/[groupId].svelte | 3 ++- .../src/pages/builder/portal/users/users/[userId].svelte | 3 ++- 2 files changed, 4 insertions(+), 2 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 bfb60f1c72..bbfd6998eb 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -75,7 +75,8 @@ let loaded = false let editModal, deleteModal - const scimEnabled = $features.isScimEnabled + let scimEnabled = false + $: scimEnabled = $features.isScimEnabled $: readonly = !$auth.isAdmin || scimEnabled $: page = $pageInfo.page 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 d1ee48fd01..a890bd9a4a 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -86,7 +86,8 @@ let user let loaded = false - const scimEnabled = $features.isScimEnabled + let scimEnabled = false + $: scimEnabled = $features.isScimEnabled $: isSSO = !!user?.provider $: readonly = !$auth.isAdmin || scimEnabled From 4a67136c723eba42fb5164b5f746d232b1ed2a13 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 09:49:11 +0100 Subject: [PATCH 2/2] Remove unnecessary initialisation --- .../src/pages/builder/portal/users/groups/[groupId].svelte | 2 -- .../src/pages/builder/portal/users/users/[userId].svelte | 2 -- 2 files changed, 4 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 bbfd6998eb..1be019b83e 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -75,9 +75,7 @@ let loaded = false let editModal, deleteModal - let scimEnabled = false $: scimEnabled = $features.isScimEnabled - $: readonly = !$auth.isAdmin || scimEnabled $: page = $pageInfo.page $: fetchUsers(page, searchTerm) 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 a890bd9a4a..98915eb960 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -86,9 +86,7 @@ let user let loaded = false - let scimEnabled = false $: scimEnabled = $features.isScimEnabled - $: isSSO = !!user?.provider $: readonly = !$auth.isAdmin || scimEnabled $: privileged = user?.admin?.global || user?.builder?.global