Renamed convertedNotes to convertedDisscussionIds30299-fix-reply-polling-and-resolvable-status

This is to improve the ease of comprehending the data stored
in convertedDisscussionIds

6 files changed, 13 insertions, 11 deletions

diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index d6901778dd4..ded084e9b10 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -93,7 +93,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'convertedNotes',
+      'convertedDisscussionIds',
       'getNoteableData',
       'nextUnresolvedDiscussionId',
       'unresolvedDiscussionsCount',
@@ -302,7 +302,7 @@ export default {
         note: { note: noteText },
       };
 
-      if (this.convertedNotes.includes(this.discussion.id)) {
+      if (this.convertedDisscussionIds.includes(this.discussion.id)) {
         postData.return_discussion = true;
       }
 
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue
index 06d814c1e48..9eb69dd91ae 100644
--- a/app/assets/javascripts/notes/components/notes_app.vue
+++ b/app/assets/javascripts/notes/components/notes_app.vue
@@ -60,7 +60,7 @@ export default {
     ...mapGetters([
       'isNotesFetched',
       'discussions',
-      'convertedNotes',
+      'convertedDisscussionIds',
       'getNotesDataByProp',
       'isLoading',
       'commentsDisabled',
@@ -194,7 +194,9 @@ export default {
           />
           <placeholder-note v-else :key="discussion.id" :note="discussion.notes[0]" />
         </template>
-        <template v-else-if="discussion.individual_note && !convertedNotes.includes(discussion.id)">
+        <template
+          v-else-if="discussion.individual_note && !convertedDisscussionIds.includes(discussion.id)"
+        >
           <system-note
             v-if="discussion.notes[0].system"
             :key="discussion.id"
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js
index 8d6d6f5d718..5026c13dab5 100644
--- a/app/assets/javascripts/notes/stores/getters.js
+++ b/app/assets/javascripts/notes/stores/getters.js
@@ -4,7 +4,7 @@ import { collapseSystemNotes } from './collapse_utils';
 
 export const discussions = state => collapseSystemNotes(state.discussions);
 
-export const convertedNotes = state => state.convertedNotes;
+export const convertedDisscussionIds = state => state.convertedDisscussionIds;
 
 export const targetNoteHash = state => state.targetNoteHash;
 
diff --git a/app/assets/javascripts/notes/stores/modules/index.js b/app/assets/javascripts/notes/stores/modules/index.js
index 0272895b613..6168aeae35d 100644
--- a/app/assets/javascripts/notes/stores/modules/index.js
+++ b/app/assets/javascripts/notes/stores/modules/index.js
@@ -5,7 +5,7 @@ import mutations from '../mutations';
 export default () => ({
   state: {
     discussions: [],
-    convertedNotes: [],
+    convertedDisscussionIds: [],
     targetNoteHash: null,
     lastFetchedAt: null,
 
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index d2f970a7462..23ef843bb75 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -266,7 +266,7 @@ export default {
   },
 
   [types.CONVERT_TO_DISCUSSION](state, discussionId) {
-    const convertedNotes = [...state.convertedNotes, discussionId];
-    Object.assign(state, { convertedNotes });
+    const convertedDisscussionIds = [...state.convertedDisscussionIds, discussionId];
+    Object.assign(state, { convertedDisscussionIds });
   },
 };
diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/notes/stores/mutation_spec.js
index abfcd75daae..88c40dbc5ea 100644
--- a/spec/javascripts/notes/stores/mutation_spec.js
+++ b/spec/javascripts/notes/stores/mutation_spec.js
@@ -527,13 +527,13 @@ describe('Notes Store mutations', () => {
         id: 42,
         individual_note: true,
       };
-      state = { convertedNotes: [] };
+      state = { convertedDisscussionIds: [] };
     });
 
-    it('adds a note to convertedNotes', () => {
+    it('adds a disucssion to convertedDisscussionIds', () => {
       mutations.CONVERT_TO_DISCUSSION(state, discussion.id);
 
-      expect(state.convertedNotes).toContain(discussion.id);
+      expect(state.convertedDisscussionIds).toContain(discussion.id);
     });
   });
 });