From 76d3909f30cf646683f938efb6676adf5fb0fc82 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Tue, 6 Oct 2020 09:37:23 +0100 Subject: [PATCH] ui: Replace proxy icon with mesh icon (#8804) --- .../app/components/consul-service-instance-list/index.hbs | 8 ++++---- ui-v2/app/routes/dc/services/show.js | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ui-v2/app/components/consul-service-instance-list/index.hbs b/ui-v2/app/components/consul-service-instance-list/index.hbs index 0785f3f6d0..55b0ee364a 100644 --- a/ui-v2/app/components/consul-service-instance-list/index.hbs +++ b/ui-v2/app/components/consul-service-instance-list/index.hbs @@ -21,14 +21,14 @@ {{/if}} {{#if item.ProxyInstance}} -
+
- Proxy + This service uses a proxy for the Consul service mesh
-
- connected with proxy +
+ in service mesh with proxy
{{/if}} diff --git a/ui-v2/app/routes/dc/services/show.js b/ui-v2/app/routes/dc/services/show.js index 5005684bd8..8265f7db3c 100644 --- a/ui-v2/app/routes/dc/services/show.js +++ b/ui-v2/app/routes/dc/services/show.js @@ -29,6 +29,10 @@ export default Route.extend({ : hash({ ...model, 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( uri => uri`/${nspace}/${dc}/proxies/for-service/${params.name}` ),