Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hardcode links to CCM to be false #20732

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Hardcode links to CCM to be false #20732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .changelog/20474.txt
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ui/packages/consul-ui/app/components/hcp-nav-item/index.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ui/packages/consul-ui/tests/integration/components/hcp-nav-item-test.js
View file
Open in desktop
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
Loading