From 6150a008d50fd629bdba688321081a35273ed521 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Tue, 16 Aug 2022 09:38:34 +0000
Subject: [PATCH] fixes

---
 apps/api/src/lib/common.ts                             |  4 ++--
 apps/ui/src/lib/common.ts                              |  4 ++--
 .../applications/[id]/configuration/destination.svelte | 10 +++++++++-
 .../databases/[id]/configuration/destination.svelte    | 10 +++++++++-
 apps/ui/src/routes/index.svelte                        |  2 +-
 apps/ui/src/routes/services/[id]/__layout.svelte       |  1 -
 .../services/[id]/configuration/destination.svelte     | 10 +++++++++-
 .../routes/services/[id]/configuration/version.svelte  |  8 ++++++++
 8 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index 6170d380c..d67125db3 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -260,8 +260,8 @@ export const supportedServiceTypesAndVersions = [
 		fancyName: 'Hasura',
 		baseImage: 'hasura/graphql-engine',
 		images: ['postgres:12-alpine'],
-		versions: ['latest', 'v2.8.4', 'v2.5.1'],
-		recommendedVersion: 'v2.8.4',
+		versions: ['latest', 'v2.10.0', 'v2.5.1'],
+		recommendedVersion: 'v2.10.0',
 		ports: {
 			main: 8080
 		}
diff --git a/apps/ui/src/lib/common.ts b/apps/ui/src/lib/common.ts
index 32485a522..08b863d57 100644
--- a/apps/ui/src/lib/common.ts
+++ b/apps/ui/src/lib/common.ts
@@ -131,8 +131,8 @@ export const supportedServiceTypesAndVersions = [
 		fancyName: 'Hasura',
 		baseImage: 'hasura/graphql-engine',
 		images: ['postgres:12-alpine'],
-		versions: ['latest', 'v2.5.1'],
-		recommendedVersion: 'v2.5.1',
+		versions: ['latest', 'v2.10.0', 'v2.5.1'],
+		recommendedVersion: 'v2.10.0',
 		ports: {
 			main: 8080
 		}
diff --git a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
index 2bfe98a5c..5265ec452 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
@@ -31,6 +31,7 @@
 	import { t } from '$lib/translations';
 	import { appSession } from '$lib/store';
 	import { errorNotification } from '$lib/common';
+	import { onMount } from 'svelte/types/runtime/internal/lifecycle';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -55,6 +56,11 @@
 			return errorNotification(error);
 		}
 	}
+	onMount(async () => {
+		if (destinations.length === 1) {
+			await handleSubmit(destinations[0].id);
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -65,7 +71,9 @@
 <div class="flex flex-col justify-center">
 	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2 text-center font-bold">{$t('application.configuration.no_configurable_destination')}</div>
+			<div class="pb-2 text-center font-bold">
+				{$t('application.configuration.no_configurable_destination')}
+			</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg
diff --git a/apps/ui/src/routes/databases/[id]/configuration/destination.svelte b/apps/ui/src/routes/databases/[id]/configuration/destination.svelte
index af554639e..fce28878c 100644
--- a/apps/ui/src/routes/databases/[id]/configuration/destination.svelte
+++ b/apps/ui/src/routes/databases/[id]/configuration/destination.svelte
@@ -30,6 +30,7 @@
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
 	import { errorNotification } from '$lib/common';
+	import { onMount } from 'svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -45,6 +46,11 @@
 			return errorNotification(error);
 		}
 	}
+	onMount(async () => {
+		if (destinations.length === 1) {
+			await handleSubmit(destinations[0].id);
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -55,7 +61,9 @@
 <div class="flex justify-center">
 	{#if !destinations || destinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2 text-center font-bold">{$t('application.configuration.no_configurable_destination')}</div>
+			<div class="pb-2 text-center font-bold">
+				{$t('application.configuration.no_configurable_destination')}
+			</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg
diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte
index 266fc6b53..f28009843 100644
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@@ -39,7 +39,7 @@
 	export let services: any;
     let numberOfGetStatus = 0;
     
-    function getRndInteger(min, max) {
+    function getRndInteger(min: number, max: number) {
         return Math.floor(Math.random() * (max - min + 1) ) + min;
     }
 
diff --git a/apps/ui/src/routes/services/[id]/__layout.svelte b/apps/ui/src/routes/services/[id]/__layout.svelte
index d3ab9d1ae..6f37692eb 100644
--- a/apps/ui/src/routes/services/[id]/__layout.svelte
+++ b/apps/ui/src/routes/services/[id]/__layout.svelte
@@ -110,7 +110,6 @@
 		loading = true;
 		try {
 			await post(`/services/${service.id}/${service.type}/start`, {});
-			return window.location.reload();
 		} catch (error) {
 			return errorNotification(error);
 		} finally {
diff --git a/apps/ui/src/routes/services/[id]/configuration/destination.svelte b/apps/ui/src/routes/services/[id]/configuration/destination.svelte
index 47fb93db6..19d96809b 100644
--- a/apps/ui/src/routes/services/[id]/configuration/destination.svelte
+++ b/apps/ui/src/routes/services/[id]/configuration/destination.svelte
@@ -32,10 +32,16 @@
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
 	import { errorNotification } from '$lib/common';
+	import { onMount } from 'svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
 
+	onMount(async () => {
+		if (destinations.length === 1) {
+			await handleSubmit(destinations[0].id);
+		}
+	});
 	async function handleSubmit(destinationId: any) {
 		try {
 			await post(`/services/${id}/configuration/destination`, { destinationId });
@@ -54,7 +60,9 @@
 <div class="flex justify-center">
 	{#if !destinations || destinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2 text-center font-bold">{$t('application.configuration.no_configurable_destination')}</div>
+			<div class="pb-2 text-center font-bold">
+				{$t('application.configuration.no_configurable_destination')}
+			</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg
diff --git a/apps/ui/src/routes/services/[id]/configuration/version.svelte b/apps/ui/src/routes/services/[id]/configuration/version.svelte
index 203929e66..1c167b5e0 100644
--- a/apps/ui/src/routes/services/[id]/configuration/version.svelte
+++ b/apps/ui/src/routes/services/[id]/configuration/version.svelte
@@ -32,12 +32,20 @@
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
 	import { errorNotification, supportedServiceTypesAndVersions } from '$lib/common';
+	import { onMount } from 'svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
 	let recommendedVersion = supportedServiceTypesAndVersions.find(
 		({ name }) => name === type
 	)?.recommendedVersion;
+
+	onMount(async () => {
+		if (versions.length === 1) {
+			await handleSubmit(versions[0]);
+		}
+	});
+
 	async function handleSubmit(version: any) {
 		try {
 			await post(`/services/${id}/configuration/version`, { version });