status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Surface peer info in nodes.show view (#13832)

This commit is contained in:
Michael Klein 2022-07-21 16:35:54 +02:00 committed by GitHub
parent 07f30687d5
commit b1a39fc12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/packages/consul-ui/app/components/consul/service/peer-info/index.hbs → ui/packages/consul-ui/app/components/consul/peer/info/index.hbs
View File

@ -1,5 +1,5 @@
{{#if @service.PeerName}} {{#if @item.PeerName}}
<div class="consul-service-peer-info" data-test-service-peer-info> <div class="consul-peer-info" data-test-peer-info>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" {{tooltip "Peer" }}> <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" {{tooltip "Peer" }}>
<path <path
@ -18,6 +18,6 @@
d="M11 7C10.4477 7 10 7.44772 10 8C10 8.55229 10.4477 9 11 9H11.01C11.5623 9 12.01 8.55229 12.01 8C12.01 7.44772 11.5623 7 11.01 7H11Z" d="M11 7C10.4477 7 10 7.44772 10 8C10 8.55229 10.4477 9 11 9H11.01C11.5623 9 12.01 8.55229 12.01 8C12.01 7.44772 11.5623 7 11.01 7H11Z"
fill="#77838A" /> fill="#77838A" />
</svg> </svg>
<span class="consul-service-peer-info__description">Imported from <span data-test-peer-name>{{@service.PeerName}}</span></span> <span class="consul-peer-info__description">Imported from <span data-test-peer-name>{{@item.PeerName}}</span></span>
</div> </div>
{{/if}} {{/if}}

4
ui/packages/consul-ui/app/components/consul/service/peer-info/index.scss → ui/packages/consul-ui/app/components/consul/peer/info/index.scss
View File

@ -1,4 +1,4 @@
.consul-service-peer-info { .consul-peer-info {
background: rgb(var(--gray-100)); background: rgb(var(--gray-100));
color: rgb(var(--gray-600)); color: rgb(var(--gray-600));
padding: 0px 8px; padding: 0px 8px;
@ -7,7 +7,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
.consul-service-peer-info__description { .consul-peer-info__description {
margin-left: 4px; margin-left: 4px;
} }
} }

2
ui/packages/consul-ui/app/styles/components.scss
View File

@ -107,5 +107,5 @@
@import 'consul-ui/components/consul/peer'; @import 'consul-ui/components/consul/peer';
@import 'consul-ui/components/peerings/badge'; @import 'consul-ui/components/peerings/badge';
@import 'consul-ui/components/consul/node/peer-info'; @import 'consul-ui/components/consul/node/peer-info';
@import 'consul-ui/components/consul/service/peer-info'; @import 'consul-ui/components/consul/peer/info';
@import 'consul-ui/components/consul/peer/form'; @import 'consul-ui/components/consul/peer/form';

1
ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
View File

@ -103,6 +103,7 @@ as |item tomography|}}
<route.Title @title={{item.Node}} /> <route.Title @title={{item.Node}} />
</h1> </h1>
<label for="toolbar-toggle"></label> <label for="toolbar-toggle"></label>
<Consul::Peer::Info @item={{item}} />
</BlockSlot> </BlockSlot>
<BlockSlot @name="nav"> <BlockSlot @name="nav">
<TabNav @items={{ <TabNav @items={{

2
ui/packages/consul-ui/app/templates/dc/services/show.hbs
View File

@ -145,7 +145,7 @@ as |items item dc|}}
</h1> </h1>
<Consul::ExternalSource @item={{item.Service}} @withInfo={{true}} /> <Consul::ExternalSource @item={{item.Service}} @withInfo={{true}} />
<Consul::Kind @item={{item.Service}} @withInfo={{true}} /> <Consul::Kind @item={{item.Service}} @withInfo={{true}} />
<Consul::Service::PeerInfo @service={{item.Service}} /> <Consul::Peer::Info @item={{item.Service}} />
</BlockSlot> </BlockSlot>
<BlockSlot @name="nav"> <BlockSlot @name="nav">
{{#if (not-eq item.Service.Kind 'mesh-gateway')}} {{#if (not-eq item.Service.Kind 'mesh-gateway')}}

2
ui/packages/consul-ui/tests/pages/dc/services/show.js
View File

@ -19,7 +19,7 @@ export default function(
metricsAnchor: { metricsAnchor: {
href: attribute('href', '[data-test-metrics-anchor]'), href: attribute('href', '[data-test-metrics-anchor]'),
}, },
peer: text('[data-test-service-peer-info] [data-test-peer-name]'), peer: text('[data-test-peer-info] [data-test-peer-name]'),
tabs: tabs('tab', [ tabs: tabs('tab', [
'topology', 'topology',
'instances', 'instances',