Merge pull request #259 from knot-dots/delete-recursively-follow-up

Delete recursively follow-up

src/lib/components/Dialog.svelte

@@ -16,7 +16,6 @@
 	dialog {
 		border: none;
 		padding: 1.5rem;
-		position: relative;
 		width: 100%;
 	}
 

src/lib/components/Overlay.svelte

@@ -77,7 +77,14 @@
 		type TaskContainer,
 		type User
 	} from '$lib/models';
-	import { ability, addEffectState, mayDeleteContainer, overlayWidth, user } from '$lib/stores';
+	import {
+		ability,
+		addEffectState,
+		mayDeleteContainer,
+		overlayHistory,
+		overlayWidth,
+		user
+	} from '$lib/stores';
 
 	export let containersWithObjectives: ContainerWithObjective[] = [];
 	export let indicators: IndicatorContainer[] | undefined = undefined;
@@ -189,9 +196,15 @@
 	async function handleDelete(c: AnyContainer) {
 		const response = await deleteContainer(c);
 		if (response.ok) {
-			await invalidateAll();
-			await goto(closeURL());
+			if ($overlayHistory.length > 1) {
+				$overlayHistory = $overlayHistory.slice(0, $overlayHistory.length - 1);
+				const newParams = $overlayHistory[$overlayHistory.length - 1] as URLSearchParams;
+				await goto(`#${newParams.toString()}`, { invalidateAll: true });
+			} else {
+				await goto(closeURL(), { invalidateAll: true });
+			}
 		}
+		confirmDeleteDialog.close();
 	}
 
 	function saveIndicatorAsTemplate(c: IndicatorContainer) {

src/lib/server/db.ts

@@ -299,6 +299,8 @@ export function deleteContainerRecursively(container: AnyContainer) {
 				''
 			)(txConnection);
 
+			await deleteContainer(container)(txConnection);
+
 			for (const part of findDescendants(container, parts)) {
 				await deleteContainer({ ...part, user: container.user })(txConnection);
 			}