+
+ {{combinedAddress}}
+
+
+ {{item.DestinationName}} +
++ {{item.Name}} +
+{{/if}} +- Copied {{name}}! -
-- Sorry, something went wrong! -
-Update. We have upgraded our ACL system by allowing you to create reusable policies which you can then apply to tokens. Don't worry, even though this token was written in the old style, it is still valid. However, we do recommend upgrading your old tokens to the new style. Learn how in our documentation.
{{/if}} {{#if (not create) }} -{{default item.Description item.Name}}
-Legacy tokens have embedded rules.
-{{ else }} - {{#each (append item.Policies item.Roles) as |item|}} - {{item.Name}} - {{/each}} -{{/if}} -- Are you sure you want to stop using this ACL token? This will log you out. -
-- Are you sure you want to use this ACL token? -
-- Are you sure you want to delete this token? -
-- {{#if (gt items.length 0)}} - No tokens where found matching that search, or you may not have access to view the tokens you are searching for. - {{else}} - There don't seem to be any tokens, or you may not have access to view tokens yet. - {{/if}} -
-+ {{#if (gt items.length 0)}} + No tokens where found matching that search, or you may not have access to view the tokens you are searching for. + {{else}} + There don't seem to be any tokens, or you may not have access to view tokens yet. + {{/if}} +
+- {{item.DestinationName}} -
-The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our documentation.
-
-
- {{combinedAddress}}
-
-
diff --git a/ui-v2/app/templates/dc/services/show/upstreams.hbs b/ui-v2/app/templates/dc/services/show/upstreams.hbs index b9595c492f..f8526f3d5d 100644 --- a/ui-v2/app/templates/dc/services/show/upstreams.hbs +++ b/ui-v2/app/templates/dc/services/show/upstreams.hbs @@ -5,72 +5,7 @@
Upstreams are services that may receive traffic from this gateway. Learn more about configuring gateways in our documentation.
- {{#let item.Service.Namespace as |nspace|}} -- {{item.Name}} -
- {{/if}} -diff --git a/ui-v2/tests/acceptance/components/copy-button.feature b/ui-v2/tests/acceptance/components/copy-button.feature index bb269d89fa..c2c0b96ea6 100644 --- a/ui-v2/tests/acceptance/components/copy-button.feature +++ b/ui-v2/tests/acceptance/components/copy-button.feature @@ -1,4 +1,5 @@ @setupApplicationTest +@ignore Feature: components / copy-button Background: Given 1 datacenter model with the value "dc-1" @@ -22,4 +23,4 @@ Feature: components / copy-button --- Then the url should be /dc-1/nodes/node-0/health-checks When I click ".healthcheck-output:nth-child(1) button.copy-btn" - Then I see the text "Copied output!" in ".healthcheck-output:nth-child(1) p.feedback-dialog-out" + Then I copied "The output" diff --git a/ui-v2/tests/acceptance/dc/acls/tokens/index.feature b/ui-v2/tests/acceptance/dc/acls/tokens/index.feature index 5645f9c473..16377e4535 100644 --- a/ui-v2/tests/acceptance/dc/acls/tokens/index.feature +++ b/ui-v2/tests/acceptance/dc/acls/tokens/index.feature @@ -77,7 +77,7 @@ Feature: dc / acls / tokens / index: ACL Token List s: Si-Search --- And I see 1 token model - And I see 1 token model with the serviceIdentity "Si-Search" + And I see 1 token model with the serviceIdentity "Service Identity: Si-Search" Scenario: I see the legacy message if I have one legacy token Given 1 datacenter model with the value "dc-1" And 3 token models from yaml diff --git a/ui-v2/tests/integration/components/feedback-dialog-test.js b/ui-v2/tests/integration/components/feedback-dialog-test.js deleted file mode 100644 index 1ce0d56993..0000000000 --- a/ui-v2/tests/integration/components/feedback-dialog-test.js +++ /dev/null @@ -1,30 +0,0 @@ -import { module, skip, test } from 'qunit'; -import { setupRenderingTest } from 'ember-qunit'; -import { render } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; - -module('Integration | Component | feedback dialog', function(hooks) { - setupRenderingTest(hooks); - - skip("it doesn't render anything when used inline"); - test('it renders', async function(assert) { - // Set any properties with this.set('myProperty', 'value'); - // Handle any actions with this.on('myAction', function(val) { ... }); - - await render(hbs`{{feedback-dialog}}`); - - assert.dom('*').hasText(''); - - // Template block usage: - await render(hbs` - {{#feedback-dialog}} - {{#block-slot name='success'}} - {{/block-slot}} - {{#block-slot name='error'}} - {{/block-slot}} - {{/feedback-dialog}} - `); - - assert.dom('*').hasText(''); - }); -}); diff --git a/ui-v2/tests/pages.js b/ui-v2/tests/pages.js index 58371c0875..4d56644e85 100644 --- a/ui-v2/tests/pages.js +++ b/ui-v2/tests/pages.js @@ -34,6 +34,7 @@ import policySelectorFactory from 'consul-ui/components/policy-selector/pageobje import roleFormFactory from 'consul-ui/components/role-form/pageobject'; import roleSelectorFactory from 'consul-ui/components/role-selector/pageobject'; import tokenListFactory from 'consul-ui/components/token-list/pageobject'; +import consulTokenListFactory from 'consul-ui/components/consul-token-list/pageobject'; import consulIntentionListFactory from 'consul-ui/components/consul-intention-list/pageobject'; // pages @@ -86,6 +87,7 @@ const policySelector = policySelectorFactory(clickable, deletable, collection, a const roleForm = roleFormFactory(submitable, cancelable, policySelector); const roleSelector = roleSelectorFactory(clickable, deletable, collection, alias, roleForm); const consulIntentionList = consulIntentionListFactory(collection, clickable, attribute, deletable); +const consulTokenList = consulTokenListFactory(collection, clickable, attribute, text, deletable); const page = pageFactory(clickable, attribute, is, authForm); @@ -131,19 +133,7 @@ export default { ), // TODO: This needs a policyList role: create(role(visitable, submitable, deletable, cancelable, policySelector, tokenList)), - tokens: create( - tokens( - visitable, - submitable, - deletable, - creatable, - clickable, - attribute, - collection, - text, - freetextFilter - ) - ), + tokens: create(tokens(visitable, creatable, text, consulTokenList, freetextFilter)), token: create( token(visitable, submitable, deletable, cancelable, clickable, policySelector, roleSelector) ), diff --git a/ui-v2/tests/pages/dc/acls/tokens/index.js b/ui-v2/tests/pages/dc/acls/tokens/index.js index f611ee1721..49f77fff1b 100644 --- a/ui-v2/tests/pages/dc/acls/tokens/index.js +++ b/ui-v2/tests/pages/dc/acls/tokens/index.js @@ -1,34 +1,9 @@ -export default function( - visitable, - submitable, - deletable, - creatable, - clickable, - attribute, - collection, - text, - filter -) { - return submitable( - creatable({ - visit: visitable('/:dc/acls/tokens'), - update: text('[data-test-notification-update]'), - tokens: collection( - '[data-test-tabular-row]', - deletable({ - id: attribute('data-test-token', '[data-test-token]'), - description: text('[data-test-description]'), - policy: text('[data-test-policy].policy', { multiple: true }), - role: text('[data-test-policy].role', { multiple: true }), - serviceIdentity: text('[data-test-policy].policy-service-identity', { multiple: true }), - token: clickable('a'), - actions: clickable('label'), - use: clickable('[data-test-use]'), - confirmUse: clickable('[data-test-confirm-use]'), - clone: clickable('[data-test-clone]'), - }) - ), - filter: filter(), - }) - ); +export default function(visitable, creatable, text, tokens, filter) { + return { + visit: visitable('/:dc/acls/tokens'), + update: text('[data-test-notification-update]'), + tokens: tokens(), + filter: filter(), + ...creatable(), + }; }