From 161f2407204832a8fea41fc103d256ec0a59b1a5 Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Fri, 1 Mar 2024 12:13:34 -0800 Subject: [PATCH] Hardcode links to CCM to be false - due to CCM deprecation (#20784) --- ui/packages/consul-ui/app/components/hcp-nav-item/index.js | 3 ++- ui/packages/consul-ui/app/services/hcp-link-status.js | 3 ++- ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js | 2 +- .../tests/integration/components/hcp-nav-item-test.js | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/packages/consul-ui/app/components/hcp-nav-item/index.js b/ui/packages/consul-ui/app/components/hcp-nav-item/index.js index 741de542de..b1fb989bec 100644 --- a/ui/packages/consul-ui/app/components/hcp-nav-item/index.js +++ b/ui/packages/consul-ui/app/components/hcp-nav-item/index.js @@ -41,7 +41,8 @@ export default class HcpLinkItemComponent extends Component { return false; } - return true; + // With the death of Consul Central, we don't want to display the link nav item + return false; } get shouldShowBackToHcpItem() { diff --git a/ui/packages/consul-ui/app/services/hcp-link-status.js b/ui/packages/consul-ui/app/services/hcp-link-status.js index eab9764585..e8d7c30653 100644 --- a/ui/packages/consul-ui/app/services/hcp-link-status.js +++ b/ui/packages/consul-ui/app/services/hcp-link-status.js @@ -14,7 +14,8 @@ export default class HcpLinkStatus extends Service { userDismissedBanner = false; get shouldDisplayBanner() { - return !this.userDismissedBanner && this.hasPermissionToLink; + // With the death of Consul Central, we don't want to display the link nav item + return false; } get hasPermissionToLink() { diff --git a/ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js b/ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js index 39d4cbc989..b9eb8263f8 100644 --- a/ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js +++ b/ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js @@ -12,7 +12,7 @@ const linkToHcpSelector = '[data-test-link-to-hcp]'; const linkToHcpBannerButtonSelector = '[data-test-link-to-hcp-banner-button]'; const linkToHcpModalSelector = '[data-test-link-to-hcp-modal]'; const linkToHcpModalCancelButtonSelector = '[data-test-link-to-hcp-modal-cancel-button]'; -module('Acceptance | link to hcp', function (hooks) { +module.skip('Acceptance | link to hcp', function (hooks) { setupApplicationTest(hooks); hooks.beforeEach(function () { diff --git a/ui/packages/consul-ui/tests/integration/components/hcp-nav-item-test.js b/ui/packages/consul-ui/tests/integration/components/hcp-nav-item-test.js index 32c784baf7..c3fcf93686 100644 --- a/ui/packages/consul-ui/tests/integration/components/hcp-nav-item-test.js +++ b/ui/packages/consul-ui/tests/integration/components/hcp-nav-item-test.js @@ -86,7 +86,7 @@ module('Integration | Component | hcp nav item', function (hooks) { }); }); - module('when rendered in self managed mode', function (hooks) { + module.skip('when rendered in self managed mode', function (hooks) { hooks.beforeEach(function () { this.owner.register( 'service:env',