Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add suffix to consul version in sidenav #19711

Merged
merged 1 commit into from
Nov 22, 2023
Merged

chore: add suffix to consul version in sidenav #19711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}>
Expand Down Expand Up @@ -199,7 +199,7 @@

<:content-info>
<p>
Consul v{{env 'CONSUL_VERSION'}}
Consul v{{this.consulVersion}}
</p>
{{{concat '<!-- ' (env 'CONSUL_GIT_SHA') '-->'}}}
</:content-info>
Expand Down
6 changes: 6 additions & 0 deletions ui/packages/consul-ui/app/components/hashicorp-consul/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
}
}