Fixed resolvable discussions bugs

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

@@ -32,11 +32,7 @@ export default {
         }
       }
 
-      if (
-        window.gon?.features?.paginatedNotes &&
-        note.base_discussion &&
-        type === constants.DIFF_NOTE
-      ) {
+      if (window.gon?.features?.paginatedNotes && note.base_discussion) {
         if (discussion.diff_file) {
           discussion.file_hash = discussion.diff_file.file_hash;
 
@@ -45,7 +41,8 @@ export default {
           );
         }
 
-        discussion.expanded = note.expanded;
+        discussion.resolvable = note.resolvable;
+        discussion.expanded = note.base_discussion.expanded;
         discussion.resolved = note.resolved;
       }
 

spec/frontend/notes/stores/actions_spec.js

@@ -291,6 +291,7 @@ describe('Actions Notes Store', () => {
           [
             { type: 'updateOrCreateNotes', payload: discussionMock.notes },
             { type: 'startTaskList' },
+            { type: 'updateResolvableDiscussionsCounts' },
           ],
         ));
     });
@@ -324,6 +325,7 @@ describe('Actions Notes Store', () => {
             { type: 'setLoadingState', payload: false },
             { type: 'updateOrCreateNotes', payload: discussionMock.notes },
             { type: 'startTaskList' },
+            { type: 'updateResolvableDiscussionsCounts' },
           ],
         );
       });