Merge pull request #174 from BBMRI-ERIC/fix/version_display

Change the formatting of app version in the footer
BBMRI-ERIC · Mar 21, 2024 · 6ebdf2b · 6ebdf2b
2 parents 531fd4c + ea74895
commit 6ebdf2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
@@ -116,8 +116,8 @@
           <div class="col  text-center">
             <p>&copy; 2024 BBMRI-ERIC</p>
           </div>
-          <div class="col text-center ">
-            UI version: <span class="text-warning pe-2">{{ gitTag }}</span>Server version: <span class="text-warning">{{ backendVersion }}</span>
+          <div class="col text-center text-light ms-4">
+            UI: <span class="pe-2">{{ gitTag }}</span>Application: <span>v{{ backendVersion }}</span>
           </div>
           <div class="col text-center ms-5">
             Need help? <a href="mailto:negotiator@helpdesk.bbmri-eric.eu">Contact us</a>.

diff --git a/src/store/actions.js b/src/store/actions.js
@@ -9,7 +9,7 @@ const USER_PATH = `${BASE_API_PATH}/users`
 const USER_ROLES_PATH = `${BASE_API_PATH}/users/roles`
 const USER_RESOURCES_PATH = `${BASE_API_PATH}/users/resources`
 const ATTACHMENTS_PATH = `${BASE_API_PATH}/attachments`
-const BACKEND_VERSION_PATH = `${BASE_API_PATH}/actuator/info`
+const BACKEND_VERSION_PATH = "/api/actuator/info"
 
 function getBearerHeaders (token) {
   return { Authorization: `Bearer ${token}` }
@@ -35,7 +35,7 @@ export default {
   retrieveBackendVersion (store) {
     return axios.get(`${BACKEND_VERSION_PATH}`)
       .then((response) => {
-        return response.data.version
+        return response.data.build.version
       })
       .catch((error) => {
         if (error.response) {

diff --git a/src/views/HomePage.vue b/src/views/HomePage.vue
@@ -90,8 +90,8 @@
             href="https://github.com/BBMRI-ERIC/negotiator-v3-frontend"
           > GitHub</a>
         </div>
-        <div class="text-center ">
-          UI version: <span class="text-warning pe-2">{{ gitTag }}</span>Server version: <span class="text-warning">{{ backendVersion }}</span>
+        <div class="text-center text-light">
+          UI version: <span class="pe-2">{{ gitTag }}</span>Server version: <span>{{ backendVersion }}</span>
         </div>
         <div class="text-center text-primary-text mb-5">
           <p>&copy; 2024 BBMRI-ERIC</p>