From 9f813b7385472cc6b3a01e2a5dd89aee6896d89c Mon Sep 17 00:00:00 2001
From: Kaname <56084970+kaname-png@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:05:19 +0000
Subject: [PATCH] fix: github conflicts

---
 .../src/routes/databases/[id]/_Databases/_Databases.svelte  | 4 ++--
 apps/ui/src/routes/databases/[id]/__layout.svelte           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
index 95bf9b012..a0a34283e 100644
--- a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -177,7 +177,7 @@
 				readonly
 				disabled
 				name="publicPort"
-				value={publicLoading ? 'Loading...' : isPublic ? database.publicPort : privatePort}
+				value={publicLoading ? 'Loading...' : $status.database.isPublic ? database.publicPort : privatePort}
 			/>
 		</div>
 		{#if database.type === 'mysql'}
@@ -199,7 +199,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."
 						/>
diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte
index b3f9c1774..2488ca970 100644
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -62,7 +62,7 @@
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { onDestroy, onMount } from 'svelte';
 	import Tooltip from '$lib/components/Tooltip.svelte';
-import DatabaseLinks from './_DatabaseLinks.svelte';
+	import DatabaseLinks from './_DatabaseLinks.svelte';
 	const { id } = $page.params;
 
 	$status.database.isPublic = database.settings.isPublic || false;
@@ -165,11 +165,11 @@ import DatabaseLinks from './_DatabaseLinks.svelte';
 		<div
 			class="flex flex-row flex-wrap space-x-4 space-y-3 justify-center lg:justify-start py-2 lg:py-0"
 		>
-			{#if database.type && database.destinationDockerId && database.version && database.defaultDatabase}
+			{#if database.type && database.destinationDockerId && database.version}
 				{#if $status.database.isExited}
 					<a
 						id="exited"
-						href={!$disabledButton ? `/databases/${id}/logs` : null}
+						href={!$status.database.isRunning ? `/databases/${id}/logs` : null}
 						class="icons bg-transparent text-sm flex items-center text-red-500 tooltip-error"
 						sveltekit:prefetch
 					>