From 9121c6a078943c5de6b715c1ceb9a46435f98e4c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 25 Nov 2022 15:43:59 +0100
Subject: [PATCH] fix: 0 destinations redirect after creation

---
 .../[id]/configuration/destination.svelte        |  6 +++++-
 .../destinations/[id]/_NewLocalDocker.svelte     | 16 +++++++++++-----
 .../destinations/[id]/_NewRemoteDocker.svelte    |  5 +++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
index 13e16e1ce..a856ce894 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
@@ -70,7 +70,11 @@
 				{$t('application.configuration.no_configurable_destination')}
 			</div>
 			<div class="flex justify-center">
-				<a href="/destinations/new" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
+				<a
+					href={`/destinations/new?from=/applications/${id}/configuration/destination`}
+					sveltekit:prefetch
+					class="add-icon bg-sky-600 hover:bg-sky-500"
+				>
 					<svg
 						class="w-6"
 						xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte b/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
index 63a1c4d52..8bc561898 100644
--- a/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
@@ -2,13 +2,14 @@
 	export let payload: any;
 
 	import { goto } from '$app/navigation';
-
+	import { page } from '$app/stores';
 	import { post } from '$lib/api';
 	import { errorNotification } from '$lib/common';
 	import Setting from '$lib/components/Setting.svelte';
 	import { appSession } from '$lib/store';
 	import { t } from '$lib/translations';
 
+	const from = $page.url.searchParams.get('from');
 	let loading = false;
 
 	async function handleSubmit() {
@@ -19,8 +20,7 @@
 			const { id } = await post(`/destinations/new`, {
 				...payload
 			});
-			await goto(`/destinations/${id}`);
-			window.location.reload();
+			return await goto(from || `/destinations/${id}`);
 		} catch (error) {
 			return errorNotification(error);
 		} finally {
@@ -31,9 +31,15 @@
 
 <div class="flex justify-center px-6 pb-8">
 	<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
-		<div class="flex items-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col lg:flex-row space-y-4 lg:space-y-0">
+		<div
+			class="flex items-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col lg:flex-row space-y-4 lg:space-y-0"
+		>
 			<div class="title font-bold">{$t('forms.configuration')}</div>
-			<button type="submit" class="btn btn-sm bg-destinations w-full lg:w-fit" class:loading disabled={loading}
+			<button
+				type="submit"
+				class="btn btn-sm bg-destinations w-full lg:w-fit"
+				class:loading
+				disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
 						? $t('destination.new.saving_and_configuring_proxy')
diff --git a/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte b/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
index 83829ff19..5b569ab63 100644
--- a/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
@@ -2,13 +2,14 @@
 	export let payload: any;
 
 	import { goto } from '$app/navigation';
-
+	import { page } from '$app/stores';
 	import { post } from '$lib/api';
 	import { errorNotification } from '$lib/common';
 	import SimpleExplainer from '$lib/components/SimpleExplainer.svelte';
 	import Setting from '$lib/components/Setting.svelte';
 	import { t } from '$lib/translations';
 
+	const from = $page.url.searchParams.get('from');
 	let loading = false;
 
 	async function handleSubmit() {
@@ -19,7 +20,7 @@
 			const { id } = await post(`/destinations/new`, {
 				...payload
 			});
-			return await goto(`/destinations/${id}`);
+			return await goto(from || `/destinations/${id}`);
 		} catch (error) {
 			return errorNotification(error);
 		} finally {