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

ui: Replace proxy icon with mesh icon (#8804)

This commit is contained in:
John Cowen 2020-10-06 09:37:23 +01:00 committed by GitHub
parent 4c9630ffad
commit 76d3909f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-v2/app/components/consul-service-instance-list/index.hbs
View File

@ -21,14 +21,14 @@
<ConsulInstanceChecks @type="node" @items={{reject-by 'ServiceID' '' item.Checks}} /> <ConsulInstanceChecks @type="node" @items={{reject-by 'ServiceID' '' item.Checks}} />
{{/if}} {{/if}}
{{#if item.ProxyInstance}} {{#if item.ProxyInstance}}
<dl class="proxy"> <dl class="mesh">
<dt> <dt>
<Tooltip> <Tooltip>
Proxy This service uses a proxy for the Consul service mesh
</Tooltip> </Tooltip>
</dt> </dt>
<dd data-test-proxy> <dd data-test-mesh>
connected with proxy in service mesh with proxy
</dd> </dd>
</dl> </dl>
{{/if}} {{/if}}

4
ui-v2/app/routes/dc/services/show.js
View File

@ -29,6 +29,10 @@ export default Route.extend({
: hash({ : hash({
...model, ...model,
chain: this.data.source(uri => uri`/${nspace}/${dc}/discovery-chain/${params.name}`), chain: this.data.source(uri => uri`/${nspace}/${dc}/discovery-chain/${params.name}`),
// Whilst `proxies` isn't used anywhere in the show templates
// it provides a relationship of ProxyInstance on the ServiceInstance
// which can respond at a completely different blocking rate to
// the ServiceInstance itself
proxies: this.data.source( proxies: this.data.source(
uri => uri`/${nspace}/${dc}/proxies/for-service/${params.name}` uri => uri`/${nspace}/${dc}/proxies/for-service/${params.name}`
), ),