Merge branch 'next' into some-tweaks

apps/ui/src/routes/services/[id]/_Secret.svelte

@@ -73,12 +73,12 @@
 <td>
 	{#if isNewSecret}
 		<div class="flex items-center justify-center">
-			<button class="btn btn-sm bg-success" on:click={() => saveSecret(true)}>Add</button>
+			<button class="btn btn-sm bg-services" on:click={() => saveSecret(true)}>Add</button>
 		</div>
 	{:else}
 		<div class="flex flex-row justify-center space-x-2">
 			<div class="flex items-center justify-center">
-				<button class="btn btn-sm bg-success" on:click={() => saveSecret(false)}>Set</button>
+				<button class="btn btn-sm bg-services" on:click={() => saveSecret(false)}>Set</button>
 			</div>
 			<div class="flex justify-center items-end">
 				<button class="btn btn-sm bg-error" on:click={removeSecret}>Remove</button>

apps/ui/src/routes/services/[id]/_Services/_Services.svelte

@@ -12,7 +12,14 @@
 	import { get, post } from '$lib/api';
 	import { errorNotification, getDomain } from '$lib/common';
 	import { t } from '$lib/translations';
-	import { appSession, disabledButton, status, location, setLocation, addToast } from '$lib/store';
+	import {
+		appSession,
+		status,
+		setLocation,
+		addToast,
+		checkIfDeploymentEnabledServices,
+		isDeploymentEnabled
+	} from '$lib/store';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import Setting from '$lib/components/Setting.svelte';
 
@@ -78,8 +85,8 @@
 			});
 			await post(`/services/${id}`, { ...service });
 			setLocation(service);
-			$disabledButton = false;
 			forceSave = false;
+			$isDeploymentEnabled = checkIfDeploymentEnabledServices($appSession.isAdmin, service);
 			return addToast({
 				message: 'Configuration saved.',
 				type: 'success'

apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte

@@ -12,7 +12,7 @@
 	export let readOnly: any;
 	export let settings: any;
 	const { id } = $page.params;
-
+	const { ipv4, ipv6 } = settings;
 	let ftpUrl = generateUrl(service.wordpress.ftpPublicPort);
 	let ftpUser = service.wordpress.ftpUser;
 	let ftpPassword = service.wordpress.ftpPassword;
@@ -22,7 +22,7 @@
 	function generateUrl(publicPort: any) {
 		return browser
 			? `sftp://${
-					settings?.fqdn ? getDomain(settings.fqdn) : window.location.hostname
+					settings?.fqdn ? getDomain(settings.fqdn) : ipv4 || ipv6
 			  }:${publicPort}`
 			: 'Loading...';
 	}

apps/ui/src/routes/services/[id]/__layout.svelte

@@ -86,7 +86,7 @@ import ServiceLinks from './_ServiceLinks.svelte';
 				if (service.type && $status.service.isRunning)
 					await post(`/services/${service.id}/${service.type}/stop`, {});
 				await del(`/services/${service.id}`, { id: service.id });
-				return await goto(`/services`);
+				return await goto(`/`, { replaceState: true });
 			} catch (error) {
 				return errorNotification(error);
 			} finally {
@@ -98,12 +98,15 @@ import ServiceLinks from './_ServiceLinks.svelte';
 		const sure = confirm($t('database.confirm_stop', { name: service.name }));
 		if (sure) {
 			$status.service.initialLoading = true;
+			$status.service.loading = true;
 			try {
 				await post(`/services/${service.id}/${service.type}/stop`, {});
 			} catch (error) {
 				return errorNotification(error);
 			} finally {
 				$status.service.initialLoading = false;
+				$status.service.loading = false;
+				await getStatus();
 			}
 		}
 	}

apps/ui/src/routes/services/[id]/secrets.svelte

@@ -129,6 +129,6 @@
 	<h2 class="title my-6 font-bold">Paste .env file</h2>
 	<form on:submit|preventDefault={getValues} class="mb-12 w-full">
 		<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />
-		<button class="btn btn-sm bg-applications" type="submit">Batch add secrets</button>
+		<button class="btn btn-sm bg-services" type="submit">Batch add secrets</button>
 	</form>
 </div>