-
+
{{i-con glyph="folder" size=14 class="has-text-grey-light"}} {{backend.path}}
@@ -90,14 +97,19 @@
-
+ {{#popup-menu name="engine-menu"}}
+
+ {{/popup-menu}}
- {{#if (get this (concat backend.accessor '-open'))}}
- {{partial "partials/backend-details"}}
- {{/if}}
{{/each}}
diff --git a/ui/app/utils/field-to-attrs.js b/ui/app/utils/field-to-attrs.js
index 723b769577..812d71d2da 100644
--- a/ui/app/utils/field-to-attrs.js
+++ b/ui/app/utils/field-to-attrs.js
@@ -42,11 +42,12 @@ export const expandAttributeMeta = function(modelClass, attributeNames, namePref
let attributeMap = map || new Map();
modelClass.eachAttribute((name, meta) => {
let fieldName = namePrefix ? namePrefix + name : name;
- if (meta.isFragment) {
+ let maybeFragment = Ember.get(modelClass, fieldName);
+ if (meta.isFragment && maybeFragment) {
// pass the fragment and all fields that start with
// the fragment name down to get extracted from the Fragment
expandAttributeMeta(
- Ember.get(modelClass, fieldName),
+ maybeFragment,
fields.filter(f => f.startsWith(fieldName)),
fieldName + '.',
attributeMap
@@ -60,13 +61,15 @@ export const expandAttributeMeta = function(modelClass, attributeNames, namePref
// so we'll replace each key in `fields` with the expanded meta
fields = fields.map(field => {
let meta = attributeMap.get(field);
- const { type, options } = meta;
+ if (meta) {
+ var { type, options } = meta;
+ }
return {
// using field name here because it is the full path,
// name on the attribute meta will be relative to the fragment it's on
name: field,
- type,
- options,
+ type: type,
+ options: options,
};
});
return fields;
diff --git a/ui/tests/acceptance/settings-test.js b/ui/tests/acceptance/settings-test.js
index 9f0345f722..fba94b0c82 100644
--- a/ui/tests/acceptance/settings-test.js
+++ b/ui/tests/acceptance/settings-test.js
@@ -1,5 +1,6 @@
import { test } from 'qunit';
import moduleForAcceptance from 'vault/tests/helpers/module-for-acceptance';
+import backendListPage from 'vault/tests/pages/secrets/backends';
moduleForAcceptance('Acceptance | settings', {
beforeEach() {
@@ -36,14 +37,19 @@ test('settings', function(assert) {
find('[data-test-flash-message]').text().trim(),
`Successfully mounted '${type}' at '${path}'!`
);
+ let row = backendListPage.rows().findByPath(path);
+ row.menu();
+ });
+
+ andThen(() => {
+ backendListPage.configLink();
});
- //show mount details
- click(`[data-test-secret-backend-row="${path}"] [data-test-secret-backend-detail]`);
andThen(() => {
assert.ok(
- find('[data-test-secret-backend-details="default-ttl"]').text().match(/100/),
- 'displays the input ttl'
+ currentURL(),
+ '/vault/secrets/${path}/configuration',
+ 'navigates to the config page'
);
});
});
diff --git a/ui/tests/acceptance/settings/mount-secret-backend-test.js b/ui/tests/acceptance/settings/mount-secret-backend-test.js
index fd9e85a8c3..2b761bf7c1 100644
--- a/ui/tests/acceptance/settings/mount-secret-backend-test.js
+++ b/ui/tests/acceptance/settings/mount-secret-backend-test.js
@@ -1,7 +1,7 @@
import { test } from 'qunit';
import moduleForAcceptance from 'vault/tests/helpers/module-for-acceptance';
import page from 'vault/tests/pages/settings/mount-secret-backend';
-import listPage from 'vault/tests/pages/secrets/backends';
+import configPage from 'vault/tests/pages/secrets/backend/configuration';
moduleForAcceptance('Acceptance | settings/mount-secret-backend', {
beforeEach() {
@@ -30,13 +30,9 @@ test('it sets the ttl corrects when mounting', function(assert) {
.maxTTLUnit('h')
.submit();
- listPage.visit();
+ configPage.visit({backend: path});
andThen(() => {
- listPage.links().findByPath(path).toggleDetails();
- });
- andThen(() => {
- const details = listPage.links().findByPath(path);
- assert.equal(details.defaultTTL, defaultTTLSeconds, 'shows the proper TTL');
- assert.equal(details.maxTTL, maxTTLSeconds, 'shows the proper max TTL');
+ assert.equal(configPage.defaultTTL, defaultTTLSeconds, 'shows the proper TTL');
+ assert.equal(configPage.maxTTL, maxTTLSeconds, 'shows the proper max TTL');
});
});
diff --git a/ui/tests/pages/secrets/backend/configuration.js b/ui/tests/pages/secrets/backend/configuration.js
new file mode 100644
index 0000000000..be630bc0e0
--- /dev/null
+++ b/ui/tests/pages/secrets/backend/configuration.js
@@ -0,0 +1,7 @@
+import { create, visitable, text } from 'ember-cli-page-object';
+
+export default create({
+ visit: visitable('/vault/secrets/:backend/configuration'),
+ defaultTTL: text('[data-test-row-value="Default Lease TTL"]'),
+ maxTTL: text('[data-test-row-value="Max Lease TTL"]'),
+});
diff --git a/ui/tests/pages/secrets/backends.js b/ui/tests/pages/secrets/backends.js
index 9e3ac18997..824539b4c7 100644
--- a/ui/tests/pages/secrets/backends.js
+++ b/ui/tests/pages/secrets/backends.js
@@ -1,17 +1,16 @@
-import { create, visitable, collection, text, clickable } from 'ember-cli-page-object';
+import { create, visitable, collection, clickable, text } from 'ember-cli-page-object';
export default create({
visit: visitable('/vault/secrets'),
- links: collection({
- itemScope: '[data-test-secret-backend-link]',
+ rows: collection({
+ itemScope: '[data-test-secret-backend-row]',
item: {
path: text('[data-test-secret-path]'),
- toggleDetails: clickable('[data-test-secret-backend-detail]'),
- defaultTTL: text('[data-test-secret-backend-details="default-ttl"]'),
- maxTTL: text('[data-test-secret-backend-details="max-ttl"]'),
+ menu: clickable('[data-test-popup-menu-trigger]'),
},
findByPath(path) {
return this.toArray().findBy('path', path + '/');
},
}),
+ configLink: clickable('[data-test-engine-config]'),
});