From 56e3c0884e307f9baf36305e1c8452a54b287e82 Mon Sep 17 00:00:00 2001 From: Jasmine W Date: Thu, 13 Oct 2022 13:45:03 -0400 Subject: [PATCH 1/3] UI: Copy changes for peering detail page --- .../consul-ui/app/components/peerings/provider/index.js | 2 +- ui/packages/consul-ui/translations/routes/en-us.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/packages/consul-ui/app/components/peerings/provider/index.js b/ui/packages/consul-ui/app/components/peerings/provider/index.js index 23bd99d9b1..b6f281cda9 100644 --- a/ui/packages/consul-ui/app/components/peerings/provider/index.js +++ b/ui/packages/consul-ui/app/components/peerings/provider/index.js @@ -33,7 +33,7 @@ export default class PeeringsProvider extends Component { ]; if (isReceiver) { - tabs = [...tabs, { label: 'Addresses', route: 'dc.peers.show.addresses' }]; + tabs = [...tabs, { label: 'Server Addresses', route: 'dc.peers.show.addresses' }]; } return tabs.map((tab) => new Tab({ ...tab, currentRouteName: router.currentRouteName, owner })); diff --git a/ui/packages/consul-ui/translations/routes/en-us.yaml b/ui/packages/consul-ui/translations/routes/en-us.yaml index 4e157d9dff..e8b134dfb4 100644 --- a/ui/packages/consul-ui/translations/routes/en-us.yaml +++ b/ui/packages/consul-ui/translations/routes/en-us.yaml @@ -141,10 +141,10 @@ dc: exported: count: | {count} exported services - tooltip: The number of services exported from {name} - tab-tooltip: Services exported from {name} + tooltip: The number of services exported to {name} + tab-tooltip: Services exported to {name} addresses: - tooltip: The number of services exported from {name} + tooltip: The number of services exported to {name} show: imported: empty: From 09513e7ef2c799ffa102200606c7d4c3ed84c462 Mon Sep 17 00:00:00 2001 From: Jasmine W Date: Thu, 13 Oct 2022 14:42:13 -0400 Subject: [PATCH 2/3] Update index.js --- ui/packages/consul-ui/tests/pages/dc/peers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/packages/consul-ui/tests/pages/dc/peers/index.js b/ui/packages/consul-ui/tests/pages/dc/peers/index.js index d60b3e41eb..27d1764665 100644 --- a/ui/packages/consul-ui/tests/pages/dc/peers/index.js +++ b/ui/packages/consul-ui/tests/pages/dc/peers/index.js @@ -5,6 +5,6 @@ export default function (visitable, creatable, items, popoverSelect) { visit: visitable('/:dc/peers'), peers: items(), sort: popoverSelect('[data-test-sort-control]'), - tabs: tabgroup('tab', ['imported-services', 'exported-services', 'addresses']), + tabs: tabgroup('tab', ['imported-services', 'exported-services', 'server-addresses']), }); } From 12a24a6d8c99190ffeda34d74378af6ac2a90e6b Mon Sep 17 00:00:00 2001 From: wenincode Date: Thu, 13 Oct 2022 13:06:11 -0600 Subject: [PATCH 3/3] Update peers show tests to look for serverAddresses tab --- .../consul-ui/tests/acceptance/dc/peers/show.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/packages/consul-ui/tests/acceptance/dc/peers/show.feature b/ui/packages/consul-ui/tests/acceptance/dc/peers/show.feature index 4fc7f74056..ee1297a03e 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/peers/show.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/peers/show.feature @@ -18,7 +18,7 @@ Feature: dc / peers / show: Peers show Then the url should be /dc-1/peers/a-peer/imported-services Then I see importedServicesIsVisible on the tabs And I see exportedServicesIsVisible on the tabs - And I don't see addressesIsVisible on the tabs + And I don't see serverAddressesIsVisible on the tabs Scenario: Receiver side tabs And 1 datacenter model with the value "dc-1" @@ -38,7 +38,7 @@ Feature: dc / peers / show: Peers show Then the url should be /dc-1/peers/a-peer/imported-services Then I see importedServicesIsVisible on the tabs And I see exportedServicesIsVisible on the tabs - And I see addressesIsVisible on the tabs + And I see serverAddressesIsVisible on the tabs Scenario: Imported Services Empty And 1 datacenter model with the value "dc-1" @@ -133,4 +133,4 @@ Feature: dc / peers / show: Peers show dc: dc-1 peer: a-peer --- - Then I don't see the "[data-test-addresses-empty]" element \ No newline at end of file + Then I don't see the "[data-test-addresses-empty]" element