diff --git a/frontend/src/lib/components/GroupInfo.svelte b/frontend/src/lib/components/GroupInfo.svelte index f1fc758247..e0b1319851 100644 --- a/frontend/src/lib/components/GroupInfo.svelte +++ b/frontend/src/lib/components/GroupInfo.svelte @@ -3,14 +3,18 @@ import { workspaceStore } from '$lib/stores' import Popover from './Popover.svelte' import { untrack } from 'svelte' + import { latestRequest } from '$lib/utils/latestRequest' interface Props { name: string + /** Members are refetched whenever this changes. */ + reloadKey?: unknown } - let { name }: Props = $props() + let { name, reloadKey }: Props = $props() let members: string[] | undefined = $state([]) + const memberLoads = latestRequest() async function loadMembers() { // FAKE DATA FOR TESTING - Set to false to remove all fake data @@ -32,13 +36,16 @@ } } + const isLatest = memberLoads.start() try { - members = (await GroupService.getGroup({ workspace: $workspaceStore!, name })).members + const result = (await GroupService.getGroup({ workspace: $workspaceStore!, name })).members + if (isLatest()) members = result } catch (e) { - members = [] + if (isLatest()) members = [] } } $effect(() => { + reloadKey $workspaceStore && untrack(() => loadMembers()) }) diff --git a/frontend/src/routes/(root)/(logged)/groups/+page.svelte b/frontend/src/routes/(root)/(logged)/groups/+page.svelte index 2dc0c8dc97..4861fcdbd1 100644 --- a/frontend/src/routes/(root)/(logged)/groups/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/groups/+page.svelte @@ -43,6 +43,13 @@ groups = result } + // Bumped per saved group, so only that group's row refetches its members. + let saveCounts: Record = $state({}) + function onGroupSaved(name: string): Promise { + saveCounts[name] = (saveCounts[name] ?? 0) + 1 + return loadGroups() + } + $effect(() => { if ($workspaceStore) { untrack(() => loadGroups()) @@ -50,7 +57,7 @@ }) - + {#if $workspaceStore && !$roleCapabilities.visibility.groups} @@ -130,7 +137,7 @@ - +