Merge pull request #534 from coollabsio/next

v3.3.2

apps/api/src/lib/common.ts

@@ -17,7 +17,7 @@ import { checkContainer, removeContainer } from './docker';
 import { day } from './dayjs';
 import * as serviceFields from './serviceFields'
 
-export const version = '3.3.0';
+export const version = '3.3.2';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';

apps/ui/src/lib/components/svg/applications/ApplicationIcons.svelte

@@ -4,38 +4,38 @@
 	export let isAbsolute = true;
 </script>
 
-{#if application.buildPack.toLowerCase() === 'rust'}
+{#if application.buildPack?.toLowerCase() === 'rust'}
 	<Icons.Rust {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'node'}
+{:else if application.buildPack?.toLowerCase() === 'node'}
 	<Icons.Nodejs {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'react'}
+{:else if application.buildPack?.toLowerCase() === 'react'}
 	<Icons.React {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'svelte'}
+{:else if application.buildPack?.toLowerCase() === 'svelte'}
 	<Icons.Svelte {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'vuejs'}
+{:else if application.buildPack?.toLowerCase() === 'vuejs'}
 	<Icons.Vuejs {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'php'}
+{:else if application.buildPack?.toLowerCase() === 'php'}
 	<Icons.Php {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'python'}
+{:else if application.buildPack?.toLowerCase() === 'python'}
 	<Icons.Python {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'static'}
+{:else if application.buildPack?.toLowerCase() === 'static'}
 	<Icons.Static {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'nestjs'}
+{:else if application.buildPack?.toLowerCase() === 'nestjs'}
 	<Icons.Nestjs {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'nuxtjs'}
+{:else if application.buildPack?.toLowerCase() === 'nuxtjs'}
 	<Icons.Nuxtjs {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'nextjs'}
+{:else if application.buildPack?.toLowerCase() === 'nextjs'}
 	<Icons.Nextjs {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'gatsby'}
+{:else if application.buildPack?.toLowerCase() === 'gatsby'}
 	<Icons.Gatsby {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'docker'}
+{:else if application.buildPack?.toLowerCase() === 'docker'}
 	<Icons.Docker {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'astro'}
+{:else if application.buildPack?.toLowerCase() === 'astro'}
 	<Icons.Astro {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'eleventy'}
+{:else if application.buildPack?.toLowerCase() === 'eleventy'}
 	<Icons.Eleventy {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'deno'}
+{:else if application.buildPack?.toLowerCase() === 'deno'}
 	<Icons.Deno {isAbsolute} />
-{:else if application.buildPack.toLowerCase() === 'laravel'}
+{:else if application.buildPack?.toLowerCase() === 'laravel'}
 	<Icons.Laravel {isAbsolute} />
 {/if}

apps/ui/src/routes/index.svelte

@@ -23,9 +23,9 @@
 	import { get, post } from '$lib/api';
 	import Usage from '$lib/components/Usage.svelte';
 	import { t } from '$lib/translations';
-	import { errorNotification } from '$lib/common';
+	import { errorNotification, asyncSleep } from '$lib/common';
 	import { addToast, appSession } from '$lib/store';
-
+ 
 	import ApplicationsIcons from '$lib/components/svg/applications/ApplicationIcons.svelte';
 	import DatabaseIcons from '$lib/components/svg/databases/DatabaseIcons.svelte';
 	import ServiceIcons from '$lib/components/svg/services/ServiceIcons.svelte';
@@ -37,8 +37,18 @@
 	export let applications: any;
 	export let databases: any;
 	export let services: any;
+    let numberOfGetStatus = 0;
+    
+    function getRndInteger(min, max) {
+        return Math.floor(Math.random() * (max - min + 1) ) + min;
+    }
+
 	async function getStatus(resources: any) {
+		while (numberOfGetStatus > 1){
+			await asyncSleep(getRndInteger(100,200));
+		}
 		try {
+            numberOfGetStatus++;
 			const { id, buildPack, dualCerts } = resources;
 			let isRunning = false;
 			if (buildPack) {
@@ -58,7 +68,9 @@
 			}
 		} catch (error) {
 			return 'Error';
-		}
+		} finally {
+            numberOfGetStatus--;
+        }
 	}
 	async function manuallyCleanupStorage() {
 		try {
@@ -82,7 +94,6 @@
 		>Cleanup Storage</button
 	>
 </div>
-
 <div class="mt-10 pb-12 tracking-tight sm:pb-16">
 	<div class="mx-auto px-10">
 		<div class="flex flex-col justify-center xl:flex-row">
@@ -113,7 +124,7 @@
 											Application
 										</div></td
 									>
-									<td>
+									<td class="flex justify-end">
 										{#if application.fqdn}
 											<a
 												href={application.fqdn}
@@ -189,7 +200,7 @@
 										</div>
 									</td>
 
-									<td>
+									<td class="flex justify-end">
 										{#if service.fqdn}
 											<a
 												href={service.fqdn}
@@ -263,7 +274,7 @@
 											Database
 										</div>
 									</td>
-									<td>
+									<td class="flex justify-end">
 										<a
 											href={`/databases/${database.id}`}
 											class="icons bg-transparent text-sm inline-flex ml-11"

package.json

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