1 files changed, 20 insertions, 14 deletions

diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index dd135eaee3b..69c41af97ab 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -17,8 +17,7 @@ import { containsSensitiveToken, confirmSensitiveAction } from '~/lib/utils/secr
 import eventHub from '../event_hub';
 import noteable from '../mixins/noteable';
 import resolvable from '../mixins/resolvable';
-import { renderMarkdown } from '../utils';
-import { UPDATE_COMMENT_FORM } from '../i18n';
+import { renderMarkdown, updateNoteErrorMessage } from '../utils';
 import {
   getStartLineNumber,
   getEndLineNumber,
@@ -114,7 +113,6 @@ export default {
       isResolving: false,
       commentLineStart: {},
       resolveAsThread: true,
-      oldContent: this.note.note_html,
     };
   },
   computed: {
@@ -212,7 +210,8 @@ export default {
       return fileResolvedFromAvailableSource || null;
     },
     isMRDiffView() {
-      return this.line && !this.isOverviewTab;
+      const isFileComment = this.note.position?.position_type === 'file';
+      return !this.isOverviewTab && (this.line || isFileComment);
     },
   },
   created() {
@@ -295,7 +294,7 @@ export default {
     updateSuccess() {
       this.isEditing = false;
       this.isRequesting = false;
-      this.oldContent = this.note.note_html;
+      this.oldContent = null;
       renderGFM(this.$refs.noteBody.$el);
       this.$emit('updateSuccess');
     },
@@ -317,7 +316,9 @@ export default {
         noteText,
         resolveDiscussion,
         position,
+        flashContainer: this.$el,
         callback: () => this.updateSuccess(),
+        errorCallback: () => callback(),
       });
 
       if (this.isDraft) return;
@@ -343,6 +344,7 @@ export default {
       // https://gitlab.com/gitlab-org/gitlab/-/issues/298827
       if (!isEmpty(position)) data.note.note.position = JSON.stringify(position);
       this.isRequesting = true;
+      this.oldContent = this.note.note_html;
       // eslint-disable-next-line vue/no-mutating-props
       this.note.note_html = renderMarkdown(noteText);
 
@@ -369,14 +371,8 @@ export default {
         });
     },
     handleUpdateError(e) {
-      const serverErrorMessage = e?.response?.data?.errors;
-
-      const alertMessage = serverErrorMessage
-        ? sprintf(UPDATE_COMMENT_FORM.error, { reason: serverErrorMessage.toLowerCase() }, false)
-        : UPDATE_COMMENT_FORM.defaultError;
-
       createAlert({
-        message: alertMessage,
+        message: updateNoteErrorMessage(e),
         parent: this.$el,
       });
     },
@@ -442,7 +438,12 @@ export default {
     </div>
 
     <div v-if="isMRDiffView" class="timeline-avatar gl-float-left gl-pt-2">
-      <gl-avatar-link :href="author.path">
+      <gl-avatar-link
+        :href="author.path"
+        :data-user-id="author.id"
+        :data-username="author.username"
+        class="js-user-link"
+      >
         <gl-avatar
           :src="author.avatar_url"
           :entity-name="author.username"
@@ -455,7 +456,12 @@ export default {
     </div>
 
     <div v-else class="timeline-avatar gl-float-left">
-      <gl-avatar-link :href="author.path">
+      <gl-avatar-link
+        :href="author.path"
+        :data-user-id="author.id"
+        :data-username="author.username"
+        class="js-user-link"
+      >
         <gl-avatar
           :src="author.avatar_url"
           :entity-name="author.username"