Merge pull request #725 from coollabsio/next

v3.11.7

apps/api/src/lib/common.ts

@@ -17,7 +17,7 @@ import { day } from './dayjs';
 import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';
 
-export const version = '3.11.5';
+export const version = '3.11.7';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';

apps/api/src/lib/services.ts

@@ -2,11 +2,16 @@ import { isDev } from "./common";
 import fs from 'fs/promises';
 export async function getTemplates() {
     const templatePath = isDev ? './templates.json' : '/app/templates.json';
-    const ts = await fs.readFile(templatePath, 'utf8')
+    const open = await fs.open(templatePath, 'r');
-    if (ts) {
+    let data;
-        return JSON.parse(ts);
+    try {
+        data = await open.readFile({ encoding: 'utf-8' });
+        return JSON.parse(data);
+    } catch (error) {
+        return []
+    } finally {
+        await open?.close()
     }
-    return [];
 }
 const compareSemanticVersions = (a: string, b: string) => {
     const a1 = a.split('.');
@@ -22,15 +27,22 @@ const compareSemanticVersions = (a: string, b: string) => {
     return b1.length - a1.length;
 };
 export async function getTags(type: string) {
-    if (type) {
+
-        const tagsPath = isDev ? './tags.json' : '/app/tags.json';
+    try {
-        const data = await fs.readFile(tagsPath, 'utf8')
+        if (type) {
-        let tags = JSON.parse(data)
+            const tagsPath = isDev ? './tags.json' : '/app/tags.json';
-        if (tags) {
+            const data = await fs.readFile(tagsPath, 'utf8')
-            tags = tags.find((tag: any) => tag.name.includes(type))
+            let tags = JSON.parse(data)
-            tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
+            if (tags) {
-            return tags
+                tags = tags.find((tag: any) => tag.name.includes(type))
+                tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
+                return tags
+            }
         }
+    } catch (error) {
+        return []
+
     }
-    return []
+
+
 }

apps/api/src/lib/services/handlers.ts

@@ -34,7 +34,7 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
         const { id } = request.params;
         const teamId = request.user.teamId;
         const service = await getServiceFromDB({ id, teamId });
-        const arm = isARM(process.arch);
+        const arm = isARM(service.arch);
         const { type, destinationDockerId, destinationDocker, persistentStorage, exposePort } =
             service;
 
@@ -128,7 +128,6 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
                 labels: makeLabelForServices(type),
                 ...defaultComposeConfiguration(network),
             }
-            console.log(config[s].image)
 
             // Generate files for builds
             if (template.services[s]?.files?.length > 0) {

apps/ui/src/lib/components/UpdateAvailable.svelte

@@ -1,7 +1,14 @@
 <script lang="ts">
 	import { dev } from '$app/env';
 	import { get, post } from '$lib/api';
-	import { addToast, appSession, features, updateLoading, isUpdateAvailable } from '$lib/store';
+	import {
+		addToast,
+		appSession,
+		features,
+		updateLoading,
+		isUpdateAvailable,
+		latestVersion
+	} from '$lib/store';
 	import { asyncSleep, errorNotification } from '$lib/common';
 	import { onMount } from 'svelte';
 	import Tooltip from './Tooltip.svelte';
@@ -11,17 +18,17 @@
 		loading: false,
 		success: null
 	};
-	let latestVersion = 'latest';
 	async function update() {
 		updateStatus.loading = true;
 		try {
 			if (dev) {
 				localStorage.setItem('lastVersion', $appSession.version);
 				await asyncSleep(1000);
+				updateStatus.loading = false;
 				return window.location.reload();
 			} else {
 				localStorage.setItem('lastVersion', $appSession.version);
-				await post(`/update`, { type: 'update', latestVersion });
+				await post(`/update`, { type: 'update', latestVersion: $latestVersion });
 				addToast({
 					message: 'Update completed.<br><br>Waiting for the new version to start...',
 					type: 'success'
@@ -64,7 +71,7 @@
 					$updateLoading = true;
 					const data = await get(`/update`);
 					if (overrideVersion || data?.isUpdateAvailable) {
-						latestVersion = overrideVersion || data.latestVersion;
+						$latestVersion = overrideVersion || data.latestVersion;
 						if (overrideVersion) {
 							$isUpdateAvailable = true;
 						} else {
@@ -93,7 +100,7 @@
 				{#if updateStatus.loading}
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
-						class="lds-heart h-8 w-8"
+						class="lds-heart h-8 w-8 mx-auto"
 						viewBox="0 0 24 24"
 						stroke-width="1.5"
 						stroke="currentColor"

apps/ui/src/lib/store.ts

@@ -32,6 +32,7 @@ interface AddToast {
 }
 export const updateLoading: Writable<boolean> = writable(false);
 export const isUpdateAvailable: Writable<boolean> = writable(false);
+export const latestVersion: Writable<string> = writable('latest');
 export const search: any = writable('')
 export const loginEmail: Writable<string | undefined> = writable()
 export const appSession: Writable<AppSession> = writable({

apps/ui/src/routes/applications/[id]/_PreviewSecret.svelte

@@ -32,10 +32,10 @@
 	}
 </script>
 
-<div class="w-full font-bold grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
+<div class="w-full grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
 	<div class="flex flex-col">
 		{#if index === 0 || length === 0}
-			<label for="name" class="pb-2 uppercase">name</label>
+			<label for="name" class="pb-2 uppercase font-bold">name</label>
 		{/if}
 
 		<input
@@ -50,7 +50,7 @@
 	</div>
 	<div class="flex flex-col">
 		{#if index === 0 || length === 0}
-			<label for="value" class="pb-2 uppercase">value</label>
+			<label for="value" class="pb-2 uppercase font-bold">value</label>
 		{/if}
 
 		<CopyPasswordField
@@ -63,9 +63,12 @@
 	</div>
 	<div class="flex lg:flex-col flex-row justify-start items-center pt-3 lg:pt-0">
 		{#if index === 0 || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Need during buildtime?</label>
+			<label for="name" class="pb-2 uppercase lg:block hidden font-bold"
+				>Need during buildtime?</label
+			>
 		{/if}
-		<label for="name" class="pb-2 uppercase lg:hidden block">Need during buildtime?</label>
+		<label for="name" class="pb-2 uppercase lg:hidden block font-bold">Need during buildtime?</label
+		>
 
 		<div class="flex justify-center h-full items-center pt-0 lg:pt-0 pl-4 lg:pl-0">
 			<button
@@ -114,7 +117,7 @@
 	</div>
 	<div class="flex flex-row lg:flex-col lg:items-center items-start">
 		{#if index === 0 || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Actions</label>
+			<label for="name" class="pb-5 uppercase lg:block hidden font-bold" />
 		{/if}
 
 		<div class="flex justify-center h-full items-center pt-3">

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

@@ -79,10 +79,10 @@
 	}
 </script>
 
-<div class="w-full font-bold grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
+<div class="w-full grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
 	<div class="flex flex-col">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="name" class="pb-2 uppercase">name</label>
+			<label for="name" class="pb-2 uppercase font-bold">name</label>
 		{/if}
 
 		<input
@@ -101,7 +101,7 @@
 	</div>
 	<div class="flex flex-col">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="value" class="pb-2 uppercase">value</label>
+			<label for="value" class="pb-2 uppercase font-bold">value</label>
 		{/if}
 
 		<CopyPasswordField
@@ -114,9 +114,12 @@
 	</div>
 	<div class="flex lg:flex-col flex-row justify-start items-center pt-3 lg:pt-0">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Need during buildtime?</label>
+			<label for="name" class="pb-2 uppercase lg:block hidden font-bold"
+				>Need during buildtime?</label
+			>
 		{/if}
-		<label for="name" class="pb-2 uppercase lg:hidden block">Need during buildtime?</label>
+		<label for="name" class="pb-2 uppercase lg:hidden block font-bold">Need during buildtime?</label
+		>
 
 		<div class="flex justify-center h-full items-center pt-0 lg:pt-0 pl-4 lg:pl-0">
 			<button
@@ -166,7 +169,7 @@
 	</div>
 	<div class="flex flex-row lg:flex-col lg:items-center items-start">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Action</label>
+			<label for="name" class="pb-5 uppercase lg:block hidden font-bold" />
 		{/if}
 
 		<div class="flex justify-center h-full items-center pt-3">

apps/ui/src/routes/index.svelte

@@ -90,31 +90,50 @@
 		return {
 			applications:
 				!onlyOthers &&
-				applications.filter((application: any) => application.teams[0].id === $appSession.teamId),
+				applications.filter(
+					(application: any) =>
+						application?.teams.length > 0 && application.teams[0].id === $appSession.teamId
+				),
 			otherApplications: applications.filter(
-				(application: any) => application.teams[0].id !== $appSession.teamId
+				(application: any) =>
+					application?.teams.length > 0 && application.teams[0].id !== $appSession.teamId
 			),
 			databases:
 				!onlyOthers &&
-				databases.filter((database: any) => database.teams[0].id === $appSession.teamId),
+				databases.filter(
+					(database: any) =>
+						database?.teams.length > 0 && database.teams[0].id === $appSession.teamId
+				),
 			otherDatabases: databases.filter(
-				(database: any) => database.teams[0].id !== $appSession.teamId
+				(database: any) => database?.teams.length > 0 && database.teams[0].id !== $appSession.teamId
 			),
 			services:
 				!onlyOthers &&
-				services.filter((service: any) => service.teams[0].id === $appSession.teamId),
+				services.filter(
-			otherServices: services.filter((service: any) => service.teams[0].id !== $appSession.teamId),
+					(service: any) => service?.teams.length > 0 && service.teams[0].id === $appSession.teamId
+				),
+			otherServices: services.filter(
+				(service: any) => service?.teams.length > 0 && service.teams[0].id !== $appSession.teamId
+			),
 			gitSources:
 				!onlyOthers &&
-				gitSources.filter((gitSource: any) => gitSource.teams[0].id === $appSession.teamId),
+				gitSources.filter(
+					(gitSource: any) =>
+						gitSource?.teams.length > 0 && gitSource.teams[0].id === $appSession.teamId
+				),
 			otherGitSources: gitSources.filter(
-				(gitSource: any) => gitSource.teams[0].id !== $appSession.teamId
+				(gitSource: any) =>
+					gitSource?.teams.length > 0 && gitSource.teams[0].id !== $appSession.teamId
 			),
 			destinations:
 				!onlyOthers &&
-				destinations.filter((destination: any) => destination.teams[0].id === $appSession.teamId),
+				destinations.filter(
+					(destination: any) =>
+						destination?.teams.length > 0 && destination.teams[0].id === $appSession.teamId
+				),
 			otherDestinations: destinations.filter(
-				(destination: any) => destination.teams[0].id !== $appSession.teamId
+				(destination: any) =>
+					destination?.teams.length > 0 && destination.teams[0].id !== $appSession.teamId
 			)
 		};
 	}
@@ -682,7 +701,11 @@
 
 									<div class="flex justify-end items-end space-x-2 h-10">
 										{#if application?.fqdn}
-											<a href={application?.fqdn} target="_blank noreferrer" class="icons hover:bg-green-500">
+											<a
+												href={application?.fqdn}
+												target="_blank noreferrer"
+												class="icons hover:bg-green-500"
+											>
 												<svg
 													xmlns="http://www.w3.org/2000/svg"
 													class="h-6 w-6"
@@ -788,7 +811,11 @@
 
 								<div class="flex justify-end items-end space-x-2 h-10">
 									{#if application?.fqdn}
-										<a href={application?.fqdn} target="_blank noreferrer" class="icons hover:bg-green-500">
+										<a
+											href={application?.fqdn}
+											target="_blank noreferrer"
+											class="icons hover:bg-green-500"
+										>
 											<svg
 												xmlns="http://www.w3.org/2000/svg"
 												class="h-6 w-6"
@@ -897,7 +924,11 @@
 									</div>
 									<div class="flex justify-end items-end space-x-2 h-10">
 										{#if service?.fqdn}
-											<a href={service?.fqdn} target="_blank noreferrer" class="icons hover:bg-pink-500">
+											<a
+												href={service?.fqdn}
+												target="_blank noreferrer"
+												class="icons hover:bg-pink-500"
+											>
 												<svg
 													xmlns="http://www.w3.org/2000/svg"
 													class="h-6 w-6"
@@ -970,7 +1001,11 @@
 								</div>
 								<div class="flex justify-end items-end space-x-2 h-10">
 									{#if service?.fqdn}
-										<a href={service?.fqdn} target="_blank noreferrer" class="icons hover:bg-pink-500">
+										<a
+											href={service?.fqdn}
+											target="_blank noreferrer"
+											class="icons hover:bg-pink-500"
+										>
 											<svg
 												xmlns="http://www.w3.org/2000/svg"
 												class="h-6 w-6"

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

@@ -8,7 +8,7 @@
 </script>
 
 {#if linkToDocs}
-	<DocLink url={template[service.id].documentation} text={`Documentation`} isExternal={true} />
+	<DocLink url={template[service.id]?.documentation || 'https://docs.coollabs.io'} text={`Documentation`} isExternal={true} />
 {:else}
 	<ServiceIcons type={service.type} />
 {/if}

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

@@ -276,20 +276,25 @@
 			</div>
 			<div class="grid grid-cols-2 items-center">
 				<label for="version">Version / Tag</label>
-				<div class="custom-select-wrapper w-full">
+				{#if tags.tags?.length > 0}
-					<Select
+					<div class="custom-select-wrapper w-full">
-						form="saveForm"
+						<Select
-						containerClasses={isDisabled && containerClass()}
+							form="saveForm"
-						{isDisabled}
+							containerClasses={isDisabled && containerClass()}
-						id="version"
+							{isDisabled}
-						showIndicator={!isDisabled}
+							id="version"
-						items={[...tags.tags]}
+							showIndicator={!isDisabled}
-						on:select={selectTag}
+							items={[...tags.tags]}
-						value={service.version}
+							on:select={selectTag}
-						isClearable={false}
+							value={service.version}
-					/>
+							isClearable={false}
-				</div>
+						/>
+					</div>
+				{:else}
+					<input class="w-full border-red-500" disabled placeholder="Error getting tags...">
+				{/if}
 			</div>
+
 			<div class="grid grid-cols-2 items-center">
 				<label for="destination">{$t('application.destination')}</label>
 				<div>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.11.5",
+  "version": "3.11.7",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {