From 20616363e92b48635288d877dc2765d2e5dc69d5 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Fri, 25 Oct 2024 00:39:34 -0600
Subject: [PATCH] refactor: update badge server

---
 .../[projectId]/services/application/[applicationId].tsx    | 6 ++++--
 .../project/[projectId]/services/compose/[composeId].tsx    | 6 ++++--
 .../project/[projectId]/services/mariadb/[mariadbId].tsx    | 6 ++++--
 .../project/[projectId]/services/mongo/[mongoId].tsx        | 6 ++++--
 .../project/[projectId]/services/mysql/[mysqlId].tsx        | 6 ++++--
 .../project/[projectId]/services/postgres/[postgresId].tsx  | 6 ++++--
 .../project/[projectId]/services/redis/[redisId].tsx        | 6 ++++--
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx
index 06470e058..156e1973a 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx
@@ -110,9 +110,11 @@ const Service = (
 						<div className="flex flex-row h-fit w-fit gap-2">
 							<Badge
 								variant={
-									data?.server?.serverStatus === "active"
+									!data?.serverId
 										? "default"
-										: "destructive"
+										: data?.server?.serverStatus === "active"
+											? "default"
+											: "destructive"
 								}
 							>
 								{data?.server?.name || "Dokploy Server"}
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
index fd2eb4433..60ddfeab1 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
@@ -105,9 +105,11 @@ const Service = (
 						<div className="flex flex-row h-fit w-fit gap-2">
 							<Badge
 								variant={
-									data?.server?.serverStatus === "active"
+									!data?.serverId
 										? "default"
-										: "destructive"
+										: data?.server?.serverStatus === "active"
+											? "default"
+											: "destructive"
 								}
 							>
 								{data?.server?.name || "Dokploy Server"}
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx
index 080f7c8dd..31e929764 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx
@@ -93,9 +93,11 @@ const Mariadb = (
 						<div className="flex flex-row h-fit w-fit gap-2">
 							<Badge
 								variant={
-									data?.server?.serverStatus === "active"
+									!data?.serverId
 										? "default"
-										: "destructive"
+										: data?.server?.serverStatus === "active"
+											? "default"
+											: "destructive"
 								}
 							>
 								{data?.server?.name || "Dokploy Server"}
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx
index 78af40fba..409d91291 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx
@@ -94,9 +94,11 @@ const Mongo = (
 						<div className="flex flex-row h-fit w-fit gap-2">
 							<Badge
 								variant={
-									data?.server?.serverStatus === "active"
+									!data?.serverId
 										? "default"
-										: "destructive"
+										: data?.server?.serverStatus === "active"
+											? "default"
+											: "destructive"
 								}
 							>
 								{data?.server?.name || "Dokploy Server"}
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx
index 726ac82ea..e69c5a357 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx
@@ -92,9 +92,11 @@ const MySql = (
 						<div className="flex flex-row h-fit w-fit gap-2">
 							<Badge
 								variant={
-									data?.server?.serverStatus === "active"
+									!data?.serverId
 										? "default"
-										: "destructive"
+										: data?.server?.serverStatus === "active"
+											? "default"
+											: "destructive"
 								}
 							>
 								{data?.server?.name || "Dokploy Server"}
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx
index 88c9f05e4..3e1e3ea8c 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx
@@ -93,9 +93,11 @@ const Postgresql = (
 						<div className="flex flex-row h-fit w-fit gap-2">
 							<Badge
 								variant={
-									data?.server?.serverStatus === "active"
+									!data?.serverId
 										? "default"
-										: "destructive"
+										: data?.server?.serverStatus === "active"
+											? "default"
+											: "destructive"
 								}
 							>
 								{data?.server?.name || "Dokploy Server"}
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx
index fa3ac92cb..b68baeabf 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx
@@ -92,9 +92,11 @@ const Redis = (
 						<div className="flex flex-row h-fit w-fit gap-2">
 							<Badge
 								variant={
-									data?.server?.serverStatus === "active"
+									!data?.serverId
 										? "default"
-										: "destructive"
+										: data?.server?.serverStatus === "active"
+											? "default"
+											: "destructive"
 								}
 							>
 								{data?.server?.name || "Dokploy Server"}