Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

reset pageFilter when the model changes #6511

Merged
merged 4 commits into from
Apr 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ui/app/routes/vault/cluster/secrets/backend/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ export default Route.extend({
resetController(controller, isExiting) {
this._super(...arguments);
if (isExiting) {
controller.set('filter', '');
controller.set('pageFilter', null);
controller.set('filter', null);
}
},

Expand Down
3 changes: 2 additions & 1 deletion ui/app/templates/components/key-value-header.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<li class="{{if (is-active-route path.path path.model isExact=true) 'is-active'}}">
<span class="sep">&#x0002f;</span>
{{#if linkToPaths}}
{{#link-to params=(array path.path path.model) data-test-secret-root-link=(if (eq index 0) true false)}}
{{#link-to params=(array path.path path.model) data-test-secret-root-link=(if (eq index 0) true false) data-test-secret-breadcrumb=path.text}}

{{path.text}}
{{/link-to}}
{{else}}
Expand Down
1 change: 1 addition & 0 deletions ui/app/templates/vault/cluster/secrets/backend/list.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
shouldNavigateTree=options.navigateTree
placeholder=options.searchPlaceholder
mode=(if (eq tab 'certs') 'secrets-cert' 'secrets')
data-test-nav-input=true
}}
{{#if filterFocused}}
{{#if filterMatchesKey}}
Expand Down
18 changes: 18 additions & 0 deletions ui/tests/acceptance/secrets/backend/kv/secret-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,4 +317,22 @@ module('Acceptance | secrets/secret/create', function(hooks) {
`${path}: show page renders correctly`
);
});

test('filter clears on nav', async function(assert) {
await consoleComponent.runCommands([
'vault write sys/mounts/test type=kv',
'refresh',
'vault write test/filter/foo keys=a keys=b',
'vault write test/filter/foo1 keys=a keys=b',
'vault write test/filter/foo2 keys=a keys=b',
]);
await listPage.visit({ backend: 'test', id: 'filter' });
assert.equal(listPage.secrets.length, 3, 'renders three secrets');
await listPage.filterInput('filter/foo1');
assert.equal(listPage.secrets.length, 1, 'renders only one secret');
await listPage.secrets[0].click();
await showPage.breadcrumbs.filterBy('text', 'filter')[0].click();
assert.equal(listPage.secrets.length, 3, 'renders three secrets');
assert.equal(listPage.filterInputValue, 'filter/', 'pageFilter has been reset');
});
});
5 changes: 4 additions & 1 deletion ui/tests/pages/secrets/backend/kv/show.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { Base } from '../show';
import { create, clickable, collection, isPresent } from 'ember-cli-page-object';
import { create, clickable, collection, isPresent, text } from 'ember-cli-page-object';
import { code } from 'vault/tests/pages/helpers/codemirror';

export default create({
...Base,
breadcrumbs: collection('[data-test-secret-breadcrumb]', {
text: text(),
}),
deleteBtn: clickable('[data-test-secret-delete] button'),
confirmBtn: clickable('[data-test-confirm-button]'),
rows: collection('data-test-row-label'),
Expand Down
13 changes: 12 additions & 1 deletion ui/tests/pages/secrets/backend/list.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
import { create, collection, text, visitable, clickable, isPresent } from 'ember-cli-page-object';
import {
create,
collection,
fillable,
text,
visitable,
value,
clickable,
isPresent,
} from 'ember-cli-page-object';
import { getter } from 'ember-cli-page-object/macros';

export default create({
Expand All @@ -9,6 +18,8 @@ export default create({
configure: clickable('[data-test-secret-backend-configure]'),
configureIsPresent: isPresent('[data-test-secret-backend-configure]'),
tabs: collection('[data-test-tab]'),
filterInput: fillable('[data-test-nav-input] input'),
filterInputValue: value('[data-test-nav-input] input'),
secrets: collection('[data-test-secret-link]', {
menuToggle: clickable('[data-test-popup-menu-trigger]'),
id: text(),
Expand Down