From 175f146dee474e263acd37c4961451461a37e657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Wed, 18 Dec 2024 12:02:12 +0100
Subject: [PATCH] feature/Resolve merge issues

---
 components.d.ts                        | 2 +-
 server/controllers/StatusController.ts | 3 ++-
 src/views/APIServerStatusView.vue      | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index f61dde2..dc2ae4e 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
-/* prettier-ignore */
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
 export {}
 
+/* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
     ChatWidget: typeof import('./src/components/ChatWidget.vue')['default']
diff --git a/server/controllers/StatusController.ts b/server/controllers/StatusController.ts
index 5c2f786..5bc2133 100644
--- a/server/controllers/StatusController.ts
+++ b/server/controllers/StatusController.ts
@@ -65,7 +65,8 @@ export class StatusController {
       apiVersions,
       messageDocs,
       resourceDocs,
-      currentUser
+      currentUser,
+      commitId
     })
   }
 
diff --git a/src/views/APIServerStatusView.vue b/src/views/APIServerStatusView.vue
index b3fb830..55a43af 100644
--- a/src/views/APIServerStatusView.vue
+++ b/src/views/APIServerStatusView.vue
@@ -39,7 +39,7 @@ onBeforeMount(async () => {
 <template>
   <main>
     <div class="content">
-      <div v-for="(value, name, index) in status" :key="index" v-if="name !== 'commit_id'">
+      <div v-for="(value, name, index) in status" :key="index" v-if="name !== 'commitId'">
         <div v-if="name === 'status'" class="status">
           <el-icon v-if="value === true" style="vertical-align: middle; color: green; width: auto"
             ><SuccessFilled
@@ -47,7 +47,7 @@ onBeforeMount(async () => {
           <el-icon v-else style="vertical-align: middle; color: red"><RemoveFilled /></el-icon>
           <span class="main-status-label">{{ name }}</span>
         </div>
-        <div v-else-if="name !== 'commit_id'" class="sub-status">
+        <div v-else-if="name !== 'commitId'" class="sub-status">
           <span class="status-label">{{ name }}</span>
           &nbsp;&nbsp;&nbsp;<el-divider />&nbsp;&nbsp;&nbsp;
           <el-icon
@@ -61,7 +61,7 @@ onBeforeMount(async () => {
     </div>
   </main>
   <span>App Version: {{ version }}</span>
-  <span>Commit ID: {{ status.commit_id }}</span>
+  <span>Commit ID: {{ status.commitId }}</span>
 </template>
 
 <style scoped>