From 6d3a74ac30ffc5e3670f72e64325ec61b0305a46 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Fri, 10 Jan 2020 11:44:32 -0700 Subject: [PATCH 1/7] add catch for fail on save. isError is not being set to true, so set it in the catch --- ui/app/components/secret-edit.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 96d224497d0b..a5ed102a3bd3 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -309,6 +309,9 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { this.persistKey(() => { this.transitionToRoute(SHOW_ROUTE, this.model.path || this.model.id); + }).catch((error) => { + this.set('model.isError', true) + this.set('model.adapterError', error); }); }, From 65951f4f1860e4ea1347ed2a112c2cb9f7c30ecc Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Fri, 10 Jan 2020 12:14:03 -0700 Subject: [PATCH 2/7] add conditionally to only catch 403 permission errors. Otherwise it will catch and return an unhelpful error message for when you are trying to save a duplicate secret --- ui/app/components/secret-edit.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index a5ed102a3bd3..cb641ea4e629 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -310,8 +310,10 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { this.persistKey(() => { this.transitionToRoute(SHOW_ROUTE, this.model.path || this.model.id); }).catch((error) => { - this.set('model.isError', true) - this.set('model.adapterError', error); + if(error.httpStatus === 403){ + this.set('model.isError', true) + this.set('model.adapterError', error); + } }); }, From a2b3ab5cf2e496fabf5aceb297183f3fe5238b27 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Fri, 10 Jan 2020 12:32:05 -0700 Subject: [PATCH 3/7] add in code comment --- ui/app/components/secret-edit.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index cb641ea4e629..94bcbc070bf3 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -310,6 +310,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { this.persistKey(() => { this.transitionToRoute(SHOW_ROUTE, this.model.path || this.model.id); }).catch((error) => { + // if 403 returns it's a permissions denied error and we have to manually set the error if(error.httpStatus === 403){ this.set('model.isError', true) this.set('model.adapterError', error); From 844808c6a337ec9f661235e1f04ba80632bda672 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Mon, 13 Jan 2020 09:04:51 -0700 Subject: [PATCH 4/7] remove catch and pass version 2 secret model to Error handler inside template --- ui/app/components/secret-edit.js | 6 ------ ui/app/templates/partials/secret-form-create.hbs | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 94bcbc070bf3..96d224497d0b 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -309,12 +309,6 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { this.persistKey(() => { this.transitionToRoute(SHOW_ROUTE, this.model.path || this.model.id); - }).catch((error) => { - // if 403 returns it's a permissions denied error and we have to manually set the error - if(error.httpStatus === 403){ - this.set('model.isError', true) - this.set('model.adapterError', error); - } }); }, diff --git a/ui/app/templates/partials/secret-form-create.hbs b/ui/app/templates/partials/secret-form-create.hbs index 4f427b823b1b..3470343406df 100644 --- a/ui/app/templates/partials/secret-form-create.hbs +++ b/ui/app/templates/partials/secret-form-create.hbs @@ -1,7 +1,7 @@
- +

{{input From e75371e5b8747d227bae56549e1fc8241c705dae Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 14 Jan 2020 09:23:11 -0700 Subject: [PATCH 5/7] replace Error model with modelForData to catch errors on the correct model --- ui/app/helpers/has-permission.js | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/app/helpers/has-permission.js b/ui/app/helpers/has-permission.js index 0e5ae43c654c..3b4c7be9aec5 100644 --- a/ui/app/helpers/has-permission.js +++ b/ui/app/helpers/has-permission.js @@ -17,7 +17,6 @@ export default Helper.extend({ compute([route], params) { let { routeParams } = params; let permissions = this.permissions; - return permissions.hasNavPermission(route, routeParams); }, }); From a4ab4b0b5fe3c8403cd887cd4555b7597f77b635 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 14 Jan 2020 09:28:22 -0700 Subject: [PATCH 6/7] add back in space --- ui/app/helpers/has-permission.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/app/helpers/has-permission.js b/ui/app/helpers/has-permission.js index 3b4c7be9aec5..0e5ae43c654c 100644 --- a/ui/app/helpers/has-permission.js +++ b/ui/app/helpers/has-permission.js @@ -17,6 +17,7 @@ export default Helper.extend({ compute([route], params) { let { routeParams } = params; let permissions = this.permissions; + return permissions.hasNavPermission(route, routeParams); }, }); From 2dbed1833c56f33f47888736d6986d382a3dd1a5 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 14 Jan 2020 09:35:12 -0700 Subject: [PATCH 7/7] replace error model with modelForData --- ui/app/templates/partials/secret-form-edit.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/templates/partials/secret-form-edit.hbs b/ui/app/templates/partials/secret-form-edit.hbs index c2958e0402de..af6f9b55780b 100644 --- a/ui/app/templates/partials/secret-form-edit.hbs +++ b/ui/app/templates/partials/secret-form-edit.hbs @@ -1,6 +1,6 @@

- + {{#if (and (not model.failedServerRead) (not model.selectedVersion.failedServerRead) (not-eq model.selectedVersion.version model.currentVersion))}}