From 18edfff2d6bec792d6dc87fa694f0503435b2dd5 Mon Sep 17 00:00:00 2001
From: G30 <50341825+silentoplayz@users.noreply.github.com>
Date: Mon, 24 Aug 2026 16:31:39 -0400
Subject: [PATCH] fix: discard unsaved group settings and key the groups list
 (#28076)

* fix: stop unsaved group settings from persisting into the group list state

* fix: key the groups list so an open modal cannot rebind to another group
---
 src/lib/components/admin/Users/Groups.svelte                | 2 +-
 src/lib/components/admin/Users/Groups/EditGroupModal.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/admin/Users/Groups.svelte b/src/lib/components/admin/Users/Groups.svelte
index d4301a49c7..8c7a8394d7 100644
--- a/src/lib/components/admin/Users/Groups.svelte
+++ b/src/lib/components/admin/Users/Groups.svelte
@@ -176,7 +176,7 @@
 
 		{#if filteredGroups.length !== 0}
 			<div class="mt-1 grid grid-cols-1">
-				{#each filteredGroups as group, idx}
+				{#each filteredGroups as group, idx (group.id)}
 					<GroupItem {group} {setGroups} {defaultPermissions} />
 					{#if idx < filteredGroups.length - 1}
 						<hr class="border-gray-50 dark:border-gray-850/40" />
diff --git a/src/lib/components/admin/Users/Groups/EditGroupModal.svelte b/src/lib/components/admin/Users/Groups/EditGroupModal.svelte
index 61fdf15762..a85deb778a 100644
--- a/src/lib/components/admin/Users/Groups/EditGroupModal.svelte
+++ b/src/lib/components/admin/Users/Groups/EditGroupModal.svelte
@@ -96,7 +96,7 @@
 				features: { ...DEFAULT_PERMISSIONS.features, ...loadedPermissions.features },
 				settings: { ...DEFAULT_PERMISSIONS.settings, ...loadedPermissions.settings }
 			};
-			data = group?.data ?? {};
+			data = structuredClone(group?.data ?? {});
 
 			userCount = group?.member_count ?? 0;
 		}