From c352e7e1621dfb3de97518eb46ca513503995ccf Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 29 Jan 2019 01:36:31 +0100
Subject: [PATCH] Some cleanup and improvements on frontent logic

---
 app/assets/javascripts/issue_show/components/app.vue | 12 +++++++-----
 .../issue_show/components/description.vue            |  2 +-
 locale/gitlab.pot                                    |  5 ++++-
 .../issue_show/components/description_spec.js        |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue
index c2c80218a87..5dbe206c6f9 100644
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -1,5 +1,6 @@
 <script>
 import Visibility from 'visibilityjs';
+import { s__, sprintf } from '~/locale';
 import { visitUrl } from '../../lib/utils/url_utility';
 import Poll from '../../lib/utils/poll';
 import eventHub from '../event_hub';
@@ -166,6 +167,9 @@ export default {
       const titleChanged = this.initialTitleText !== this.store.formState.title;
       return descriptionChanged || titleChanged;
     },
+    defaultErrorMessage() {
+      return sprintf(s__('Error updating  %{issuableType}.'), { issuableType: this.issuableType });
+    },
   },
   created() {
     this.service = new Service(this.endpoint);
@@ -220,9 +224,7 @@ export default {
           this.store.updateState(data);
         })
         .catch(() => {
-          const errMsg = `Error updating ${this.issuableType}`;
-
-          window.Flash(errMsg);
+          window.Flash(this.defaultErrorMessage);
         });
     },
 
@@ -260,10 +262,10 @@ export default {
           if (error && error.name === 'SpamError') {
             this.openRecaptcha();
           } else {
-            let errMsg = `Error updating ${this.issuableType}`;
+            let errMsg = this.defaultErrorMessage;
 
             if (error && error.response && error.response.data && error.response.data.errors) {
-              errMsg = error.response.data.errors;
+              errMsg += error.response.data.errors.join(' ');
             }
 
             eventHub.$emit('close.form');
diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue
index f42787a7147..e664269b199 100644
--- a/app/assets/javascripts/issue_show/components/description.vue
+++ b/app/assets/javascripts/issue_show/components/description.vue
@@ -93,7 +93,7 @@ export default {
     taskListUpdateError() {
       window.Flash(
         __(
-          'Someone edited this issue at the same time you did and we updated the issue description.',
+          'Someone edited this issue at the same time you did. The description has been updated and you will need to make your changes again.',
         ),
       );
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 0f50d797c69..74846562fb5 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3040,6 +3040,9 @@ msgstr ""
 msgid "Error saving label update."
 msgstr ""
 
+msgid "Error updating  %{issuableType}"
+msgstr ""
+
 msgid "Error updating status for all todos."
 msgstr ""
 
@@ -6527,7 +6530,7 @@ msgstr ""
 msgid "Snippets"
 msgstr ""
 
-msgid "Someone edited this issue at the same time you did and we updated the issue description."
+msgid "Someone edited this issue at the same time you did. The description has been updated and you will need to make your changes again."
 msgstr ""
 
 msgid "Something went wrong on our end"
diff --git a/spec/javascripts/issue_show/components/description_spec.js b/spec/javascripts/issue_show/components/description_spec.js
index b6833079e6e..72716b97f5f 100644
--- a/spec/javascripts/issue_show/components/description_spec.js
+++ b/spec/javascripts/issue_show/components/description_spec.js
@@ -191,7 +191,7 @@ describe('Description component', () => {
   describe('taskListUpdateError', () => {
     it('should create flash notification and emit an event to parent', () => {
       const msg =
-        'Someone edited this issue at the same time you did and we updated the issue description.';
+        'Someone edited this issue at the same time you did. The description has been updated and you will need to make your changes again.';
       spyOn(window, 'Flash');
       spyOn(vm, '$emit');