fix(ui): display the right version

close #861 #844
tchiotludo · Oct 29, 2021 · c61c056 · c61c056
1 parent ab23675
commit c61c056
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/client/src/containers/SideBar/Sidebar.jsx b/client/src/containers/SideBar/Sidebar.jsx
@@ -230,7 +230,7 @@ class Sidebar extends Component {
       enableConnect
     } = this.state;
     const roles = this.state.roles || {};
-    const tag = 'Snapshot';
+    const tag = sessionStorage.getItem('version');
     const { listConnects, listClusters } = this.setClustersAndConnects();
     return (
       <SideNav

diff --git a/client/src/utils/Routes.js b/client/src/utils/Routes.js
@@ -79,6 +79,7 @@ class Routes extends Root {
   _setAuths(response) {
     if (response.status === 200) {
         sessionStorage.setItem('auths', JSON.stringify(response.data));
+        sessionStorage.setItem('version', response.data.version);
     }
   }
 

diff --git a/src/main/java/org/akhq/controllers/AkhqController.java b/src/main/java/org/akhq/controllers/AkhqController.java
@@ -18,6 +18,7 @@
 import lombok.NoArgsConstructor;
 import org.akhq.configs.*;
 import org.akhq.modules.HasAnyPermission;
+import org.akhq.utils.VersionProvider;
 
 import javax.inject.Inject;
 import java.util.ArrayList;
@@ -45,6 +46,8 @@ public class AkhqController extends AbstractController {
     @Nullable
     private HeaderAuth headerAuth;
 
+    @Inject
+    private VersionProvider versionProvider;
 
     @HasAnyPermission()
     @Get("api/cluster")
@@ -90,6 +93,7 @@ public AuthDefinition auths() {
                 authDefinition.loginEnabled = false;
             }
         }
+        authDefinition.version = versionProvider.getVersion();
 
         return authDefinition;
     }
@@ -176,6 +180,7 @@ public static class AuthDefinition {
         private boolean loginEnabled;
         private boolean formEnabled;
         private List<OidcAuth> oidcAuths;
+        private String version;
     }
 
     @AllArgsConstructor

diff --git a/src/main/java/org/akhq/utils/VersionProvider.java b/src/main/java/org/akhq/utils/VersionProvider.java
@@ -9,26 +9,45 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 @Singleton
 public class VersionProvider {
-
     @Getter
-    private String tag = "Snapshot";
+    private String version = "Snapshot";
 
     @Inject
     Environment environment;
 
     @PostConstruct
     public void start() {
-        new PropertiesPropertySourceLoader()
-                .load("classpath:git", environment)
-                .ifPresent(properties -> setTag(properties.get("git.tags")));
+        this.version = Stream
+            .concat(
+                new PropertiesPropertySourceLoader()
+                    .load("classpath:gradle", environment)
+                    .stream()
+                    .flatMap(properties -> Stream.of(properties.get("version"))),
+                new PropertiesPropertySourceLoader()
+                    .load("classpath:git", environment)
+                    .stream()
+                    .flatMap(properties -> Stream
+                        .of(
+                            properties.get("git.tags"),
+                            properties.get("git.branch")
+                        )
+                    )
+            )
+            .map(this::getVersion)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .findFirst()
+            .orElse(this.version);
     }
 
-    private void setTag(Object value) {
-        String candidate = Objects.toString(value, null);
-        this.tag = StringUtils.isNotEmpty(candidate) ? candidate : this.tag;
-    }
+    private Optional<String> getVersion(Object object) {
+        String candidate = Objects.toString(object, null);
 
+        return StringUtils.isNotEmpty(candidate) ? Optional.of(candidate) : Optional.empty();
+    }
 }