From 15cc30507d3c670b87c2c8b10c02daa5bcf005b4 Mon Sep 17 00:00:00 2001
From: Angel Garbarino <Monkeychip@users.noreply.github.com>
Date: Thu, 16 Jan 2020 16:55:18 -0700
Subject: [PATCH] Show permissions error on KV when you don't have access to
 create a secret (#8133) (#8170)

* add catch for fail on save.  isError is not being set to true, so set it in the catch

* 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

* add in code comment

* remove catch and pass version 2 secret model to Error handler inside template

* replace Error model with modelForData to catch errors on the correct model

* add back in space

* replace error model with modelForData
---
 ui/app/templates/partials/secret-form-create.hbs | 2 +-
 ui/app/templates/partials/secret-form-edit.hbs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 @@
 <form class="{{if showAdvancedMode 'advanced-edit' 'simple-edit'}}" onsubmit={{action "createOrUpdateKey" "create"}}>
   <div class="field box is-fullwidth is-sideless is-marginless">
     <NamespaceReminder @mode="create" @noun="secret" />
-    <MessageError @model={{model}} @errorMessage={{error}} />
+    <MessageError @model={{modelForData}} @errorMessage={{error}} />
     <label class="is-label" for="kv-key">Path for this secret</label>
     <p class="control is-expanded">
       {{input 
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 @@
 <form onsubmit={{action "createOrUpdateKey" "update"}}>
   <div class="box is-sideless is-fullwidth is-marginless is-paddingless">
-    <MessageError @model={{model}} @errorMessage={{error}} />
+    <MessageError @model={{modelForData}} @errorMessage={{error}} />
     <NamespaceReminder @mode="edit" @noun="secret" />
     {{#if (and (not model.failedServerRead) (not model.selectedVersion.failedServerRead) (not-eq model.selectedVersion.version model.currentVersion))}}
       <div class="form-section">