[camel-karavan] branch main updated: Fix spring-boot camel health response parser

[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 6a53d8c  Fix spring-boot camel health response parser
6a53d8c is described below

commit 6a53d8c867fc83f0923d7f593a4d669da1b48496
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Mon Dec 19 14:21:15 2022 -0500

    Fix spring-boot camel health response parser
---
 .../main/java/org/apache/camel/karavan/service/StatusService.java   | 6 +++---
 karavan-app/src/main/webui/src/projects/ProjectInfo.tsx             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
index eddd28f..78b9393 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
@@ -150,7 +150,7 @@ public class StatusService {
                             getSpringStatus(details, "consumer"),
                             getSpringStatus(details, "route"),
                             CamelStatus.Status.UNDEFINED,
-                            "N/A in SpringBoot",
+                            null,
                             environment
                     );
                 }
@@ -162,10 +162,9 @@ public class StatusService {
             return new CamelStatus(projectId, environment);
         }
     }
-
     private CamelStatus.Status getSpringStatus(JsonObject object, String name){
         try {
-            String res = object.getString("name");
+            String res = object.getString(name);
             if (res == null) {
                 Optional<String> fname = 
object.fieldNames().stream().filter(fn -> fn.startsWith(name)).findFirst();
                 if (fname.isPresent()) {
@@ -178,6 +177,7 @@ public class StatusService {
         }
     }
 
+
     private CamelStatus.Status getQuarkusStatus(List<JsonObject> checks, 
String name){
         try {
             JsonObject res = checks.stream().filter(o -> 
o.getString("name").equals(name)).findFirst().get();
diff --git a/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx 
b/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx
index bd76f0a..f845d52 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx
@@ -287,7 +287,7 @@ export class ProjectInfo extends React.Component<Props, 
State> {
         const contextStatus = status?.contextStatus;
         const contextVersion = status?.contextVersion;
         return (
-            <LabelGroup numLabels={5}>
+            <LabelGroup numLabels={4}>
                 {contextVersion &&
                     <Label icon={this.getStatusIcon(contextStatus)} 
color={this.getStatusColor(contextStatus)}>{contextVersion}</Label>}
                 <Label icon={this.getStatusIcon(contextStatus)} 
color={this.getStatusColor(contextStatus)}>Context</Label>