Skip to content

Commit

Permalink
UI - kv save error (#6022)
Browse files Browse the repository at this point in the history
* don't prevent model save when the model is in the error state on secrets creation

* add test
  • Loading branch information
meirish authored Jan 10, 2019
1 parent fe5d47e commit 8da2e1e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
9 changes: 1 addition & 8 deletions ui/app/components/secret-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, {

requestInFlight: or('model.isLoading', 'model.isReloading', 'model.isSaving'),

buttonDisabled: or(
'requestInFlight',
'model.isFolder',
'model.isError',
'model.flagsIsInvalid',
'hasLintError',
'error'
),
buttonDisabled: or('requestInFlight', 'model.isFolder', 'model.flagsIsInvalid', 'hasLintError', 'error'),

modelForData: computed('isV2', 'model', function() {
return this.isV2 ? this.model.belongsTo('selectedVersion').value() : this.model;
Expand Down
14 changes: 14 additions & 0 deletions ui/tests/integration/components/secret-edit-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@ module('Integration | Component | secret edit', function(hooks) {
assert.dom('[data-test-error]').includesText('Vault expects data to be formatted as an JSON object');
});

test('it allows saving when the model isError', async function(assert) {
this.set('mode', 'create');
this.set('model', {
isError: true,
secretData: {
int: '2',
null: 'null',
float: '1.234',
},
});
await render(hbs`<SecretEdit @mode={{mode}} @model={{model}} />`);
assert.dom('[data-test-secret-save]').isNotDisabled();
});

test('it shows an error when editing and the data is not an object', async function(assert) {
this.set('mode', 'edit');
capabilities = {
Expand Down

0 comments on commit 8da2e1e

Please sign in to comment.