status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Add sorting to Policies (#8373) 

* Add sorting to ACLs policies with comparator

* Add acls/roles sorting test

* Add navigation test for acls/policies

* Update onchange value for sorting policies
This commit is contained in:
Kenia 2020-07-29 14:36:09 -04:00 committed by hashicorp-ci
parent 683454775c
commit ee3b3f559a
13 changed files with 107 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-v2/app/components/consul-policy-list/pageobject.js
View File

@ -1,5 +1,5 @@
export default (collection, clickable, attribute, text, actions) => () => {
return collection('.consul-policy-list li:not(:first-child)', {
return collection('.consul-policy-list [data-test-list-row]', {
name: attribute('data-test-policy', '[data-test-policy]'),
description: text('[data-test-description]'),
policy: clickable('a'),

1
ui-v2/app/controllers/dc/acls/policies/index.js
View File

@ -1,6 +1,7 @@
import Controller from '@ember/controller';
export default Controller.extend({
queryParams: {
sortBy: 'sort',
search: {
as: 'filter',
replace: true,

2
ui-v2/app/initializers/sort.js
View File

@ -3,6 +3,7 @@ import check from 'consul-ui/sort/comparators/check';
import intention from 'consul-ui/sort/comparators/intention';
import token from 'consul-ui/sort/comparators/token';
import role from 'consul-ui/sort/comparators/role';
import policy from 'consul-ui/sort/comparators/policy';
export function initialize(container) {
// Service-less injection using private properties at a per-project level
@ -13,6 +14,7 @@ export function initialize(container) {
intention: intention(),
token: token(),
role: role(),
policy: policy(),
};
Sort.reopen({
comparator: function(type) {

1
ui-v2/app/routes/dc/acls/policies/index.js
View File

@ -7,6 +7,7 @@ import WithPolicyActions from 'consul-ui/mixins/policy/with-actions';
export default Route.extend(WithPolicyActions, {
repo: service('repository/policy'),
queryParams: {
sortBy: 'sort',
search: {
as: 'filter',
replace: true,

3
ui-v2/app/sort/comparators/policy.js Normal file
View File

@ -0,0 +1,3 @@
export default () => key => {
return key;
};

28
ui-v2/app/templates/dc/acls/policies/index.hbs
View File

@ -3,6 +3,15 @@
{{else}}
{{title 'Access Controls'}}
{{/if}}
{{#let (selectable-key-values
(array "Name:asc" "A to Z")
(array "Name:desc" "Z to A")
selected=sortBy
)
as |sort|
}}
<AppView
@class="policy list"
@loading={{isLoading}}
@ -31,17 +40,24 @@
<BlockSlot @name="actions">
<a data-test-create href="{{href-to 'dc.acls.policies.create'}}" class="type-create">Create</a>
</BlockSlot>
<BlockSlot @name="content">
{{#if (gt items.length 0) }}
<BlockSlot @name="toolbar">
{{#if (gt items.length 0) }}
<SearchBar
@value={{search}}
@onsearch={{action (mut search) value="target.value"}}
@secondary="sort"
@selected={{sort.selected}}
@options={{sort.items}}
@onchange={{action (mut sortBy) value='target.selected.key'}}
/>
{{/if}}
<ChangeableSet @dispatcher={{searchable 'policy' items}} @terms={{search}}>
{{/if}}
</BlockSlot>
<BlockSlot @name="content">
{{#let (sort-by (comparator 'policy' sort.selected.key) items) as |sorted|}}
<ChangeableSet @dispatcher={{searchable 'policy' sorted}} @terms={{search}}>
<BlockSlot @name="set" as |filtered|>
<ConsulPolicyList
@items={{sort-by "CreateTime:desc" "Name:asc" filtered}}
@items={{filtered}}
@ondelete={{action send 'delete'}}
/>
</BlockSlot>
@ -76,5 +92,7 @@
</EmptyState>
</BlockSlot>
</ChangeableSet>
{{/let}}
</BlockSlot>
</AppView>
{{/let}}

15
ui-v2/tests/acceptance/dc/acls/policies/navigation.feature Normal file
View File

@ -0,0 +1,15 @@
@setupApplicationTest
Feature: dc / policies / navigation
Scenario: Clicking a policy in the listing and back again
Given 1 datacenter model with the value "dc-1"
And 3 policy models
When I visit the policies page for yaml
---
dc: dc-1
---
Then the url should be /dc-1/acls/policies
And the title should be "Policies - Consul"
Then I see 3 policy models
When I click policy on the policies
And I click "[data-test-back]"
Then the url should be /dc-1/acls/policies

36
ui-v2/tests/acceptance/dc/acls/policies/sorting.feature Normal file
View File

@ -0,0 +1,36 @@
@setupApplicationTest
Feature: dc / acls / policies / sorting
Scenario: Sorting Policies
Given 1 datacenter model with the value "dc-1"
And 4 policy models from yaml
---
- Name: "system-A"
- Name: "system-D"
- Name: "system-C"
- Name: "system-B"
---
When I visit the policies page for yaml
---
dc: dc-1
---
Then the url should be /dc-1/acls/policies
Then I see 4 policy models
When I click selected on the sort
When I click options.1.button on the sort
Then I see name on the policies vertically like yaml
---
- "system-D"
- "system-C"
- "system-B"
- "system-A"
---
When I click selected on the sort
When I click options.0.button on the sort
Then I see name on the policies vertically like yaml
---
- "system-A"
- "system-B"
- "system-C"
- "system-D"
---

6
ui-v2/tests/acceptance/page-navigation.feature
View File

@ -46,11 +46,7 @@ Feature: page-navigation
| node | nodes | /dc-1/nodes/node-0/health-checks | /v1/session/node/node-0?dc=dc-1&ns=@namespace | /dc-1/nodes |
| kv | kvs | /dc-1/kv/0-key-value/edit | /v1/session/info/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=dc-1&ns=@namespace | /dc-1/kv |
# | acl | acls | /dc-1/acls/anonymous | /v1/acl/info/anonymous?dc=dc-1 | /dc-1/acls |
# These Endpoints will be datacenters due to the datacenters checkbox selectors | /dc-1/acls/tokens |
| policy | policies | /dc-1/acls/policies/ee52203d-989f-4f7a-ab5a-2bef004164ca | /v1/catalog/datacenters | /dc-1/acls/policies |
# | token | tokens | /dc-1/acls/tokens/00000000-0000-0000-0000-000000000000 | /v1/acl/token/00000000-0000-0000-0000-000000000000?dc=dc-1 | /dc-1/acls/tokens |
# | policy | policies | /dc-1/acls/policies/ee52203d-989f-4f7a-ab5a-2bef004164ca | /v1/acl/policy/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=dc-1 | /dc-1/acls/policies |
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Scenario: The node detail page calls the correct API endpoints
When I visit the node page for yaml
---

10
ui-v2/tests/acceptance/steps/dc/acls/policies/navigation-steps.js Normal file
View File

@ -0,0 +1,10 @@
import steps from '../../../steps';
// step definitions that are shared between features should be moved to the
// tests/acceptance/steps/steps.js file
export default function(assert) {
return steps(assert).then('I should find a file', function() {
assert.ok(true, this.step);
});
}

10
ui-v2/tests/acceptance/steps/dc/acls/policies/sorting-steps.js Normal file
View File

@ -0,0 +1,10 @@
import steps from '../../../steps';
// step definitions that are shared between features should be moved to the
// tests/acceptance/steps/steps.js file
export default function(assert) {
return steps(assert).then('I should find a file', function() {
assert.ok(true, this.step);
});
}

2
ui-v2/tests/pages.js
View File

@ -168,7 +168,7 @@ export default {
kv: create(kv(visitable, attribute, submitable, deletable, cancelable, clickable)),
acls: create(acls(visitable, deletable, creatable, clickable, attribute, collection, aclFilter)),
acl: create(acl(visitable, submitable, deletable, cancelable, clickable)),
policies: create(policies(visitable, creatable, consulPolicyList, freetextFilter)),
policies: create(policies(visitable, creatable, consulPolicyList, popoverSelect)),
policy: create(policy(visitable, submitable, deletable, cancelable, clickable, tokenList)),
roles: create(roles(visitable, creatable, consulRoleList, popoverSelect)),
// TODO: This needs a policyList

4
ui-v2/tests/pages/dc/acls/policies/index.js
View File

@ -1,7 +1,7 @@
export default function(visitable, creatable, policies, filter) {
export default function(visitable, creatable, policies, popoverSelect) {
return creatable({
visit: visitable('/:dc/acls/policies'),
policies: policies(),
filter: filter(),
sort: popoverSelect(),
});
}