Merge pull request #733 from coollabsio/next

v3.11.10

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.8';
+export const version = '3.11.10';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';

apps/api/src/routes/api/v1/services/handlers.ts

@@ -82,14 +82,18 @@ export async function getServiceStatus(request: FastifyRequest<OnlyId>) {
             if (containersArray.length > 0 && containersArray[0] !== '') {
                 const templates = await getTemplates();
                 let template = templates.find(t => t.type === service.type);
-                template = JSON.parse(JSON.stringify(template).replaceAll('$$id', service.id));
+                console.log(service.type)
+                const templateStr = JSON.stringify(template)
+                if (templateStr) {
+                    template = JSON.parse(templateStr.replaceAll('$$id', service.id));
+                }
                 for (const container of containersArray) {
                     let isRunning = false;
                     let isExited = false;
                     let isRestarting = false;
                     let isExcluded = false;
                     const containerObj = JSON.parse(container);
-                    const exclude = template.services[containerObj.Names]?.exclude;
+                    const exclude = template?.services[containerObj.Names]?.exclude;
                     if (exclude) {
                         payload[containerObj.Names] = {
                             status: {

apps/ui/src/lib/api.ts

@@ -11,7 +11,7 @@ export function getAPIUrl() {
 		return `https://${CODESANDBOX_HOST.replace(/\$PORT/, '3001')}`;
 	}
 	return dev
-		? 'http://localhost:3001'
+		? `http://${window.location.hostname}:3001`
 		: 'http://localhost:3000';
 }
 export function getWebhookUrl(type: string) {

apps/ui/src/lib/store.ts

@@ -3,7 +3,7 @@ import cuid from 'cuid';
 import Cookies from 'js-cookie';
 import { writable, readable, type Writable } from 'svelte/store';
 import { io as ioClient } from 'socket.io-client';
-const socket = ioClient(dev ? 'http://localhost:3001' : '/', { auth: { token: Cookies.get('token') }, autoConnect: false });
+const socket = ioClient(dev ? `http://${window.location.hostname}:3001` : '/', { auth: { token: Cookies.get('token') }, autoConnect: false });
 
 export const io = socket;
 interface AppSession {

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

@@ -67,17 +67,17 @@
 	};
 	let fqdnEl: any = null;
 	let forceSave = false;
-	let isPublicRepository = application.settings.isPublicRepository;
+	let isPublicRepository = application.settings?.isPublicRepository;
 	let apiUrl = application.gitSource.apiUrl;
 	let branch = application.branch;
 	let repository = application.repository;
-	let debug = application.settings.debug;
-	let previews = application.settings.previews;
-	let dualCerts = application.settings.dualCerts;
-	let isCustomSSL = application.settings.isCustomSSL;
-	let autodeploy = application.settings.autodeploy;
-	let isBot = application.settings.isBot;
-	let isDBBranching = application.settings.isDBBranching;
+	let debug = application.settings?.debug;
+	let previews = application.settings?.previews;
+	let dualCerts = application.settings?.dualCerts;
+	let isCustomSSL = application.settings?.isCustomSSL;
+	let autodeploy = application.settings?.autodeploy;
+	let isBot = application.settings?.isBot;
+	let isDBBranching = application.settings?.isDBBranching;
 	let htmlUrl = application.gitSource.htmlUrl;
 
 	let dockerComposeFile = JSON.parse(application.dockerComposeFile) || null;
@@ -575,13 +575,13 @@
 							<input
 								bind:this={fqdnEl}
 								class="w-full"
-								required={!application.settings.isBot}
+								required={!application.settings?.isBot}
 								readonly={isDisabled}
 								disabled={isDisabled}
 								name="fqdn"
 								id="fqdn"
-								class:border={!application.settings.isBot && !application.fqdn}
-								class:border-red-500={!application.settings.isBot && !application.fqdn}
+								class:border={!application.settings?.isBot && !application.fqdn}
+								class:border-red-500={!application.settings?.isBot && !application.fqdn}
 								bind:value={application.fqdn}
 								pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
 								placeholder="eg: https://coollabs.io"
@@ -720,7 +720,7 @@
 						</div>
 					{/if}
 					{#if $features.beta}
-						{#if !application.settings.isBot && !application.settings.isPublicRepository}
+						{#if !application.settings?.isBot && !application.settings?.isPublicRepository}
 							<div class="grid grid-cols-2 items-center">
 								<Setting
 									id="isDBBranching"

package.json

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