Merge pull request #250 from HootDunk/frontend/fix-service-state-bug

update state after mutation and make internal items reactive
UnityFoundation-io · Apr 25, 2024 · aec684b · aec684b
2 parents 9de51d2 + 172e6e6
commit aec684b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/frontend/src/lib/components/DragAndDrop.svelte b/frontend/src/lib/components/DragAndDrop.svelte
@@ -8,8 +8,17 @@
 
 	export let items: Readonly<ItemsArray>;
 
-	let internalItems: ItemsArray = [...items];
 	let draggingIndex: number | undefined = undefined;
+	let internalItems: ItemsArray;
+
+	// this doesn't work
+	//$: internalItems = [...items];
+
+	// but this does, not sure why
+	$: updateInternalItems(items);
+	function updateInternalItems(items: Readonly<ItemsArray>) {
+		internalItems = [...items];
+	}
 
 	function handleDragStart(index: number) {
 		draggingIndex = index;

diff --git a/frontend/src/routes/groups/+page.svelte b/frontend/src/routes/groups/+page.svelte
@@ -62,6 +62,7 @@
 		const updatedGroup = e.detail;
 		let foundIndex = groupList.value.findIndex((x) => x.id == updatedGroup.id);
 		groupList.value[foundIndex] = updatedGroup;
+		groupList = groupList;
 	}
 
 	onMount(fetchGroupList);

diff --git a/frontend/src/routes/groups/[group_id]/+page.svelte b/frontend/src/routes/groups/[group_id]/+page.svelte
@@ -77,11 +77,13 @@
 		if (serviceList.type !== 'success') return;
 		const idx = serviceList.value.findIndex((s) => s.service_code == e.detail.service_code);
 		serviceList.value[idx] = e.detail;
+		serviceList = serviceList;
 	}
 
 	function removeServiceFromState(e: ComponentEvents<ServiceListItem>['serviceDeleted']) {
 		if (serviceList.type !== 'success') return;
 		serviceList.value = serviceList.value.filter((s) => s.service_code != e.detail.service_code);
+		serviceList = serviceList;
 	}
 
 	async function updateServicesOrder(e: ComponentEvents<DragAndDrop<Service>>['itemsChanged']) {