From 26122bf9858a20beebd88390355882400191ca61 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Mon, 25 Jul 2022 20:12:29 +0000
Subject: [PATCH] smaller fixes

---
 .../[id]/_Databases/_Databases.svelte         |  3 +-
 .../destinations/[id]/_RemoteDocker.svelte    |  1 -
 .../services/[id]/_Services/_Services.svelte  |  1 +
 .../ui/src/routes/sources/[id]/_Github.svelte | 42 +++++++++----------
 .../ui/src/routes/sources/[id]/_Gitlab.svelte | 32 +++++++-------
 5 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
index f75d868c0..9824e8c12 100644
--- a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -153,7 +153,8 @@
 				>
 					<input
 						value={database.version}
-						disabled={$status.database.isRunning || $status.service.initialLoading}
+						readonly
+						disabled={$status.database.isRunning || $status.database.initialLoading}
 						class:cursor-pointer={!$status.database.isRunning}
 					/></a
 				>
diff --git a/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte b/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte
index 7b3ea683c..62d90bc3f 100644
--- a/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte
@@ -239,7 +239,6 @@
 			><input
 				value={destination.sshKey.name}
 				id="sshKey"
-				disabled
 				class="cursor-pointer hover:bg-coolgray-500"
 			/></a
 		>
diff --git a/apps/ui/src/routes/services/[id]/_Services/_Services.svelte b/apps/ui/src/routes/services/[id]/_Services/_Services.svelte
index e774ccfc6..3d8f0302e 100644
--- a/apps/ui/src/routes/services/[id]/_Services/_Services.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Services.svelte
@@ -198,6 +198,7 @@
 					<input
 						value={service.version}
 						id="service"
+						readonly
 						disabled={$status.service.isRunning || $status.service.initialLoading}
 						class:cursor-pointer={!$status.service.isRunning}
 					/></a
diff --git a/apps/ui/src/routes/sources/[id]/_Github.svelte b/apps/ui/src/routes/sources/[id]/_Github.svelte
index 47ec86658..ab5028c7e 100644
--- a/apps/ui/src/routes/sources/[id]/_Github.svelte
+++ b/apps/ui/src/routes/sources/[id]/_Github.svelte
@@ -66,11 +66,7 @@
 			});
 			const { organization, htmlUrl } = source;
 			const { fqdn } = settings;
-			const host = dev
-				? getAPIUrl()
-				: fqdn
-				? fqdn
-				: `http://${window.location.host}` || '';
+			const host = dev ? getAPIUrl() : fqdn ? fqdn : `http://${window.location.host}` || '';
 			const domain = getDomain(fqdn);
 
 			let url = 'settings/apps/new';
@@ -80,9 +76,7 @@
 				name: `coolify-${name}`,
 				url: host,
 				hook_attributes: {
-					url: dev
-						? getWebhookUrl('github')
-						: `${host}/webhooks/github/events`
+					url: dev ? getWebhookUrl('github') : `${host}/webhooks/github/events`
 				},
 				redirect_url: `${host}/webhooks/github`,
 				callback_urls: [`${host}/login/github/app`],
@@ -218,20 +212,24 @@
 						bind:value={source.apiUrl}
 					/>
 				</div>
-				<div class="grid grid-cols-2 items-center">
-					<label for="customPort" class="text-base font-bold text-stone-100">Custom SSH Port</label>
-					<input
-						name="customPort"
-						id="customPort"
-						disabled={!selfHosted}
-						readonly={!selfHosted}
-						required
-						value={source.customPort}
-					/>
-					<Explainer
-						text="If you use a self-hosted version of Git, you can provide custom port for all the Git related actions."
-					/>
-				</div>
+				{#if selfHosted}
+					<div class="grid grid-cols-2 items-center">
+						<label for="customPort" class="text-base font-bold text-stone-100"
+							>Custom SSH Port</label
+						>
+						<input
+							name="customPort"
+							id="customPort"
+							disabled={!selfHosted}
+							readonly={!selfHosted}
+							required
+							value={source.customPort}
+						/>
+						<Explainer
+							text="If you use a self-hosted version of Git, you can provide custom port for all the Git related actions."
+						/>
+					</div>
+				{/if}
 				<div class="grid grid-cols-2">
 					<div class="flex flex-col">
 						<label for="organization" class="pt-2 text-base font-bold text-stone-100"
diff --git a/apps/ui/src/routes/sources/[id]/_Gitlab.svelte b/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
index 34d4ef436..70d02e2a2 100644
--- a/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
+++ b/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
@@ -31,7 +31,7 @@
 			appSecret: null
 		};
 	}
-	$: selfHosted = source.htmlUrl !== 'https://gitlab.com' ;
+	$: selfHosted = source.htmlUrl !== 'https://gitlab.com';
 
 	onMount(() => {
 		oauthIdEl && oauthIdEl.focus();
@@ -228,20 +228,22 @@
 					bind:value={source.apiUrl}
 				/>
 			</div>
-			<div class="grid grid-cols-2 items-center">
-				<label for="customPort" class="text-base font-bold text-stone-100">Custom SSH Port</label>
-				<input
-					name="customPort"
-					id="customPort"
-					disabled={!selfHosted}
-					readonly={!selfHosted}
-					required
-					bind:value={source.customPort}
-				/>
-				<Explainer
-					text="If you use a self-hosted version of Git, you can provide custom port for all the Git related actions."
-				/>
-			</div>
+			{#if selfHosted}
+				<div class="grid grid-cols-2 items-center">
+					<label for="customPort" class="text-base font-bold text-stone-100">Custom SSH Port</label>
+					<input
+						name="customPort"
+						id="customPort"
+						disabled={!selfHosted}
+						readonly={!selfHosted}
+						required
+						bind:value={source.customPort}
+					/>
+					<Explainer
+						text="If you use a self-hosted version of Git, you can provide custom port for all the Git related actions."
+					/>
+				</div>
+			{/if}
 			<div class="grid grid-cols-2 items-start">
 				<div class="flex-col">
 					<label for="oauthId" class="pt-2 text-base font-bold text-stone-100"