From dae785fe3ee7dc0cd94cb2c156c50eee6ac5d59b Mon Sep 17 00:00:00 2001
From: Valeriia Ruban <valeriia.ruban@hashicorp.com>
Date: Tue, 21 Nov 2023 20:16:47 -0800
Subject: [PATCH] chore: add suffix to consul version in sidenav (#19711)

---
 .../consul-ui/app/components/hashicorp-consul/index.hbs     | 4 ++--
 .../consul-ui/app/components/hashicorp-consul/index.js      | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
index 485e54a55..55f4ad0e2 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
@@ -149,7 +149,7 @@
           <disclosure.Menu as |panel|>
             <panel.Menu as |menu|>
               <menu.Separator>
-                Consul v{{env 'CONSUL_VERSION'}}
+                Consul v{{this.consulVersion}}
               </menu.Separator>
               <menu.Item class='docs-link'>
                 <menu.Action @href={{env 'CONSUL_DOCS_URL'}} @external={{true}}>
@@ -199,7 +199,7 @@
 
   <:content-info>
     <p>
-      Consul v{{env 'CONSUL_VERSION'}}
+      Consul v{{this.consulVersion}}
     </p>
     {{{concat '<!-- ' (env 'CONSUL_GIT_SHA') '-->'}}}
   </:content-info>
diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.js b/ui/packages/consul-ui/app/components/hashicorp-consul/index.js
index 7046cccae..c23d96873 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.js
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.js
@@ -8,4 +8,10 @@ import { inject as service } from '@ember/service';
 
 export default class HashiCorpConsul extends Component {
   @service('flashMessages') flashMessages;
+  @service('env') env;
+
+  get consulVersion() {
+    const suffix = !['', 'oss'].includes(this.env.var('CONSUL_BINARY_TYPE')) ? '+ent' : '';
+    return `${this.env.var('CONSUL_VERSION')}${suffix}`;
+  }
 }