Merge branch 'note-header-ee-differences' into 'master'

Move EE differences in CE diff files into CE

Closes gitlab-ee#9969, gitlab-ee#9973, and gitlab-ee#9974

See merge request gitlab-org/gitlab-ce!25678

app/assets/javascripts/notes/components/note_header.vue

@@ -69,7 +69,7 @@ export default {
         type="button"
         @click="handleToggle"
       >
-        <i :class="toggleChevronClass" class="fa" aria-hidden="true"> </i>
+        <i :class="toggleChevronClass" class="fa" aria-hidden="true"></i>
         {{ __('Toggle discussion') }}
       </button>
     </div>
@@ -81,19 +81,18 @@ export default {
       :data-user-id="author.id"
       :data-username="author.username"
     >
+      <slot name="note-header-info"></slot>
       <span class="note-header-author-name">{{ author.name }}</span>
       <span v-if="author.status_tooltip_html" v-html="author.status_tooltip_html"></span>
-      <span class="note-headline-light"> @{{ author.username }} </span>
+      <span class="note-headline-light">@{{ author.username }}</span>
     </a>
-    <span v-else> {{ __('A deleted user') }} </span>
+    <span v-else>{{ __('A deleted user') }}</span>
     <span class="note-headline-light">
       <span class="note-headline-meta">
         <span class="system-note-message"> <slot></slot> </span>
         <template v-if="createdAt">
           <span class="system-note-separator">
-            <template v-if="actionText">
-              {{ actionText }}
-            </template>
+            <template v-if="actionText">{{ actionText }}</template>
           </span>
           <a
             :href="noteTimestampLink"
@@ -107,8 +106,7 @@ export default {
           class="fa fa-spinner fa-spin editing-spinner"
           aria-label="Comment is being updated"
           aria-hidden="true"
-        >
-        </i>
+        ></i>
       </span>
     </span>
   </div>

app/assets/javascripts/notes/mixins/resolvable.js

@@ -31,6 +31,10 @@ export default {
   },
   methods: {
     resolveHandler(resolvedState = false) {
+      if (this.note && this.note.isDraft) {
+        return this.$emit('toggleResolveStatus');
+      }
+
       this.isResolving = true;
       const isResolved = this.discussionResolved || resolvedState;
       const discussion = this.resolveAsThread;

app/assets/javascripts/notes/stores/getters.js

@@ -191,6 +191,9 @@ export const firstUnresolvedDiscussionId = (state, getters) => diffOrder => {
   return getters.unresolvedDiscussionsIdsByDate[0];
 };
 
+export const getDiscussion = state => discussionId =>
+  state.discussions.find(discussion => discussion.id === discussionId);
+
 export const commentsDisabled = state => state.commentsDisabled;
 
 // prevent babel-plugin-rewire from generating an invalid default during karma tests

spec/javascripts/notes/stores/getters_spec.js

@@ -261,4 +261,12 @@ describe('Getters Notes Store', () => {
       expect(getters.firstUnresolvedDiscussionId(state, localGettersFalsy)(false)).toBeFalsy();
     });
   });
+
+  describe('getDiscussion', () => {
+    it('returns discussion by ID', () => {
+      state.discussions.push({ id: '1' });
+
+      expect(getters.getDiscussion(state)('1')).toEqual({ id: '1' });
+    });
+  });
 });