status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-09 21:35:52 +00:00
Code Issues Projects Releases Wiki Activity

ui: Add 'self-managed' badge when CONSUL_HCP_MANAGED_RUNTIME=self (#14496)

Browse Source
This commit is contained in:
John Cowen 2022-09-08 11:45:20 +01:00 committed by GitHub
parent efbdf3dbb5
commit e81f29f4b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs
View File

@ -58,6 +58,9 @@
{{else}} {{else}}
<div class="dc-name" data-test-datacenter-single> <div class="dc-name" data-test-datacenter-single>
{{@dcs.firstObject.Name}} {{@dcs.firstObject.Name}}
{{#if (env 'CONSUL_HCP_MANAGED_RUNTIME')}}
<span>Self-managed</span>
{{/if}}
</div> </div>
{{/if}} {{/if}}
</li> </li>

16
ui/packages/consul-ui/app/components/hashicorp-consul/index.scss
View File

@ -13,6 +13,17 @@
nav .dcs li.is-local span { nav .dcs li.is-local span {
@extend %menu-panel-badge; @extend %menu-panel-badge;
} }
nav .dcs .dc-name {
color: rgb(var(--tone-gray-600));
padding: 3.25px 0px;
font-weight: var(--typo-weight-semibold)
}
nav .dcs .dc-name span {
@extend %pill-200;
margin-left: 1rem;
background-color: rgb(var(--tone-gray-300));
color: rgb(var(--tone-gray-999));
}
nav li.partitions, nav li.partitions,
nav li.nspaces { nav li.nspaces {
@extend %main-nav-vertical-popover-menu; @extend %main-nav-vertical-popover-menu;
@ -50,11 +61,6 @@
top: 2px; top: 2px;
margin-left: 2px; margin-left: 2px;
} }
.dc-name {
color: rgb(var(--tone-gray-600));
padding: 3.25px 0px;
font-weight: var(--typo-weight-semibold)
}
} }
.hashicorp-consul { .hashicorp-consul {
@extend %hashicorp-consul; @extend %hashicorp-consul;

3
ui/packages/consul-ui/app/utils/get-environment.js
View File

@ -132,6 +132,8 @@ export default function(config = {}, win = window, doc = document) {
return operatorConfig.LocalDatacenter; return operatorConfig.LocalDatacenter;
case 'CONSUL_DATACENTER_PRIMARY': case 'CONSUL_DATACENTER_PRIMARY':
return operatorConfig.PrimaryDatacenter; return operatorConfig.PrimaryDatacenter;
case 'CONSUL_HCP_MANAGED_RUNTIME':
return operatorConfig.HCPManagedRuntime;
case 'CONSUL_API_PREFIX': case 'CONSUL_API_PREFIX':
// we want API prefix to look like an env var for if we ever change // we want API prefix to look like an env var for if we ever change
// operator config to be an API request, we need this variable before we // operator config to be an API request, we need this variable before we
@ -267,6 +269,7 @@ export default function(config = {}, win = window, doc = document) {
case 'CONSUL_UI_CONFIG': case 'CONSUL_UI_CONFIG':
case 'CONSUL_DATACENTER_LOCAL': case 'CONSUL_DATACENTER_LOCAL':
case 'CONSUL_DATACENTER_PRIMARY': case 'CONSUL_DATACENTER_PRIMARY':
case 'CONSUL_HCP_MANAGED_RUNTIME':
case 'CONSUL_API_PREFIX': case 'CONSUL_API_PREFIX':
case 'CONSUL_HCP_URL': case 'CONSUL_HCP_URL':
case 'CONSUL_ACLS_ENABLED': case 'CONSUL_ACLS_ENABLED':