From e36fda3ff111414d3454397d867faa5f3b5b33b2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Sep 2022 10:54:24 +0200
Subject: [PATCH] fix: ispublic status on databases

---
 apps/ui/src/lib/store.ts                      |  3 ++-
 .../[id]/_Databases/_Databases.svelte         | 19 +++++++++----------
 .../src/routes/databases/[id]/__layout.svelte |  2 ++
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/ui/src/lib/store.ts b/apps/ui/src/lib/store.ts
index 29f48a048..ec841a2e5 100644
--- a/apps/ui/src/lib/store.ts
+++ b/apps/ui/src/lib/store.ts
@@ -86,7 +86,8 @@ export const status: Writable<any> = writable({
         isRunning: false,
         isExited: false,
         loading: false,
-        initialLoading: true
+        initialLoading: true,
+        isPublic: false
     }
 
 });
diff --git a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
index 61972edfe..14a88b00b 100644
--- a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -24,7 +24,6 @@
 	let loading = false;
 	let publicLoading = false;
 
-	let isPublic = database.settings.isPublic || false;
 	let appendOnly = database.settings.appendOnly;
 
 	let databaseDefault: any;
@@ -52,12 +51,12 @@
 		return `${database.type}://${
 			databaseDbUser ? databaseDbUser + ':' : ''
 		}${databaseDbUserPassword}@${
-			isPublic
+			$status.database.isPublic
 				? database.destinationDocker.remoteEngine
 					? database.destinationDocker.remoteIpAddress
 					: $appSession.ipv4
 				: database.id
-		}:${isPublic ? database.publicPort : privatePort}/${databaseDefault}`;
+		}:${$status.database.isPublic ? database.publicPort : privatePort}/${databaseDefault}`;
 	}
 
 	async function changeSettings(name: any) {
@@ -66,11 +65,11 @@
 		}
 		publicLoading = true;
 		let data = {
-			isPublic,
+			isPublic: $status.database.isPublic,
 			appendOnly
 		};
 		if (name === 'isPublic') {
-			data.isPublic = !isPublic;
+			data.isPublic = !$status.database.isPublic;
 		}
 		if (name === 'appendOnly') {
 			data.appendOnly = !appendOnly;
@@ -80,9 +79,9 @@
 				isPublic: data.isPublic,
 				appendOnly: data.appendOnly
 			});
-			isPublic = data.isPublic;
+			$status.database.isPublic = data.isPublic;
 			appendOnly = data.appendOnly;
-			if (isPublic) {
+			if ($status.database.isPublic) {
 				database.publicPort = publicPort;
 			}
 		} catch (error) {
@@ -191,7 +190,7 @@
 					readonly
 					disabled
 					name="publicPort"
-					value={publicLoading ? 'Loading...' : isPublic ? database.publicPort : privatePort}
+					value={publicLoading ? 'Loading...' : $status.database.isPublic ? database.publicPort : privatePort}
 				/>
 			</div>
 		</div>
@@ -215,7 +214,7 @@
 				<div>
 					<label for="url" class="text-base font-bold text-stone-100"
 						>{$t('database.connection_string')}
-						{#if !isPublic && database.destinationDocker.remoteEngine}
+						{#if !$status.database.isPublic && database.destinationDocker.remoteEngine}
 							<Explainer
 								explanation="You can only access the database with this URL if your application is deployed to the same Destination."
 							/>
@@ -243,7 +242,7 @@
 			<Setting
 				id="isPublic"
 				loading={publicLoading}
-				bind:setting={isPublic}
+				bind:setting={$status.database.isPublic}
 				on:click={() => changeSettings('isPublic')}
 				title={$t('database.set_public')}
 				description={$t('database.warning_database_public')}
diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte
index 94e1e6114..034e2c0a9 100644
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -64,6 +64,7 @@
 	import Tooltip from '$lib/components/Tooltip.svelte';
 	const { id } = $page.params;
 
+	$status.database.isPublic = database.settings.isPublic || false;
 	let statusInterval: any = false;
 	let forceDelete = false;
 
@@ -90,6 +91,7 @@
 			$status.database.loading = true;
 			try {
 				await post(`/databases/${database.id}/stop`, {});
+				$status.database.isPublic = false;
 			} catch (error) {
 				return errorNotification(error);
 			} finally {