From 616819957af6e7a1c02d57843eb456c4e0e10167 Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Mon, 11 Mar 2024 13:45:40 -0700 Subject: [PATCH 1/7] =?UTF-8?q?Revert=20"feat:=20add=20alert=20to=20link?= =?UTF-8?q?=20to=20hcp=20modal=20to=20ask=20a=20user=20refresh=20a=20page;?= =?UTF-8?q?=20up=E2=80=A6=20(#20682)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit dd833d9a3649402e23ced070121e0d0c131f610e. --- .../consul-ui/app/components/link-to-hcp-modal/index.hbs | 5 +---- .../consul-ui/app/components/link-to-hcp-modal/index.scss | 4 ---- .../tests/integration/components/link-to-hcp-modal-test.js | 6 ------ 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs index 623049fdf16f..312a16b7ffc7 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs +++ b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs @@ -20,7 +20,7 @@ |G|> Select cluster access mode before linking Control the level of access that HCP Consul Central has to your linked cluster. - Learn more @@ -89,9 +89,6 @@ {{/if}} {{/if}} - - After you link your cluster to HCP, close this modal and refresh the page. - diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss index 75af67613d42..9850cac56bfc 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss +++ b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss @@ -7,10 +7,6 @@ &__no-acls-alert { margin-bottom: 16px; } - &__refresh-page-alert { - margin-top: 16px; - margin-bottom: 8px; - } &__generate-token { display: flex; flex-direction: column; diff --git a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js index f7ed600d0e33..746317bfddc5 100644 --- a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js +++ b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js @@ -14,7 +14,6 @@ import { BlockingEventSource as RealEventSource } from 'consul-ui/utils/dom/even import { ACCESS_LEVEL } from 'consul-ui/components/link-to-hcp-modal'; const modalSelector = '[data-test-link-to-hcp-modal]'; -const modalRefreshPageAlertSelector = '[data-test-link-to-hcp-modal-refresh-page-alert]'; const modalNoACLsAlertSelector = '[data-test-link-to-hcp-modal-no-acls-alert]'; const modalOptionReadOnlySelector = '#accessMode-readonly'; const modalOptionReadOnlyErrorSelector = '[data-test-link-to-hcp-modal-access-level-options-error]'; @@ -89,7 +88,6 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { assert.dom(modalSelector).exists({ count: 1 }); assert.dom(`${modalSelector} ${modalNoACLsAlertSelector}`).doesNotExist(); - assert.dom(`${modalSelector} ${modalRefreshPageAlertSelector}`).isVisible(); // select read-only await click(`${modalSelector} ${modalOptionReadOnlySelector}`); @@ -188,8 +186,6 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { assert.dom(modalSelector).exists({ count: 1 }); assert.dom(`${modalSelector} ${modalNoACLsAlertSelector}`).doesNotExist(); - assert.dom(`${modalSelector} ${modalRefreshPageAlertSelector}`).isVisible(); - // select read-only await click(`${modalSelector} ${modalOptionReadOnlySelector}`); @@ -217,8 +213,6 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { assert.dom(modalSelector).exists({ count: 1 }); assert.dom(`${modalSelector} ${modalNoACLsAlertSelector}`).isVisible(); - assert.dom(`${modalSelector} ${modalRefreshPageAlertSelector}`).isVisible(); - // select read-only await click(`${modalSelector} ${modalOptionReadOnlySelector}`); From e18bc65775106eae527473045a1695f8d96aaa83 Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Mon, 11 Mar 2024 13:46:02 -0700 Subject: [PATCH 2/7] Revert "chor: change cluster name param to have datacenter.name as default value (#20644)" This reverts commit 8425cd0f9017f640cce711dc32e0fa0d136899d8. --- .../app/components/hcp-nav-item/index.js | 1 + .../components/link-to-hcp-banner/index.js | 1 + .../components/link-to-hcp-modal/index.hbs | 4 +-- .../app/components/link-to-hcp-modal/index.js | 18 +++++----- .../app/helpers/hcp-authentication-link.js | 15 ++++++-- .../consul-ui/app/services/hcp-link-modal.js | 6 +++- .../tests/acceptance/link-to-hcp-test.js | 11 ++++++ .../components/link-to-hcp-modal-test.js | 3 ++ .../helpers/hcp-authentication-link-test.js | 36 ++++++++++++++----- 9 files changed, 71 insertions(+), 24 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 b1fb989bec55..1bbc1c6c72c3 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 @@ -53,6 +53,7 @@ export default class HcpLinkItemComponent extends Component { @action onLinkToConsulCentral() { + this.hcpLinkModal.setResourceId(this.args.linkData?.resourceId); this.hcpLinkModal.show(); } } diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js index 22574aed52ab..3f96ac261f0e 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js +++ b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js @@ -22,6 +22,7 @@ export default class LinkToHcpBannerComponent extends Component { } @action onClusterLink() { + this.hcpLinkModal.setResourceId(this.args.linkData?.resourceId); this.hcpLinkModal.show(); } } diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs index 312a16b7ffc7..bdabe3b2e52e 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs +++ b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs @@ -45,7 +45,7 @@ {{#if (and this.isReadOnlyAccessLevelSelected (can "read acls") (can "create tokens"))}}
- {{#if (and globalReadonlyPolicy globalReadonlyPolicy.data)}} + {{#if globalReadonlyPolicy.data}}

Generate a read-only ACL token now (preferred) or copy an existing token’s secret ID

@@ -97,7 +97,7 @@ @icon="external-link" @iconPosition="trailing" data-test-link-to-hcp-modal-next-button - @href={{hcp-authentication-link @dc this.accessLevel}} + @href={{hcp-authentication-link this.hcpLinkModal.resourceId this.accessLevel}} /> 0; } + deactivateModal = () => { + this.hcpLinkModal.hide(); + }; + onGenerateTokenClicked = (policy) => { this.isGeneratingToken = true; let token = this.tokenRepo.create({ @@ -56,11 +54,11 @@ export default class LinkToHcpModalComponent extends Component { }; @action - onAccessModeChanged({ target }) { - this.accessLevel = target.value; + onCancel() { + this.deactivateModal(); } @action - deactivateModal() { - this.hideModal(); + onAccessModeChanged({ target }) { + this.accessLevel = target.value; } } diff --git a/ui/packages/consul-ui/app/helpers/hcp-authentication-link.js b/ui/packages/consul-ui/app/helpers/hcp-authentication-link.js index c72c6b13408b..08bc205e74da 100644 --- a/ui/packages/consul-ui/app/helpers/hcp-authentication-link.js +++ b/ui/packages/consul-ui/app/helpers/hcp-authentication-link.js @@ -7,6 +7,10 @@ import Helper from '@ember/component/helper'; import { inject as service } from '@ember/service'; /** + * A resourceId Looks like: + * organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api + * organization/${organizationId}/project/${projectId}/hashicorp.consul.global-network-manager.cluster/${clusterName} + * * A HCP URL looks like: * https://portal.cloud.hashicorp.com/services/consul/clusters/self-managed/link-existing?cluster_name=test-from-api&cluster_version=1.18.0&cluster_access_mode=CONSUL_ACCESS_LEVEL_GLOBAL_READ_WRITE&redirect_url=localhost:8500/services */ @@ -14,12 +18,17 @@ export const HCP_PREFIX = 'https://portal.cloud.hashicorp.com/services/consul/clusters/self-managed/link-existing'; export default class hcpAuthenticationLink extends Helper { @service('env') env; - compute([datacenterName, accessMode]) { + compute([resourceId, accessMode], hash) { let url = new URL(HCP_PREFIX); const clusterVersion = this.env.var('CONSUL_VERSION'); - if (datacenterName) { - url.searchParams.append('cluster_name', datacenterName); + // if resourceId is empty, we still might want the user to get to the HCP sign-in page + if (resourceId) { + // Array looks like: ["organization", organizationId, "project", projectId, "hashicorp.consul.global-network-manager.cluster", "Cluster Id"] + const [, , , , , clusterName] = resourceId.split('/'); + if (clusterName) { + url.searchParams.append('cluster_name', clusterName); + } } if (clusterVersion) { diff --git a/ui/packages/consul-ui/app/services/hcp-link-modal.js b/ui/packages/consul-ui/app/services/hcp-link-modal.js index a88ef5434481..3938fa465503 100644 --- a/ui/packages/consul-ui/app/services/hcp-link-modal.js +++ b/ui/packages/consul-ui/app/services/hcp-link-modal.js @@ -8,12 +8,16 @@ import { tracked } from '@glimmer/tracking'; export default class HcpLinkModalService extends Service { @tracked isModalVisible = false; + @tracked resourceId = null; - show() { + show(hcpLinkData) { this.isModalVisible = true; } hide() { this.isModalVisible = false; } + setResourceId(resourceId) { + this.resourceId = resourceId; + } } 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 b9eb8263f8b3..f3ce6de73a03 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 @@ -6,6 +6,7 @@ import { module, test } from 'qunit'; import { click, visit } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; +import HcpLinkModalService from 'consul-ui/services/hcp-link-modal'; const bannerSelector = '[data-test-link-to-hcp-banner]'; const linkToHcpSelector = '[data-test-link-to-hcp]'; @@ -14,10 +15,20 @@ const linkToHcpModalSelector = '[data-test-link-to-hcp-modal]'; const linkToHcpModalCancelButtonSelector = '[data-test-link-to-hcp-modal-cancel-button]'; module.skip('Acceptance | link to hcp', function (hooks) { setupApplicationTest(hooks); + const correctResourceId = + 'organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api'; hooks.beforeEach(function () { // clear local storage so we don't have any settings window.localStorage.clear(); + this.owner.register( + 'service:hcp-link-modal', + class extends HcpLinkModalService { + setResourceId(resourceId) { + super.setResourceId(correctResourceId); + } + } + ); }); test('the banner and nav item are initially displayed on services page', async function (assert) { diff --git a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js index 746317bfddc5..f71c183f5fec 100644 --- a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js +++ b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js @@ -27,6 +27,8 @@ const modalGenerateTokenMissedPolicyAlertSelector = '[data-test-link-to-hcp-modal-missed-policy-alert]'; const modalNextButtonSelector = '[data-test-link-to-hcp-modal-next-button]'; const modalCancelButtonSelector = '[data-test-link-to-hcp-modal-cancel-button]'; +const resourceId = + 'organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api'; module('Integration | Component | link-to-hcp-modal', function (hooks) { let originalClipboardWriteText; @@ -69,6 +71,7 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { this.owner.register( 'service:hcp-link-modal', class Stub extends Service { + resourceId = resourceId; hide = hideModal; } ); diff --git a/ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js b/ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js index 335217836441..f089b209341c 100644 --- a/ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js +++ b/ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js @@ -10,9 +10,12 @@ import { setupRenderingTest } from 'ember-qunit'; import { HCP_PREFIX } from 'consul-ui/helpers/hcp-authentication-link'; import { EnvStub } from 'consul-ui/services/env'; +// organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api const clusterName = 'hello'; const clusterVersion = '1.18.0'; const accessMode = 'CONSUL_ACCESS_LEVEL_GLOBAL_READ_WRITE'; +const projectId = '4b09958c-fa91-43ab-8029-eb28d8cee9d4'; +const realResourceId = `organization/b4432207-bb9c-438e-a160-b98923efa979/project/${projectId}/hashicorp.consul.global-network-manager.cluster/${clusterName}`; module('Integration | Helper | hcp-authentication-link', function (hooks) { setupRenderingTest(hooks); hooks.beforeEach(function () { @@ -26,9 +29,9 @@ module('Integration | Helper | hcp-authentication-link', function (hooks) { ); }); test('it makes a URL out of a real resourceId', async function (assert) { - this.dcName = clusterName; + this.resourceId = realResourceId; - await render(hbs`{{hcp-authentication-link dcName}}`); + await render(hbs`{{hcp-authentication-link resourceId}}`); assert.equal( this.element.textContent.trim(), @@ -36,21 +39,38 @@ module('Integration | Helper | hcp-authentication-link', function (hooks) { ); }); - test('it returns correct link without dc name', async function (assert) { - this.dcName = null; + test('it returns correct link with invalid resourceId', async function (assert) { + this.resourceId = 'invalid'; - await render(hbs`{{hcp-authentication-link dcName}}`); + await render(hbs`{{hcp-authentication-link resourceId}}`); + assert.equal( + this.element.textContent.trim(), + `${HCP_PREFIX}?cluster_version=${clusterVersion}` + ); + + // not enough items in id + this.resourceId = + '`organization/b4432207-bb9c-438e-a160-b98923efa979/project/${projectId}/hashicorp.consul.global-network-manager.cluster`'; + await render(hbs`{{hcp-authentication-link resourceId}}`); + assert.equal( + this.element.textContent.trim(), + `${HCP_PREFIX}?cluster_version=${clusterVersion}` + ); + + // value is null + this.resourceId = null; + await render(hbs`{{hcp-authentication-link resourceId}}`); assert.equal( this.element.textContent.trim(), `${HCP_PREFIX}?cluster_version=${clusterVersion}` ); }); - test('it makes a URL out of a dc name and accessLevel, if passed', async function (assert) { - this.dcName = clusterName; + test('it makes a URL out of a real resourceId and accessLevel, if passed', async function (assert) { + this.resourceId = realResourceId; this.accessMode = accessMode; - await render(hbs`{{hcp-authentication-link dcName accessMode}}`); + await render(hbs`{{hcp-authentication-link resourceId accessMode}}`); assert.equal( this.element.textContent.trim(), From c6ce1c995dd1054407f6301c00359cddeec5da65 Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Mon, 11 Mar 2024 13:46:20 -0700 Subject: [PATCH 3/7] =?UTF-8?q?Revert=20"chor:=20adds=20informative=20erro?= =?UTF-8?q?r=20message=20when=20acls=20disabled=20and=20read-only=E2=80=A6?= =?UTF-8?q?=20(#20600)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9d712ccfc7a67193423f1a102ac2b9d3c6dc3733. --- .../components/link-to-hcp-modal/index.hbs | 11 +----- .../components/link-to-hcp-modal/index.scss | 3 -- .../components/link-to-hcp-modal-test.js | 35 ------------------- 3 files changed, 1 insertion(+), 48 deletions(-) diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs index bdabe3b2e52e..bd29b2423fb9 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs +++ b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs @@ -10,12 +10,6 @@ Link to HCP Consul Central - {{#if (not (can "read acls"))}} - - ACLs are disabled on this cluster. - The cluster can only be linked with read/write access. - - {{/if}} Select cluster access mode before linking @@ -39,11 +33,8 @@ with the “builtin/global-read-only” policy in the next step. - {{#if (and this.isReadOnlyAccessLevelSelected (not (can "read acls")))}} - ACLs are disabled on this cluster and are required for read-only access. - {{/if}} - {{#if (and this.isReadOnlyAccessLevelSelected (can "read acls") (can "create tokens"))}} + {{#if (and this.isReadOnlyAccessLevelSelected (can "create tokens"))}}
{{#if globalReadonlyPolicy.data}}

diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss index 9850cac56bfc..f28aa8ecde57 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss +++ b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss @@ -4,9 +4,6 @@ */ .link-to-hcp-modal { - &__no-acls-alert { - margin-bottom: 16px; - } &__generate-token { display: flex; flex-direction: column; diff --git a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js index f71c183f5fec..1aee8c7cbe22 100644 --- a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js +++ b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js @@ -14,9 +14,7 @@ import { BlockingEventSource as RealEventSource } from 'consul-ui/utils/dom/even import { ACCESS_LEVEL } from 'consul-ui/components/link-to-hcp-modal'; const modalSelector = '[data-test-link-to-hcp-modal]'; -const modalNoACLsAlertSelector = '[data-test-link-to-hcp-modal-no-acls-alert]'; const modalOptionReadOnlySelector = '#accessMode-readonly'; -const modalOptionReadOnlyErrorSelector = '[data-test-link-to-hcp-modal-access-level-options-error]'; const modalGenerateTokenCardSelector = '[data-test-link-to-hcp-modal-generate-token-card]'; const modalGenerateTokenCardValueSelector = '[data-test-link-to-hcp-modal-generate-token-card-value]'; @@ -62,9 +60,6 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { if (permission === 'create tokens') { return true; } - if (permission === 'read acls') { - return true; - } } } ); @@ -90,8 +85,6 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { @partition="-" />`); assert.dom(modalSelector).exists({ count: 1 }); - assert.dom(`${modalSelector} ${modalNoACLsAlertSelector}`).doesNotExist(); - // select read-only await click(`${modalSelector} ${modalOptionReadOnlySelector}`); @@ -188,7 +181,6 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { @partition="-" />`); assert.dom(modalSelector).exists({ count: 1 }); - assert.dom(`${modalSelector} ${modalNoACLsAlertSelector}`).doesNotExist(); // select read-only await click(`${modalSelector} ${modalOptionReadOnlySelector}`); @@ -197,31 +189,4 @@ module('Integration | Component | link-to-hcp-modal', function (hooks) { // Missed policy alert is visible assert.dom(`${modalSelector} ${modalGenerateTokenMissedPolicyAlertSelector}`).isVisible(); }); - - test('it shows an error wher read-only selected and acls are disabled', async function (assert) { - this.owner.register( - 'service:abilities', - class Stub extends Service { - can(permission) { - if (permission === 'read acls') { - return false; - } - } - } - ); - - await render(hbs``); - - assert.dom(modalSelector).exists({ count: 1 }); - assert.dom(`${modalSelector} ${modalNoACLsAlertSelector}`).isVisible(); - // select read-only - await click(`${modalSelector} ${modalOptionReadOnlySelector}`); - - // when read-only selected and no policy, it doesn't show the generate token button - assert.dom(`${modalSelector} ${modalGenerateTokenButtonSelector}`).doesNotExist(); - // No acls enabled error is presented - assert.dom(`${modalSelector} ${modalOptionReadOnlyErrorSelector}`).isVisible(); - }); }); From 523ebdd35bd2e5612c2aa2a099f598d68375505e Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Mon, 11 Mar 2024 13:47:22 -0700 Subject: [PATCH 4/7] Revert "Cc 7147 link to hcp modal (#20474)" This reverts commit 8c05e57ac1fdc27ea74040e2dfc35192ac6d067b. --- .../app/components/hcp-nav-item/index.js | 4 +- .../components/link-to-hcp-banner/index.js | 4 +- .../components/link-to-hcp-modal/index.hbs | 100 --------- .../app/components/link-to-hcp-modal/index.js | 64 ------ .../components/link-to-hcp-modal/index.scss | 26 --- .../consul-ui/app/controllers/application.js | 1 - .../app/helpers/hcp-authentication-link.js | 43 ---- .../consul-ui/app/services/hcp-link-modal.js | 23 --- .../consul-ui/app/styles/components.scss | 1 - .../consul-ui/app/templates/application.hbs | 75 ++++--- .../tests/acceptance/link-to-hcp-test.js | 39 +--- .../components/link-to-hcp-modal-test.js | 192 ------------------ .../helpers/hcp-authentication-link-test.js | 80 -------- 13 files changed, 39 insertions(+), 613 deletions(-) delete mode 100644 ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs delete mode 100644 ui/packages/consul-ui/app/components/link-to-hcp-modal/index.js delete mode 100644 ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss delete mode 100644 ui/packages/consul-ui/app/helpers/hcp-authentication-link.js delete mode 100644 ui/packages/consul-ui/app/services/hcp-link-modal.js delete mode 100644 ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js delete mode 100644 ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js 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 1bbc1c6c72c3..996d906957df 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 @@ -14,7 +14,6 @@ import { action } from '@ember/object'; export default class HcpLinkItemComponent extends Component { @service env; @service('hcp-link-status') hcpLinkStatus; - @service('hcp-link-modal') hcpLinkModal; get alreadyLinked() { return this.args.linkData?.isLinked; @@ -53,7 +52,6 @@ export default class HcpLinkItemComponent extends Component { @action onLinkToConsulCentral() { - this.hcpLinkModal.setResourceId(this.args.linkData?.resourceId); - this.hcpLinkModal.show(); + // TODO: https://hashicorp.atlassian.net/browse/CC-7147 open the modal } } diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js index 3f96ac261f0e..9416cfbafbbe 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js +++ b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js @@ -9,7 +9,6 @@ import { inject as service } from '@ember/service'; export default class LinkToHcpBannerComponent extends Component { @service('hcp-link-status') hcpLinkStatus; - @service('hcp-link-modal') hcpLinkModal; @service('env') env; get notLinked() { @@ -22,7 +21,6 @@ export default class LinkToHcpBannerComponent extends Component { } @action onClusterLink() { - this.hcpLinkModal.setResourceId(this.args.linkData?.resourceId); - this.hcpLinkModal.show(); + // TODO: CC-7147: Open simplified modal } } diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs deleted file mode 100644 index bd29b2423fb9..000000000000 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.hbs +++ /dev/null @@ -1,100 +0,0 @@ -{{! - Copyright (c) HashiCorp, Inc. - SPDX-License-Identifier: BUSL-1.1 -}} - - - - Link to HCP Consul Central - - - - Select cluster access mode before linking - Control the level of access that HCP Consul Central has to your linked cluster. - Learn more - - - - Read/write - HCP Consul Central can perform write operations on your cluster (i.e. cluster peering). - - - - Read-only - HCP Consul Central can only read information from your cluster. Read-only requires an ACL token - with the “builtin/global-read-only” policy in the next step. - - - - {{#if (and this.isReadOnlyAccessLevelSelected (can "create tokens"))}} -

- {{#if globalReadonlyPolicy.data}} -

- Generate a read-only ACL token now (preferred) or copy an existing token’s secret ID -

- {{#if this.isTokenGenerated}} - -
-

Token secret ID

-

- {{this.token}} -

-
- - - - {{else}} -
- -
- {{/if}} - - {{else}} - - Could not generate token. - - {{/if}} -
- {{/if}} - - - - - - - - - \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.js b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.js deleted file mode 100644 index a7be3b3ddf5b..000000000000 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.js +++ /dev/null @@ -1,64 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import Component from '@glimmer/component'; -import { tracked } from '@glimmer/tracking'; -import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; - -export const ACCESS_LEVEL = { - GLOBALREADONLY: 'CONSUL_ACCESS_LEVEL_GLOBAL_READ_ONLY', - GLOBALREADWRITE: 'CONSUL_ACCESS_LEVEL_GLOBAL_READ_WRITE', -}; - -export default class LinkToHcpModalComponent extends Component { - @service('repository/token') tokenRepo; - @service('repository/policy') policyRepo; - @service('hcp-link-modal') hcpLinkModal; - @service('router') router; - - @tracked - token = ''; - @tracked - accessLevel = ACCESS_LEVEL.GLOBALREADWRITE; - @tracked - isGeneratingToken = false; - AccessLevel = ACCESS_LEVEL; - - get isReadOnlyAccessLevelSelected() { - return this.accessLevel === this.AccessLevel.GLOBALREADONLY; - } - - get isTokenGenerated() { - return this.token && this.token.length > 0; - } - - deactivateModal = () => { - this.hcpLinkModal.hide(); - }; - - onGenerateTokenClicked = (policy) => { - this.isGeneratingToken = true; - let token = this.tokenRepo.create({ - Datacenter: this.args.dc, - Partition: this.args.partition, - Namespace: this.args.nspace, - Policies: [policy.data], - }); - this.tokenRepo.persist(token, event).then((token) => { - this.token = token.SecretID; - this.isGeneratingToken = false; - }); - }; - - @action - onCancel() { - this.deactivateModal(); - } - @action - onAccessModeChanged({ target }) { - this.accessLevel = target.value; - } -} diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss b/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss deleted file mode 100644 index f28aa8ecde57..000000000000 --- a/ui/packages/consul-ui/app/components/link-to-hcp-modal/index.scss +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -.link-to-hcp-modal { - &__generate-token { - display: flex; - flex-direction: column; - gap: 16px; - margin-top: 8px; - - &__copy-card { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: start; - gap: 10px; - padding: 16px 24px; - - &__token { - margin-top: 8px; - } - } - } -} diff --git a/ui/packages/consul-ui/app/controllers/application.js b/ui/packages/consul-ui/app/controllers/application.js index fe67622a5c99..9180761dcd99 100644 --- a/ui/packages/consul-ui/app/controllers/application.js +++ b/ui/packages/consul-ui/app/controllers/application.js @@ -13,7 +13,6 @@ export default class ApplicationController extends Controller { @service('router') router; @service('store') store; @service('feedback') feedback; - @service('hcp-link-modal') hcpLinkModal; // TODO: We currently do this in the controller instead of the router // as the nspace and dc variables aren't available directly on the Route diff --git a/ui/packages/consul-ui/app/helpers/hcp-authentication-link.js b/ui/packages/consul-ui/app/helpers/hcp-authentication-link.js deleted file mode 100644 index 08bc205e74da..000000000000 --- a/ui/packages/consul-ui/app/helpers/hcp-authentication-link.js +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import Helper from '@ember/component/helper'; -import { inject as service } from '@ember/service'; - -/** - * A resourceId Looks like: - * organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api - * organization/${organizationId}/project/${projectId}/hashicorp.consul.global-network-manager.cluster/${clusterName} - * - * A HCP URL looks like: - * https://portal.cloud.hashicorp.com/services/consul/clusters/self-managed/link-existing?cluster_name=test-from-api&cluster_version=1.18.0&cluster_access_mode=CONSUL_ACCESS_LEVEL_GLOBAL_READ_WRITE&redirect_url=localhost:8500/services - */ -export const HCP_PREFIX = - 'https://portal.cloud.hashicorp.com/services/consul/clusters/self-managed/link-existing'; -export default class hcpAuthenticationLink extends Helper { - @service('env') env; - compute([resourceId, accessMode], hash) { - let url = new URL(HCP_PREFIX); - const clusterVersion = this.env.var('CONSUL_VERSION'); - - // if resourceId is empty, we still might want the user to get to the HCP sign-in page - if (resourceId) { - // Array looks like: ["organization", organizationId, "project", projectId, "hashicorp.consul.global-network-manager.cluster", "Cluster Id"] - const [, , , , , clusterName] = resourceId.split('/'); - if (clusterName) { - url.searchParams.append('cluster_name', clusterName); - } - } - - if (clusterVersion) { - url.searchParams.append('cluster_version', clusterVersion); - } - if (accessMode) { - url.searchParams.append('cluster_access_mode', accessMode); - } - - return url.toString(); - } -} diff --git a/ui/packages/consul-ui/app/services/hcp-link-modal.js b/ui/packages/consul-ui/app/services/hcp-link-modal.js deleted file mode 100644 index 3938fa465503..000000000000 --- a/ui/packages/consul-ui/app/services/hcp-link-modal.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import Service from '@ember/service'; -import { tracked } from '@glimmer/tracking'; - -export default class HcpLinkModalService extends Service { - @tracked isModalVisible = false; - @tracked resourceId = null; - - show(hcpLinkData) { - this.isModalVisible = true; - } - - hide() { - this.isModalVisible = false; - } - setResourceId(resourceId) { - this.resourceId = resourceId; - } -} diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss index 104092c9a15b..f4baa2ca74a4 100644 --- a/ui/packages/consul-ui/app/styles/components.scss +++ b/ui/packages/consul-ui/app/styles/components.scss @@ -74,7 +74,6 @@ @import 'consul-ui/components/tab-nav'; @import 'consul-ui/components/search-bar'; @import 'consul-ui/components/copyable-code'; -@import 'consul-ui/components/link-to-hcp-modal'; @import 'consul-ui/components/consul/loader'; @import 'consul-ui/components/consul/tomography/graph'; diff --git a/ui/packages/consul-ui/app/templates/application.hbs b/ui/packages/consul-ui/app/templates/application.hbs index 3ad3ca2d5ceb..b0c9054ce631 100644 --- a/ui/packages/consul-ui/app/templates/application.hbs +++ b/ui/packages/consul-ui/app/templates/application.hbs @@ -93,50 +93,47 @@ as |dc dcs| }} {{#if (and (gt dc.Name.length 0) dcs)}} - {{#if this.hcpLinkModal.isModalVisible}} - - {{/if}} - {{! figure out our current DC and convert it to a model }} - - {{#if dc.data}} + {{! figure out our current DC and convert it to a model }} + + {{#if dc.data}} + id='wrapper' + @dcs={{dcs}} + @dc={{dc.data}} + @partition={{partition}} + @nspace={{nspace}} + @user={{hash token=token}} + @onchange={{action 'reauthorize'}} + as |consul| + > - {{#if error}} - {{! If we got an error from anything, show an error page }} - - {{else}} - {{! Otherwise show the rest of the app}} - - {{outlet}} - + {{#if error}} + {{! If we got an error from anything, show an error page }} + + {{else}} + {{! Otherwise show the rest of the app}} + + {{outlet}} + - {{! loading component for when we need it}} - - {{/if}} + {{! loading component for when we need it}} + + {{/if}} - - {{/if}} - + + {{/if}} + {{/if}} {{/let}} 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 f3ce6de73a03..32533046108d 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 @@ -6,29 +6,15 @@ import { module, test } from 'qunit'; import { click, visit } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; -import HcpLinkModalService from 'consul-ui/services/hcp-link-modal'; const bannerSelector = '[data-test-link-to-hcp-banner]'; 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.skip('Acceptance | link to hcp', function (hooks) { +module('Acceptance | link to hcp', function (hooks) { setupApplicationTest(hooks); - const correctResourceId = - 'organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api'; hooks.beforeEach(function () { // clear local storage so we don't have any settings window.localStorage.clear(); - this.owner.register( - 'service:hcp-link-modal', - class extends HcpLinkModalService { - setResourceId(resourceId) { - super.setResourceId(correctResourceId); - } - } - ); }); test('the banner and nav item are initially displayed on services page', async function (assert) { @@ -49,27 +35,4 @@ module.skip('Acceptance | link to hcp', function (hooks) { // link to HCP nav item still there assert.dom(linkToHcpSelector).isVisible('Link to HCP nav item is visible by default'); }); - - test('the link to hcp modal window appears when trigger from side-nav item and from banner', async function (assert) { - // default route is services page so we're good here - await visit('/'); - // Expect the banner to be visible by default - assert.dom(bannerSelector).isVisible('Banner is visible by default'); - // expect linkToHCP nav item to be visible as well - assert.dom(linkToHcpSelector).isVisible('Link to HCP nav item is visible by default'); - // Click on the link to HCP banner button - await click(`${bannerSelector} ${linkToHcpBannerButtonSelector}`); - - // link to HCP modal appears - assert.dom(linkToHcpModalSelector).isVisible('Link to HCP modal is visible'); - // Click on the cancel button - await click(`${linkToHcpModalSelector} ${linkToHcpModalCancelButtonSelector}`); - assert.dom(linkToHcpModalSelector).doesNotExist('Link to HCP modal is gone after cancel'); - - // Click on the link to HCP nav item - await click(`${linkToHcpSelector} button`); - - // link to HCP modal appears - assert.dom(linkToHcpModalSelector).isVisible('Link to HCP modal is visible'); - }); }); diff --git a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js deleted file mode 100644 index 1aee8c7cbe22..000000000000 --- a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-modal-test.js +++ /dev/null @@ -1,192 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import { module, test } from 'qunit'; -import { setupRenderingTest } from 'ember-qunit'; -import { click, render } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; -import Service, { inject as service } from '@ember/service'; -import DataSourceComponent from 'consul-ui/components/data-source/index'; -import sinon from 'sinon'; -import { BlockingEventSource as RealEventSource } from 'consul-ui/utils/dom/event-source'; -import { ACCESS_LEVEL } from 'consul-ui/components/link-to-hcp-modal'; - -const modalSelector = '[data-test-link-to-hcp-modal]'; -const modalOptionReadOnlySelector = '#accessMode-readonly'; -const modalGenerateTokenCardSelector = '[data-test-link-to-hcp-modal-generate-token-card]'; -const modalGenerateTokenCardValueSelector = - '[data-test-link-to-hcp-modal-generate-token-card-value]'; -const modalGenerateTokenCardCopyButtonSelector = - '[data-test-link-to-hcp-modal-generate-token-card-copy-button]'; -const modalGenerateTokenButtonSelector = '[data-test-link-to-hcp-modal-generate-token-button]'; -const modalGenerateTokenMissedPolicyAlertSelector = - '[data-test-link-to-hcp-modal-missed-policy-alert]'; -const modalNextButtonSelector = '[data-test-link-to-hcp-modal-next-button]'; -const modalCancelButtonSelector = '[data-test-link-to-hcp-modal-cancel-button]'; -const resourceId = - 'organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api'; - -module('Integration | Component | link-to-hcp-modal', function (hooks) { - let originalClipboardWriteText; - let hideModal = sinon.stub(); - const close = sinon.stub(); - const source = new RealEventSource(); - - setupRenderingTest(hooks); - - hooks.beforeEach(function () { - const fakeService = class extends Service { - close = close; - open() { - source.getCurrentEvent = function () { - return { data: { Name: 'global-read-only', ID: '00000000-0000-0000-0000-000000000002' } }; - }; - return source; - } - }; - this.owner.register('service:data-source/fake-service', fakeService); - this.owner.register( - 'component:data-source', - class extends DataSourceComponent { - @service('data-source/fake-service') dataSource; - } - ); - this.owner.register( - 'service:abilities', - class Stub extends Service { - can(permission) { - if (permission === 'create tokens') { - return true; - } - } - } - ); - this.owner.register( - 'service:hcp-link-modal', - class Stub extends Service { - resourceId = resourceId; - hide = hideModal; - } - ); - - originalClipboardWriteText = navigator.clipboard.writeText; - navigator.clipboard.writeText = sinon.stub(); - }); - - hooks.afterEach(function () { - navigator.clipboard.writeText = originalClipboardWriteText; - }); - - test('it renders modal', async function (assert) { - await render(hbs``); - - assert.dom(modalSelector).exists({ count: 1 }); - // select read-only - await click(`${modalSelector} ${modalOptionReadOnlySelector}`); - - // when read-only selected, it shows the generate token button - assert.dom(`${modalSelector} ${modalGenerateTokenButtonSelector}`).isVisible(); - - // with the correct policy, it doesn't show the missed policy alert - assert.dom(`${modalSelector} ${modalGenerateTokenMissedPolicyAlertSelector}`).doesNotExist(); - }); - - test('it updates next link on option selected', async function (assert) { - await render(hbs``); - - let hrefValue = this.element - .querySelector(`${modalSelector} ${modalNextButtonSelector}`) - .getAttribute('href'); - assert.ok( - hrefValue.includes(ACCESS_LEVEL.GLOBALREADWRITE), - 'next link includes read/write access level' - ); - - // select read-only - await click(`${modalSelector} ${modalOptionReadOnlySelector}`); - - hrefValue = this.element - .querySelector(`${modalSelector} ${modalNextButtonSelector}`) - .getAttribute('href'); - assert.ok( - hrefValue.includes(ACCESS_LEVEL.GLOBALREADONLY), - 'next link includes read-only access level' - ); - }); - - test('it creates token and copy it to clipboard', async function (assert) { - await render(hbs``); - // select read-only - await click(`${modalSelector} ${modalOptionReadOnlySelector}`); - assert - .dom(`${modalSelector} ${modalGenerateTokenButtonSelector}`) - .hasText('Generate a read-only ACL token'); - - // with the correct policy, it doesn't show the missed policy alert - assert.dom(`${modalSelector} ${modalGenerateTokenMissedPolicyAlertSelector}`).doesNotExist(); - - // trigger generate token - await click(`${modalSelector} ${modalGenerateTokenButtonSelector}`); - - assert.dom(`${modalSelector} ${modalGenerateTokenCardSelector}`).isVisible(); - assert.dom(`${modalSelector} ${modalGenerateTokenCardValueSelector}`).exists(); - const tokenValue = this.element.querySelector( - `${modalSelector} ${modalGenerateTokenCardValueSelector}` - ).textContent; - // click on copy button - await click(`${modalSelector} ${modalGenerateTokenCardCopyButtonSelector}`); - assert.ok( - navigator.clipboard.writeText.called, - 'clipboard write function is called when copy button is clicked' - ); - assert.ok( - navigator.clipboard.writeText.calledWith(tokenValue.trim()), - 'clipboard contains expected value' - ); - }); - - test('it calls hcpLinkModal.hide when closing modal', async function (assert) { - await render(hbs``); - - await click(`${modalSelector} ${modalCancelButtonSelector}`); - - assert.ok(hideModal.called, 'hide method is called when cancel button is clicked'); - }); - - test('it shows an alert when policy was not loaded and it is not possible to generate a token', async function (assert) { - // creating a fake service that will return an empty policy - const fakeService = class extends Service { - close = close; - open() { - source.getCurrentEvent = function () { - return {}; - }; - return source; - } - }; - this.owner.register('service:data-source/fake-service', fakeService); - - await render(hbs``); - - assert.dom(modalSelector).exists({ count: 1 }); - // select read-only - await click(`${modalSelector} ${modalOptionReadOnlySelector}`); - - // when read-only selected and no policy, it doesn't show the generate token button - assert.dom(`${modalSelector} ${modalGenerateTokenButtonSelector}`).doesNotExist(); - // Missed policy alert is visible - assert.dom(`${modalSelector} ${modalGenerateTokenMissedPolicyAlertSelector}`).isVisible(); - }); -}); diff --git a/ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js b/ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js deleted file mode 100644 index f089b209341c..000000000000 --- a/ui/packages/consul-ui/tests/integration/helpers/hcp-authentication-link-test.js +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import { module, test } from 'qunit'; -import { render } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; -import { setupRenderingTest } from 'ember-qunit'; -import { HCP_PREFIX } from 'consul-ui/helpers/hcp-authentication-link'; -import { EnvStub } from 'consul-ui/services/env'; - -// organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api -const clusterName = 'hello'; -const clusterVersion = '1.18.0'; -const accessMode = 'CONSUL_ACCESS_LEVEL_GLOBAL_READ_WRITE'; -const projectId = '4b09958c-fa91-43ab-8029-eb28d8cee9d4'; -const realResourceId = `organization/b4432207-bb9c-438e-a160-b98923efa979/project/${projectId}/hashicorp.consul.global-network-manager.cluster/${clusterName}`; -module('Integration | Helper | hcp-authentication-link', function (hooks) { - setupRenderingTest(hooks); - hooks.beforeEach(function () { - this.owner.register( - 'service:env', - class Stub extends EnvStub { - stubEnv = { - CONSUL_VERSION: clusterVersion, - }; - } - ); - }); - test('it makes a URL out of a real resourceId', async function (assert) { - this.resourceId = realResourceId; - - await render(hbs`{{hcp-authentication-link resourceId}}`); - - assert.equal( - this.element.textContent.trim(), - `${HCP_PREFIX}?cluster_name=${clusterName}&cluster_version=${clusterVersion}` - ); - }); - - test('it returns correct link with invalid resourceId', async function (assert) { - this.resourceId = 'invalid'; - - await render(hbs`{{hcp-authentication-link resourceId}}`); - assert.equal( - this.element.textContent.trim(), - `${HCP_PREFIX}?cluster_version=${clusterVersion}` - ); - - // not enough items in id - this.resourceId = - '`organization/b4432207-bb9c-438e-a160-b98923efa979/project/${projectId}/hashicorp.consul.global-network-manager.cluster`'; - await render(hbs`{{hcp-authentication-link resourceId}}`); - assert.equal( - this.element.textContent.trim(), - `${HCP_PREFIX}?cluster_version=${clusterVersion}` - ); - - // value is null - this.resourceId = null; - await render(hbs`{{hcp-authentication-link resourceId}}`); - assert.equal( - this.element.textContent.trim(), - `${HCP_PREFIX}?cluster_version=${clusterVersion}` - ); - }); - - test('it makes a URL out of a real resourceId and accessLevel, if passed', async function (assert) { - this.resourceId = realResourceId; - this.accessMode = accessMode; - - await render(hbs`{{hcp-authentication-link resourceId accessMode}}`); - - assert.equal( - this.element.textContent.trim(), - `${HCP_PREFIX}?cluster_name=${clusterName}&cluster_version=${clusterVersion}&cluster_access_mode=${accessMode}` - ); - }); -}); From c8996cdc9b6182b765284f714a4721f262d6604d Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Mon, 11 Mar 2024 13:48:10 -0700 Subject: [PATCH 5/7] Revert "Add nav bar item to show HCP link status and encourage folks to link (#20370)" This reverts commit 22e6ce0df10091bc66ee7fbf8e5d1c0f158ab5a9. --- .../consul-ui/app/abilities/operator.js | 10 - .../app/components/hashicorp-consul/index.hbs | 4 +- .../app/components/hcp-nav-item/index.hbs | 19 -- .../app/components/hcp-nav-item/index.js | 36 --- .../app/helpers/hcp-resource-id-to-link.js | 32 --- .../consul-ui/app/services/hcp-link-status.js | 10 +- .../app/services/repository/hcp-link.js | 48 +--- .../consul-ui/mock-api/api/hcp/v2/link/global | 31 +-- ...hcp-test.js => link-to-hcp-banner-test.js} | 14 +- .../components/hcp-nav-item-test.js | 247 ++++-------------- .../helpers/hcp-resource-id-to-link-test.js | 41 --- .../consul-ui/tests/unit/abilities/-test.js | 3 +- 12 files changed, 70 insertions(+), 425 deletions(-) delete mode 100644 ui/packages/consul-ui/app/abilities/operator.js delete mode 100644 ui/packages/consul-ui/app/helpers/hcp-resource-id-to-link.js rename ui/packages/consul-ui/tests/acceptance/{link-to-hcp-test.js => link-to-hcp-banner-test.js} (56%) delete mode 100644 ui/packages/consul-ui/tests/integration/helpers/hcp-resource-id-to-link-test.js diff --git a/ui/packages/consul-ui/app/abilities/operator.js b/ui/packages/consul-ui/app/abilities/operator.js deleted file mode 100644 index 4cec68fad7d4..000000000000 --- a/ui/packages/consul-ui/app/abilities/operator.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import BaseAbility from './base'; - -export default class OperatorAbility extends BaseAbility { - resource = 'operator'; -} diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs index b7311b3143c9..fc508b17c6b5 100644 --- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs +++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs @@ -122,9 +122,7 @@ class='hds-side-nav-hide-when-minimized consul-side-nav__selector-group' as |SNL| > - - - + - {{else}} - {{#if this.shouldDisplayNavLinkItem}} - {{#if this.alreadyLinked}} - - {{else}} - - - - {{/if}} - {{/if}} {{/if}} {{/let}} \ No newline at end of file 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 996d906957df..487984511ed2 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 @@ -5,7 +5,6 @@ import Component from '@glimmer/component'; import { inject as service } from '@ember/service'; -import { action } from '@ember/object'; /** * If the user has accessed consul from HCP managed consul, we do NOT want to display the @@ -13,45 +12,10 @@ import { action } from '@ember/object'; */ export default class HcpLinkItemComponent extends Component { @service env; - @service('hcp-link-status') hcpLinkStatus; - - get alreadyLinked() { - return this.args.linkData?.isLinked; - } - - get shouldDisplayNavLinkItem() { - const alreadyLinked = this.alreadyLinked; - const undefinedResourceId = !this.args.linkData?.resourceId; - const unauthorizedToLink = !this.hcpLinkStatus.hasPermissionToLink; - const undefinedLinkStatus = this.args.linkData?.isLinked === undefined; - - // We need permission to link to display the link nav item - if (unauthorizedToLink) { - return false; - } - - // If the link status is undefined, we don't want to display the link nav item - if (undefinedLinkStatus) { - return false; - } - - // If the user has already linked, but we don't have the resourceId to link them to HCP, we don't want to display the link nav item - if (alreadyLinked && undefinedResourceId) { - return false; - } - - // With the death of Consul Central, we don't want to display the link nav item - return false; - } get shouldShowBackToHcpItem() { const isConsulHcpUrlDefined = !!this.env.var('CONSUL_HCP_URL'); const isConsulHcpEnabled = !!this.env.var('CONSUL_HCP_ENABLED'); return isConsulHcpEnabled && isConsulHcpUrlDefined; } - - @action - onLinkToConsulCentral() { - // TODO: https://hashicorp.atlassian.net/browse/CC-7147 open the modal - } } diff --git a/ui/packages/consul-ui/app/helpers/hcp-resource-id-to-link.js b/ui/packages/consul-ui/app/helpers/hcp-resource-id-to-link.js deleted file mode 100644 index 25ed105bcacc..000000000000 --- a/ui/packages/consul-ui/app/helpers/hcp-resource-id-to-link.js +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import Helper from '@ember/component/helper'; - -/** - * A resourceId Looks like: - * organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api - * organization/${organizationId}/project/${projectId}/hashicorp.consul.global-network-manager.cluster/${clusterName} - * - * A HCP URL looks like: - * https://portal.hcp.dev/services/consul/clusters/self-managed/test-from-api?project_id=4b09958c-fa91-43ab-8029-eb28d8cee9d4 - * ${HCP_PREFIX}/${clusterName}?project_id=${projectId} - */ -export const HCP_PREFIX = - 'https://portal.cloud.hashicorp.com/services/consul/clusters/self-managed'; -export default class hcpResourceIdToLink extends Helper { - // TODO: How can we figure out different HCP environments? - compute([resourceId], hash) { - let url = HCP_PREFIX; - // Array looks like: ["organization", organizationId, "project", projectId, "hashicorp.consul.global-network-manager.cluster", "Cluster Id"] - const [, , , projectId, , clusterName] = resourceId.split('/'); - if (!projectId || !clusterName) { - return ''; - } - - url += `/${clusterName}?project_id=${projectId}`; - return url; - } -} 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 e8d7c3065348..cdde716ee4ea 100644 --- a/ui/packages/consul-ui/app/services/hcp-link-status.js +++ b/ui/packages/consul-ui/app/services/hcp-link-status.js @@ -9,17 +9,13 @@ import { tracked } from '@glimmer/tracking'; const LOCAL_STORAGE_KEY = 'consul:hideHcpLinkBanner'; export default class HcpLinkStatus extends Service { - @service abilities; + @service('env') env; @tracked userDismissedBanner = false; get shouldDisplayBanner() { - // With the death of Consul Central, we don't want to display the link nav item - return false; - } - - get hasPermissionToLink() { - return this.abilities.can('write operators') && this.abilities.can('write acls'); + const hcpLinkEnabled = this.env.var('CONSUL_HCP_LINK_ENABLED'); + return !this.userDismissedBanner && hcpLinkEnabled; } constructor() { diff --git a/ui/packages/consul-ui/app/services/repository/hcp-link.js b/ui/packages/consul-ui/app/services/repository/hcp-link.js index 4f44f60ec900..f82296cd0985 100644 --- a/ui/packages/consul-ui/app/services/repository/hcp-link.js +++ b/ui/packages/consul-ui/app/services/repository/hcp-link.js @@ -7,44 +7,6 @@ import RepositoryService from 'consul-ui/services/repository'; import dataSource from 'consul-ui/decorators/data-source'; export default class HcpLinkService extends RepositoryService { - /** - * Data looks like - * { - * "data": { - * "clientId": "5wZyAPvDFbgDdO3439m8tufwO9hElphu", - * "clientSecret": "SWX0XShcp3doc7RF8YCjJ-WATyeMAjFaf1eA0mnzlNHLF4IXbFz6xyjSZvHzAR_i", - * "resourceId": "organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api" - * }, - * "generation": "01HMSDHXQTCQGD3Z68B3H58YFE", - * "id": { - * "name": "global", - * "tenancy": { - * "peerName": "local" - * }, - * "type": { - * "group": "hcp", - * "groupVersion": "v2", - * "kind": "Link" - * }, - * "uid": "01HMSDHXQTCQGD3Z68B10WBWHX" - * }, - * "status": { - * "consul.io/hcp/link": { - * "conditions": [ - * { - * "message": "Failed to link to HCP", - * "reason": "FAILED", - * "state": "STATE_FALSE", - * "type": "linked" - * } - * ], - * "observedGeneration": "01HMSDHXQTCQGD3Z68B3H58YFE", - * "updatedAt": "2024-01-22T20:24:57.141144170Z" - * } - * }, - * "version": "57" - * } - */ @dataSource('/:partition/:ns/:dc/hcp-link') async fetch({ partition, ns, dc }, { uri }, request) { let result; @@ -54,19 +16,15 @@ export default class HcpLinkService extends RepositoryService { GET /api/hcp/v2/link/global ` )((headers, body) => { - const isLinked = (body.status['consul.io/hcp/link']['conditions'] || []).some( - (condition) => condition.type === 'linked' && condition.state === 'STATE_TRUE' - ); - const resourceId = body.data?.resourceId; - return { meta: { version: 2, uri: uri, }, body: { - isLinked, - resourceId, + isLinked: (body.status['consul.io/hcp/link']['conditions'] || []).some( + (condition) => condition.type === 'linked' && condition.state === 'STATE_TRUE' + ), }, headers, }; diff --git a/ui/packages/consul-ui/mock-api/api/hcp/v2/link/global b/ui/packages/consul-ui/mock-api/api/hcp/v2/link/global index e4274f1c5294..873f854c202d 100644 --- a/ui/packages/consul-ui/mock-api/api/hcp/v2/link/global +++ b/ui/packages/consul-ui/mock-api/api/hcp/v2/link/global @@ -1,21 +1,16 @@ { - "data": { - "clientId": "5wZyAPvDFbgDdO3439m8tufwO9hElphu", - "clientSecret": "SWX0XShcp3doc7RF8YCjJ-WATyeMAjFaf1eA0mnzlNHLF4IXbFz6xyjSZvHzAR_i", - "resourceId": "organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api" - }, - "status": { - "consul.io/hcp/link": { - "conditions": [ - { - "message": "Successfully linked to cluster 'organization/f53e5646-6529-4698-ae29-d74f8bd22a01/project/6994bb7a-5561-4d5c-8bb0-cf40177e5b77/hashicorp.consul.global-network-manager.cluster/mkam-vm'", - "reason": "SUCCESS", - "state": "STATE_FALSE", - "type": "linked" - } - ], - "observedGeneration":"01HMA2VPHVKNF6QR8TD07KDN5K", - "updatedAt":"2024-01-16T21:29:25.923140Z" + "status": { + "consul.io/hcp/link": { + "conditions": [ + { + "message": "Successfully linked to cluster 'organization/f53e5646-6529-4698-ae29-d74f8bd22a01/project/6994bb7a-5561-4d5c-8bb0-cf40177e5b77/hashicorp.consul.global-network-manager.cluster/mkam-vm'", + "reason": "SUCCESS", + "state": "STATE_FALSE", + "type": "linked" + } + ], + "observedGeneration":"01HMA2VPHVKNF6QR8TD07KDN5K", + "updatedAt":"2024-01-16T21:29:25.923140Z" + } } - } } \ No newline at end of file diff --git a/ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js b/ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js similarity index 56% rename from ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js rename to ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js index 32533046108d..da97353bb67a 100644 --- a/ui/packages/consul-ui/tests/acceptance/link-to-hcp-test.js +++ b/ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js @@ -8,8 +8,7 @@ import { click, visit } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; const bannerSelector = '[data-test-link-to-hcp-banner]'; -const linkToHcpSelector = '[data-test-link-to-hcp]'; -module('Acceptance | link to hcp', function (hooks) { +module('Acceptance | link to hcp banner', function (hooks) { setupApplicationTest(hooks); hooks.beforeEach(function () { @@ -17,22 +16,17 @@ module('Acceptance | link to hcp', function (hooks) { window.localStorage.clear(); }); - test('the banner and nav item are initially displayed on services page', async function (assert) { + test('the banner is initially displayed on services page', async function (assert) { + assert.expect(3); // default route is services page so we're good here await visit('/'); // Expect the banner to be visible by default - assert.dom(bannerSelector).isVisible('Banner is visible by default'); - // expect linkToHCP nav item to be visible as well - assert.dom(linkToHcpSelector).isVisible('Link to HCP nav item is visible by default'); + assert.dom(bannerSelector).exists({ count: 1 }); // Click on the dismiss button await click(`${bannerSelector} button[aria-label="Dismiss"]`); assert.dom(bannerSelector).doesNotExist('Banner is gone after dismissing'); - // link to HCP nav item still there - assert.dom(linkToHcpSelector).isVisible('Link to HCP nav item is visible by default'); // Refresh the page await visit('/'); assert.dom(bannerSelector).doesNotExist('Banner is still gone after refresh'); - // link to HCP nav item still there - assert.dom(linkToHcpSelector).isVisible('Link to HCP nav item is visible by default'); }); }); 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 c3fcf93686ad..8fc7bfa97507 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 @@ -8,228 +8,69 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; import { EnvStub } from 'consul-ui/services/env'; -import Service from '@ember/service'; -const backToHcpSelector = '[data-test-back-to-hcp]'; -const hcpConsulCentralItemSelector = '[data-test-linked-cluster-hcp-link]'; -const linkToHcpSelector = '[data-test-link-to-hcp]'; -const resourceId = - 'organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api'; module('Integration | Component | hcp nav item', function (hooks) { setupRenderingTest(hooks); - module('back to hcp item', function () { - test('it prints the value of CONSUL_HCP_URL when env vars are set', async function (assert) { - this.owner.register( - 'service:env', - class Stub extends EnvStub { - stubEnv = { - CONSUL_HCP_URL: 'http://hcp.com', - CONSUL_HCP_ENABLED: true, - }; - } - ); - - await render(hbs` + test('it prints the value of CONSUL_HCP_URL', async function (assert) { + this.owner.register( + 'service:env', + class Stub extends EnvStub { + stubEnv = { + CONSUL_HCP_URL: 'http://hcp.com', + CONSUL_HCP_ENABLED: true, + }; + } + ); + + await render(hbs` `); - assert.dom(backToHcpSelector).isVisible(); - assert.dom('a').hasAttribute('href', 'http://hcp.com'); - assert.dom(linkToHcpSelector).doesNotExist('link to hcp should not be visible'); - assert - .dom(hcpConsulCentralItemSelector) - .doesNotExist('hcp consul central item should not be visible'); - }); - - test('it does not output the Back to HCP link if CONSUL_HCP_URL is not present', async function (assert) { - this.owner.register( - 'service:env', - class Stub extends EnvStub { - stubEnv = { - CONSUL_HCP_ENABLED: true, - CONSUL_HCP_URL: undefined, - }; - } - ); + assert.dom('[data-test-back-to-hcp]').isVisible(); + assert.dom('a').hasAttribute('href', 'http://hcp.com'); + }); - await render(hbs` + test('it does not output the Back to HCP link if CONSUL_HCP_URL is not present', async function (assert) { + this.owner.register( + 'service:env', + class Stub extends EnvStub { + stubEnv = { + CONSUL_HCP_ENABLED: true, + CONSUL_HCP_URL: undefined, + }; + } + ); + + await render(hbs` `); - assert.dom(backToHcpSelector).doesNotExist(); - assert.dom('a').doesNotExist(); - }); - test('it does not output the Back to HCP link if CONSUL_HCP_ENABLED is not present', async function (assert) { - this.owner.register( - 'service:env', - class Stub extends EnvStub { - stubEnv = { - CONSUL_HCP_URL: 'http://hcp.com', - CONSUL_HCP_ENABLED: undefined, - }; - } - ); - - await render(hbs` + assert.dom('[data-test-back-to-hcp]').doesNotExist(); + assert.dom('a').doesNotExist(); + }); + test('it does not output the Back to HCP link if CONSUL_HCP_ENABLED is not present', async function (assert) { + this.owner.register( + 'service:env', + class Stub extends EnvStub { + stubEnv = { + CONSUL_HCP_URL: 'http://hcp.com', + CONSUL_HCP_ENABLED: undefined, + }; + } + ); + + await render(hbs` `); - assert.dom(backToHcpSelector).doesNotExist(); - assert.dom('a').doesNotExist(); - }); - }); - - module.skip('when rendered in self managed mode', function (hooks) { - hooks.beforeEach(function () { - this.owner.register( - 'service:env', - class Stub extends EnvStub { - stubEnv = {}; - } - ); - }); - - test('when unauthorized to link it does not display any nav items', async function (assert) { - this.owner.register( - 'service:hcp-link-status', - class Stub extends Service { - hasPermissionToLink = false; - } - ); - this.linkData = { - resourceId, - isLinked: false, - }; - await render(hbs` - - - - `); - assert.dom(backToHcpSelector).doesNotExist('back to hcp should not be visible'); - assert.dom(linkToHcpSelector).doesNotExist('link to hcp should not be visible'); - assert - .dom(hcpConsulCentralItemSelector) - .doesNotExist('hcp consul central item should not be visible'); - }); - - test('when link status is undefined it does not display any nav items', async function (assert) { - this.owner.register( - 'service:hcp-link-status', - class Stub extends Service { - hasPermissionToLink = true; - } - ); - this.linkData = { - resourceId, - }; - await render(hbs` - - - - `); - assert.dom(backToHcpSelector).doesNotExist('back to hcp should not be visible'); - assert.dom(linkToHcpSelector).doesNotExist('link to hcp should not be visible'); - assert - .dom(hcpConsulCentralItemSelector) - .doesNotExist('hcp consul central item should not be visible'); - }); - - test('when already linked but no resourceId it does not display any nav items', async function (assert) { - this.owner.register( - 'service:hcp-link-status', - class Stub extends Service { - hasPermissionToLink = true; - } - ); - this.linkData = { - isLinked: true, - }; - await render(hbs` - - - - `); - assert.dom(backToHcpSelector).doesNotExist('back to hcp should not be visible'); - assert.dom(linkToHcpSelector).doesNotExist('link to hcp should not be visible'); - assert - .dom(hcpConsulCentralItemSelector) - .doesNotExist('hcp consul central item should not be visible'); - }); - - test('when already linked and we have a resourceId it displays the link to hcp consul central item', async function (assert) { - this.owner.register( - 'service:hcp-link-status', - class Stub extends Service { - hasPermissionToLink = true; - } - ); - this.linkData = { - isLinked: true, - resourceId, - }; - await render(hbs` - - - - `); - assert.dom(backToHcpSelector).doesNotExist('back to hcp should not be visible'); - assert.dom(linkToHcpSelector).doesNotExist('link to hcp should not be visible'); - assert - .dom(hcpConsulCentralItemSelector) - .isVisible('hcp consul central item should be visible'); - }); - - test('when not already linked without dismissed banner it displays the link to hcp item', async function (assert) { - this.owner.register( - 'service:hcp-link-status', - class Stub extends Service { - hasPermissionToLink = true; - shouldDisplayBanner = true; - } - ); - this.linkData = { - isLinked: false, - }; - await render(hbs` - - - - `); - assert.dom(backToHcpSelector).doesNotExist('back to hcp should not be visible'); - assert - .dom(hcpConsulCentralItemSelector) - .doesNotExist('hcp consul central item should not be visible'); - assert.dom(linkToHcpSelector).isVisible('link to hcp should be visible'); - }); - - test('when not already linked with dismissed banner it displays the link to hcp item', async function (assert) { - this.owner.register( - 'service:hcp-link-status', - class Stub extends Service { - hasPermissionToLink = true; - shouldDisplayBanner = false; - } - ); - this.linkData = { - isLinked: false, - }; - await render(hbs` - - - - `); - assert.dom(backToHcpSelector).doesNotExist('back to hcp should not be visible'); - assert - .dom(hcpConsulCentralItemSelector) - .doesNotExist('hcp consul central item should not be visible'); - assert.dom(linkToHcpSelector).isVisible('link to hcp should be visible'); - }); + assert.dom('[data-test-back-to-hcp]').doesNotExist(); + assert.dom('a').doesNotExist(); }); }); diff --git a/ui/packages/consul-ui/tests/integration/helpers/hcp-resource-id-to-link-test.js b/ui/packages/consul-ui/tests/integration/helpers/hcp-resource-id-to-link-test.js deleted file mode 100644 index 366186f85397..000000000000 --- a/ui/packages/consul-ui/tests/integration/helpers/hcp-resource-id-to-link-test.js +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import { module, test } from 'qunit'; -import { render } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; -import { setupRenderingTest } from 'ember-qunit'; -import { HCP_PREFIX } from 'consul-ui/helpers/hcp-resource-id-to-link'; - -// organization/b4432207-bb9c-438e-a160-b98923efa979/project/4b09958c-fa91-43ab-8029-eb28d8cee9d4/hashicorp.consul.global-network-manager.cluster/test-from-api -const clusterName = 'hello'; -const projectId = '4b09958c-fa91-43ab-8029-eb28d8cee9d4'; -const realResourceId = `organization/b4432207-bb9c-438e-a160-b98923efa979/project/${projectId}/hashicorp.consul.global-network-manager.cluster/${clusterName}`; -module('Integration | Helper | hcp-resource-id-to-link', function (hooks) { - setupRenderingTest(hooks); - test('it makes a URL out of a real resourceId', async function (assert) { - this.resourceId = realResourceId; - - await render(hbs`{{hcp-resource-id-to-link resourceId}}`); - - assert.equal( - this.element.textContent.trim(), - `${HCP_PREFIX}/${clusterName}?project_id=${projectId}` - ); - }); - - test('it returns empty string with invalid resourceId', async function (assert) { - this.resourceId = 'invalid'; - - await render(hbs`{{hcp-resource-id-to-link resourceId}}`); - assert.equal(this.element.textContent.trim(), ''); - - // not enough items in id - this.resourceId = - '`organization/b4432207-bb9c-438e-a160-b98923efa979/project/${projectId}/hashicorp.consul.global-network-manager.cluster`'; - await render(hbs`{{hcp-resource-id-to-link resourceId}}`); - assert.equal(this.element.textContent.trim(), ''); - }); -}); diff --git a/ui/packages/consul-ui/tests/unit/abilities/-test.js b/ui/packages/consul-ui/tests/unit/abilities/-test.js index 0a7a9e0bd529..f64d514a61d4 100644 --- a/ui/packages/consul-ui/tests/unit/abilities/-test.js +++ b/ui/packages/consul-ui/tests/unit/abilities/-test.js @@ -10,8 +10,9 @@ import { setupTest } from 'ember-qunit'; module('Unit | Ability | *', function (hooks) { setupTest(hooks); + // Replace this with your real tests. test('it exists', function (assert) { - assert.expect(240); + assert.expect(228); const abilities = Object.keys(requirejs.entries) .filter((key) => key.indexOf('/abilities/') !== -1) From 731f2761205e288c42119b31e7deacfd75b19870 Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Mon, 11 Mar 2024 13:49:08 -0700 Subject: [PATCH 6/7] Revert "Cc 7145 hcp link status api (#20330)" This reverts commit 049ca102c41fbf646b07e34f5f69f652de9fbc6c. --- .../components/link-to-hcp-banner/index.hbs | 2 +- .../components/link-to-hcp-banner/index.js | 4 -- .../consul-ui/app/services/hcp-link-status.js | 8 +-- .../app/services/repository/hcp-link.js | 42 ------------- .../consul-ui/app/templates/application.hbs | 36 +++++------ .../app/templates/dc/services/index.hbs | 6 +- .../consul-ui/mock-api/api/hcp/v2/link/global | 16 ----- .../components/link-to-hcp-banner-test.js | 61 +++++++------------ 8 files changed, 45 insertions(+), 130 deletions(-) delete mode 100644 ui/packages/consul-ui/app/services/repository/hcp-link.js delete mode 100644 ui/packages/consul-ui/mock-api/api/hcp/v2/link/global diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs index 39dd933c9187..950c30c945f9 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs +++ b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs @@ -2,7 +2,7 @@ Copyright (c) HashiCorp, Inc. SPDX-License-Identifier: BUSL-1.1 }} -{{#if (and this.hcpLinkStatus.shouldDisplayBanner this.notLinked)}} +{{#if this.hcpLinkStatus.shouldDisplayBanner}} {{t "components.link-to-hcp-banner.title"}} diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js index 9416cfbafbbe..3d0c96f2fa37 100644 --- a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js +++ b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js @@ -11,10 +11,6 @@ export default class LinkToHcpBannerComponent extends Component { @service('hcp-link-status') hcpLinkStatus; @service('env') env; - get notLinked() { - return this.args.linkData?.isLinked === false; - } - @action onDismiss() { this.hcpLinkStatus.dismissHcpLinkBanner(); 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 cdde716ee4ea..4fec7f5babfc 100644 --- a/ui/packages/consul-ui/app/services/hcp-link-status.js +++ b/ui/packages/consul-ui/app/services/hcp-link-status.js @@ -3,19 +3,19 @@ * SPDX-License-Identifier: BUSL-1.1 */ -import Service, { inject as service } from '@ember/service'; +import Service from '@ember/service'; import { tracked } from '@glimmer/tracking'; const LOCAL_STORAGE_KEY = 'consul:hideHcpLinkBanner'; export default class HcpLinkStatus extends Service { - @service('env') env; + @tracked + alreadyLinked = false; @tracked userDismissedBanner = false; get shouldDisplayBanner() { - const hcpLinkEnabled = this.env.var('CONSUL_HCP_LINK_ENABLED'); - return !this.userDismissedBanner && hcpLinkEnabled; + return !this.alreadyLinked && !this.userDismissedBanner; } constructor() { diff --git a/ui/packages/consul-ui/app/services/repository/hcp-link.js b/ui/packages/consul-ui/app/services/repository/hcp-link.js deleted file mode 100644 index f82296cd0985..000000000000 --- a/ui/packages/consul-ui/app/services/repository/hcp-link.js +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import RepositoryService from 'consul-ui/services/repository'; -import dataSource from 'consul-ui/decorators/data-source'; - -export default class HcpLinkService extends RepositoryService { - @dataSource('/:partition/:ns/:dc/hcp-link') - async fetch({ partition, ns, dc }, { uri }, request) { - let result; - try { - result = ( - await request` - GET /api/hcp/v2/link/global - ` - )((headers, body) => { - return { - meta: { - version: 2, - uri: uri, - }, - body: { - isLinked: (body.status['consul.io/hcp/link']['conditions'] || []).some( - (condition) => condition.type === 'linked' && condition.state === 'STATE_TRUE' - ), - }, - headers, - }; - }); - } catch (e) { - // set linked to false if the global link is not found - if (e.statusCode === 404) { - result = Promise.resolve({ isLinked: false }); - } else { - result = Promise.resolve(null); - } - } - return result; - } -} diff --git a/ui/packages/consul-ui/app/templates/application.hbs b/ui/packages/consul-ui/app/templates/application.hbs index b0c9054ce631..a999d9b562aa 100644 --- a/ui/packages/consul-ui/app/templates/application.hbs +++ b/ui/packages/consul-ui/app/templates/application.hbs @@ -48,18 +48,18 @@ (and (not (env 'CONSUL_V2_CATALOG_ENABLED')) (not-eq route.currentName 'oauth-provider-debug')) }} - {{! redirect if we aren't on a URL with dc information }} + {{! redirect if we aren't on a URL with dc information }} {{#if (eq route.currentName 'index')}} - {{! until we get to the dc route we don't know any permissions }} - {{! as we don't know the dc, any inital permission based }} - {{! redirects are in the dc.show route}} + {{! until we get to the dc route we don't know any permissions }} + {{! as we don't know the dc, any inital permission based }} + {{! redirects are in the dc.show route}} - {{! 2022-04-15: Temporarily reverting the services page to the default }} + {{! 2022-04-15: Temporarily reverting the services page to the default }} {{did-insert (route-action 'replaceWith' 'dc.services.index' (hash dc=(env 'CONSUL_DATACENTER_LOCAL'))) }} {{else}} - {{! If we are notfound, guess the params we need }} + {{! If we are notfound, guess the params we need }} {{#if (eq route.currentName 'notfound')}} {{! Once we have a list of DCs make sure the DC we are asking for exists }} {{! If not use the DC that the UI is running in }} @@ -90,20 +90,20 @@ (hash Name=(env 'CONSUL_DATACENTER_LOCAL')) ) dcs.data - as |dc dcs| + as |dc dcs| }} {{#if (and (gt dc.Name.length 0) dcs)}} - {{! figure out our current DC and convert it to a model }} + {{! figure out our current DC and convert it to a model }} {{#if dc.data}} - {{#if error}} - {{! If we got an error from anything, show an error page }} + {{! If we got an error from anything, show an error page }} {{else}} - {{! Otherwise show the rest of the app}} + {{! Otherwise show the rest of the app}} {{outlet}} diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs index 0a7e2b97b1d4..7f33e16c6a57 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs @@ -62,11 +62,7 @@ as |route|> (or route.params.nspace route.model.user.token.Namespace 'default') as |sort filters items partition nspace|}} -{{#let route.params.dc as |dc|}} - - - -{{/let}} +

diff --git a/ui/packages/consul-ui/mock-api/api/hcp/v2/link/global b/ui/packages/consul-ui/mock-api/api/hcp/v2/link/global deleted file mode 100644 index 873f854c202d..000000000000 --- a/ui/packages/consul-ui/mock-api/api/hcp/v2/link/global +++ /dev/null @@ -1,16 +0,0 @@ -{ - "status": { - "consul.io/hcp/link": { - "conditions": [ - { - "message": "Successfully linked to cluster 'organization/f53e5646-6529-4698-ae29-d74f8bd22a01/project/6994bb7a-5561-4d5c-8bb0-cf40177e5b77/hashicorp.consul.global-network-manager.cluster/mkam-vm'", - "reason": "SUCCESS", - "state": "STATE_FALSE", - "type": "linked" - } - ], - "observedGeneration":"01HMA2VPHVKNF6QR8TD07KDN5K", - "updatedAt":"2024-01-16T21:29:25.923140Z" - } - } -} \ No newline at end of file diff --git a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js index ac375fb451cf..d20646bf34ba 100644 --- a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js +++ b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js @@ -9,9 +9,9 @@ import { click, render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; import Service from '@ember/service'; import sinon from 'sinon'; -import { EnvStub } from 'consul-ui/services/env'; const userDismissedBannerStub = sinon.stub(); +const userHasLinkedStub = sinon.stub(); const dismissHcpLinkBannerStub = sinon.stub(); const bannerSelector = '[data-test-link-to-hcp-banner]'; module('Integration | Component | link-to-hcp-banner', function (hooks) { @@ -22,16 +22,24 @@ module('Integration | Component | link-to-hcp-banner', function (hooks) { return true; } userDismissedBanner = userDismissedBannerStub; + userHasLinked = userHasLinkedStub; dismissHcpLinkBanner = dismissHcpLinkBannerStub; } + class EnvStub extends Service { + isEnterprise = false; + var(key) { + return key; + } + } + hooks.beforeEach(function () { this.owner.register('service:hcp-link-status', HcpLinkStatusStub); + this.owner.register('service:env', EnvStub); }); test('it renders banner when hcp-link-status says it should', async function (assert) { - this.linkData = { isLinked: false }; - await render(hbs``); + await render(hbs``); assert.dom(bannerSelector).exists({ count: 1 }); await click(`${bannerSelector} button[aria-label="Dismiss"]`); @@ -54,51 +62,24 @@ module('Integration | Component | link-to-hcp-banner', function (hooks) { get shouldDisplayBanner() { return false; } + userDismissedBanner = sinon.stub(); + userHasLinked = sinon.stub(); dismissHcpLinkBanner = sinon.stub(); } this.owner.register('service:hcp-link-status', HcpLinkStatusStub); - this.linkData = { isLinked: false }; - await render(hbs``); - assert.dom(bannerSelector).doesNotExist(); - }); - - test('banner does not render when cluster is already linked', async function (assert) { - class HcpLinkStatusStub extends Service { - get shouldDisplayBanner() { - return true; - } - dismissHcpLinkBanner = sinon.stub(); - } - this.owner.register('service:hcp-link-status', HcpLinkStatusStub); - this.linkData = { isLinked: true }; - await render(hbs``); - assert.dom(bannerSelector).doesNotExist(); - }); - - test('banner does not render when we have no cluster link status info', async function (assert) { - class HcpLinkStatusStub extends Service { - get shouldDisplayBanner() { - return true; - } - dismissHcpLinkBanner = sinon.stub(); - } - this.owner.register('service:hcp-link-status', HcpLinkStatusStub); - this.linkData = undefined; - await render(hbs``); + await render(hbs``); assert.dom(bannerSelector).doesNotExist(); }); test('it displays different banner text when consul is enterprise', async function (assert) { - this.owner.register( - 'service:env', - class Stub extends EnvStub { - stubEnv = {}; - isEnterprise = true; + class EnvStub extends Service { + isEnterprise = true; + var(key) { + return key; } - ); - this.linkData = { isLinked: false }; - - await render(hbs``); + } + this.owner.register('service:env', EnvStub); + await render(hbs``); assert .dom('[data-test-link-to-hcp-banner-description]') .hasText( From 560b2cf7483bb9ed3cb1abaf8f8641edd74106b3 Mon Sep 17 00:00:00 2001 From: Chris Hut Date: Mon, 11 Mar 2024 13:49:41 -0700 Subject: [PATCH 7/7] =?UTF-8?q?Revert=20"=F0=9F=92=9C=20Cc=207187/purple?= =?UTF-8?q?=20banner=20for=20linking=20existing=20clusters=20(#20275)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5119667cd16c527af111c339594a08354b7a5cb0. --- .changelog/20275.txt | 3 - .../app/components/hashicorp-consul/index.js | 2 +- .../components/link-to-hcp-banner/index.hbs | 24 ----- .../components/link-to-hcp-banner/index.js | 22 ----- ui/packages/consul-ui/app/services/env.js | 3 - .../consul-ui/app/services/hcp-link-status.js | 34 ------- .../app/styles/routes/dc/services/index.scss | 3 - .../app/templates/dc/services/index.hbs | 2 +- .../acceptance/link-to-hcp-banner-test.js | 32 ------- .../components/link-to-hcp-banner-test.js | 89 ------------------- .../components/link-to-hcp-banner/en-us.yaml | 10 --- 11 files changed, 2 insertions(+), 222 deletions(-) delete mode 100644 .changelog/20275.txt delete mode 100644 ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs delete mode 100644 ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js delete mode 100644 ui/packages/consul-ui/app/services/hcp-link-status.js delete mode 100644 ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js delete mode 100644 ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js delete mode 100644 ui/packages/consul-ui/translations/components/link-to-hcp-banner/en-us.yaml diff --git a/.changelog/20275.txt b/.changelog/20275.txt deleted file mode 100644 index e82fc542bcac..000000000000 --- a/.changelog/20275.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:feature -ui: Added a banner to let users link their clusters to HCP -``` \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.js b/ui/packages/consul-ui/app/components/hashicorp-consul/index.js index f8f4a0663d35..e47ca22c6262 100644 --- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.js +++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.js @@ -11,7 +11,7 @@ export default class HashiCorpConsul extends Component { @service('env') env; get consulVersion() { - const suffix = this.env.isEnterprise ? '+ent' : ''; + const suffix = !['', 'oss'].includes(this.env.var('CONSUL_BINARY_TYPE')) ? '+ent' : ''; return `${this.env.var('CONSUL_VERSION')}${suffix}`; } } diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs deleted file mode 100644 index 950c30c945f9..000000000000 --- a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.hbs +++ /dev/null @@ -1,24 +0,0 @@ -{{! - Copyright (c) HashiCorp, Inc. - SPDX-License-Identifier: BUSL-1.1 -}} -{{#if this.hcpLinkStatus.shouldDisplayBanner}} - - {{t "components.link-to-hcp-banner.title"}} - {{t "components.link-to-hcp-banner.description" - isEnterprise=this.env.isEnterprise}} - - - - - -{{/if}} \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js b/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js deleted file mode 100644 index 3d0c96f2fa37..000000000000 --- a/ui/packages/consul-ui/app/components/link-to-hcp-banner/index.js +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import Component from '@glimmer/component'; -import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; - -export default class LinkToHcpBannerComponent extends Component { - @service('hcp-link-status') hcpLinkStatus; - @service('env') env; - - @action - onDismiss() { - this.hcpLinkStatus.dismissHcpLinkBanner(); - } - @action - onClusterLink() { - // TODO: CC-7147: Open simplified modal - } -} diff --git a/ui/packages/consul-ui/app/services/env.js b/ui/packages/consul-ui/app/services/env.js index 39f2a740e9d4..450206b15fed 100644 --- a/ui/packages/consul-ui/app/services/env.js +++ b/ui/packages/consul-ui/app/services/env.js @@ -7,9 +7,6 @@ import Service from '@ember/service'; import { env } from 'consul-ui/env'; export default class EnvService extends Service { - get isEnterprise() { - return !['', 'oss'].includes(this.var('CONSUL_BINARY_TYPE')); - } // deprecated // TODO: Remove this elsewhere in the app and use var instead env(key) { diff --git a/ui/packages/consul-ui/app/services/hcp-link-status.js b/ui/packages/consul-ui/app/services/hcp-link-status.js deleted file mode 100644 index 4fec7f5babfc..000000000000 --- a/ui/packages/consul-ui/app/services/hcp-link-status.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import Service from '@ember/service'; -import { tracked } from '@glimmer/tracking'; - -const LOCAL_STORAGE_KEY = 'consul:hideHcpLinkBanner'; - -export default class HcpLinkStatus extends Service { - @tracked - alreadyLinked = false; - @tracked - userDismissedBanner = false; - - get shouldDisplayBanner() { - return !this.alreadyLinked && !this.userDismissedBanner; - } - - constructor() { - super(...arguments); - this.userDismissedBanner = !!localStorage.getItem(LOCAL_STORAGE_KEY); - } - - userHasLinked() { - // TODO: CC-7145 - once can fetch the link status from the backend, fetch it and set it here - } - - dismissHcpLinkBanner() { - localStorage.setItem(LOCAL_STORAGE_KEY, true); - this.userDismissedBanner = true; - } -} diff --git a/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss index c7c6732734d9..3065579e1107 100644 --- a/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss +++ b/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss @@ -18,9 +18,6 @@ html[data-route^='dc.services.instance'] .app-view > header dl { margin-bottom: 23px; margin-right: 50px; } -html[data-route^='dc.services.index'] .link-to-hcp-banner { - margin: 0 -48px; -} html[data-route^='dc.services.instance'] .app-view > header dt { font-weight: var(--token-typography-font-weight-bold); } diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs index 7f33e16c6a57..100e7c2d9761 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs @@ -62,7 +62,7 @@ as |route|> (or route.params.nspace route.model.user.token.Namespace 'default') as |sort filters items partition nspace|}} - +

diff --git a/ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js b/ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js deleted file mode 100644 index da97353bb67a..000000000000 --- a/ui/packages/consul-ui/tests/acceptance/link-to-hcp-banner-test.js +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import { module, test } from 'qunit'; -import { click, visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; - -const bannerSelector = '[data-test-link-to-hcp-banner]'; -module('Acceptance | link to hcp banner', function (hooks) { - setupApplicationTest(hooks); - - hooks.beforeEach(function () { - // clear local storage so we don't have any settings - window.localStorage.clear(); - }); - - test('the banner is initially displayed on services page', async function (assert) { - assert.expect(3); - // default route is services page so we're good here - await visit('/'); - // Expect the banner to be visible by default - assert.dom(bannerSelector).exists({ count: 1 }); - // Click on the dismiss button - await click(`${bannerSelector} button[aria-label="Dismiss"]`); - assert.dom(bannerSelector).doesNotExist('Banner is gone after dismissing'); - // Refresh the page - await visit('/'); - assert.dom(bannerSelector).doesNotExist('Banner is still gone after refresh'); - }); -}); diff --git a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js b/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js deleted file mode 100644 index d20646bf34ba..000000000000 --- a/ui/packages/consul-ui/tests/integration/components/link-to-hcp-banner-test.js +++ /dev/null @@ -1,89 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import { module, test } from 'qunit'; -import { setupRenderingTest } from 'ember-qunit'; -import { click, render } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; -import Service from '@ember/service'; -import sinon from 'sinon'; - -const userDismissedBannerStub = sinon.stub(); -const userHasLinkedStub = sinon.stub(); -const dismissHcpLinkBannerStub = sinon.stub(); -const bannerSelector = '[data-test-link-to-hcp-banner]'; -module('Integration | Component | link-to-hcp-banner', function (hooks) { - setupRenderingTest(hooks); - - class HcpLinkStatusStub extends Service { - get shouldDisplayBanner() { - return true; - } - userDismissedBanner = userDismissedBannerStub; - userHasLinked = userHasLinkedStub; - dismissHcpLinkBanner = dismissHcpLinkBannerStub; - } - - class EnvStub extends Service { - isEnterprise = false; - var(key) { - return key; - } - } - - hooks.beforeEach(function () { - this.owner.register('service:hcp-link-status', HcpLinkStatusStub); - this.owner.register('service:env', EnvStub); - }); - - test('it renders banner when hcp-link-status says it should', async function (assert) { - await render(hbs``); - - assert.dom(bannerSelector).exists({ count: 1 }); - await click(`${bannerSelector} button[aria-label="Dismiss"]`); - assert.ok(dismissHcpLinkBannerStub.calledOnce, 'userDismissedBanner was called'); - // Can't test that banner is no longer visible since service isn't hooked up - assert - .dom('[data-test-link-to-hcp-banner-title]') - .hasText( - 'Link this cluster to HCP Consul Central in a few steps to start managing your clusters in one place' - ); - assert - .dom('[data-test-link-to-hcp-banner-description]') - .hasText( - 'By linking your clusters to HCP Consul Central, you’ll get global, cross-cluster metrics, visual service maps, and a global API. Link to access a free 90 day trial for full feature access in your HCP organization.' - ); - }); - - test('banner does not render when hcp-link-status says it should NOT', async function (assert) { - class HcpLinkStatusStub extends Service { - get shouldDisplayBanner() { - return false; - } - userDismissedBanner = sinon.stub(); - userHasLinked = sinon.stub(); - dismissHcpLinkBanner = sinon.stub(); - } - this.owner.register('service:hcp-link-status', HcpLinkStatusStub); - await render(hbs``); - assert.dom(bannerSelector).doesNotExist(); - }); - - test('it displays different banner text when consul is enterprise', async function (assert) { - class EnvStub extends Service { - isEnterprise = true; - var(key) { - return key; - } - } - this.owner.register('service:env', EnvStub); - await render(hbs``); - assert - .dom('[data-test-link-to-hcp-banner-description]') - .hasText( - 'By linking your clusters to HCP Consul Central, you’ll get global, cross-cluster metrics, visual service maps, and a global API. HCP Consul Central’s full feature set is included with an Enterprise license.' - ); - }); -}); diff --git a/ui/packages/consul-ui/translations/components/link-to-hcp-banner/en-us.yaml b/ui/packages/consul-ui/translations/components/link-to-hcp-banner/en-us.yaml deleted file mode 100644 index e2b8149b3acb..000000000000 --- a/ui/packages/consul-ui/translations/components/link-to-hcp-banner/en-us.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - -title: Link this cluster to HCP Consul Central in a few steps to start managing your clusters in one place -description: By linking your clusters to HCP Consul Central, you’ll get global, cross-cluster metrics, visual service maps, and a global API. {isEnterprise, select, - true {HCP Consul Central’s full feature set is included with an Enterprise license.} - other {Link to access a free 90 day trial for full feature access in your HCP organization.}} -clusterLinkButton: Link this cluster -viewDocumentation: View documentation -consulCentralDocumentation: Consul Central documentation