(camel-karavan) branch main updated: Fix

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new a171e5e6 Fix
a171e5e6 is described below

commit a171e5e63e0a9e60eb983248660f80a7d45f50a0
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Thu Jun 6 15:11:23 2024 -0400

    Fix
---
 .../camel/karavan/{StartupLoader.java => KaravanStartupLoader.java} | 4 ++--
 .../src/main/java/org/apache/camel/karavan/api/AuthResource.java    | 6 +++---
 karavan-app/src/main/webui/src/project/DevModeToolbar.tsx           | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/StartupLoader.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
similarity index 98%
rename from 
karavan-app/src/main/java/org/apache/camel/karavan/StartupLoader.java
rename to 
karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
index bd6c8f30..a9b0dc86 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/StartupLoader.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
@@ -49,9 +49,9 @@ import static org.apache.camel.karavan.KaravanEvents.*;
 @Default
 @Readiness
 @ApplicationScoped
-public class StartupLoader implements HealthCheck {
+public class KaravanStartupLoader implements HealthCheck {
 
-    private static final Logger LOGGER = 
Logger.getLogger(StartupLoader.class.getName());
+    private static final Logger LOGGER = 
Logger.getLogger(KaravanStartupLoader.class.getName());
 
     @ConfigProperty(name = "karavan.environment")
     String environment;
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
index 8a158e5b..1561486c 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
@@ -20,7 +20,7 @@ import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.StartupLoader;
+import org.apache.camel.karavan.KaravanStartupLoader;
 import org.apache.camel.karavan.kubernetes.KubernetesStatusService;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -34,7 +34,7 @@ import java.util.*;
 public class AuthResource {
 
     @Inject
-    StartupLoader startupLoader;
+    KaravanStartupLoader karavanStartupLoader;
 
     @Inject
     KubernetesStatusService kubernetesStatusService;
@@ -102,7 +102,7 @@ public class AuthResource {
     public Response getConfiguration() throws Exception {
         List<HealthCheckResponse> list = List.of(
                 kubernetesStatusService.call(),
-                startupLoader.call()
+                karavanStartupLoader.call()
         );
         return Response.ok(Map.of(
                 "status", list.stream().allMatch(h -> 
Objects.equals(h.getStatus(), HealthCheckResponse.Status.UP)),
diff --git a/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx 
b/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
index 6cd7ac9a..8df9a64e 100644
--- a/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
+++ b/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
@@ -56,7 +56,8 @@ export function DevModeToolbar(props: Props) {
     const containerStatuses = containers.filter(c => c.projectId === 
project.projectId) || [];
 
     const containersProject = containerStatuses.filter(c => c.type === 
'project') || [];
-    const allRunning = containersProject.filter(c => c.state === 
'running').length === containersProject.length;
+    const allRunning = containersProject.length > 0
+        && (containersProject.filter(c => c.state === 'running').length === 
containersProject.length);
 
     const containerDevMode = containerStatuses.filter(c => c.type === 
'devmode').at(0);
     const commands = containerDevMode?.commands || ['run'];