Skip to content

Commit

Permalink
Hardcode links to CCM to be false (#20730)
Browse files Browse the repository at this point in the history
Hardcode links to CCM to be false - due to CCM deprecation

Remove changelog item for breaking Ui change
 - since CCM linking no longer exists
  • Loading branch information
chris-hut authored Feb 26, 2024
1 parent fe8bbb3 commit 349cec1
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .changelog/20474.txt

This file was deleted.

3 changes: 2 additions & 1 deletion ui/packages/consul-ui/app/components/hcp-nav-item/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 2 additions & 1 deletion ui/packages/consul-ui/app/services/hcp-link-status.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 349cec1

Please sign in to comment.