Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 12 insertions, 3 deletions

diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js
index d2b798245fc..5e7fe8b5cd8 100644
--- a/app/assets/javascripts/diffs/store/mutations.js
+++ b/app/assets/javascripts/diffs/store/mutations.js
@@ -15,6 +15,7 @@ import {
   prepareDiffData,
   isDiscussionApplicableToLine,
   updateLineInFile,
+  markTreeEntriesLoaded,
 } from './utils';
 
 function updateDiffFilesInState(state, files) {
@@ -33,6 +34,7 @@ export default {
       endpoint,
       endpointMetadata,
       endpointBatch,
+      endpointDiffForPath,
       endpointCoverage,
       endpointUpdateUser,
       projectPath,
@@ -46,6 +48,7 @@ export default {
       endpoint,
       endpointMetadata,
       endpointBatch,
+      endpointDiffForPath,
       endpointCoverage,
       endpointUpdateUser,
       projectPath,
@@ -80,9 +83,15 @@ export default {
   },
 
   [types.SET_DIFF_DATA_BATCH](state, data) {
-    state.diffFiles = prepareDiffData({
-      diff: data,
-      priorFiles: state.diffFiles,
+    Object.assign(state, {
+      diffFiles: prepareDiffData({
+        diff: data,
+        priorFiles: state.diffFiles,
+      }),
+      treeEntries: markTreeEntriesLoaded({
+        priorEntries: state.treeEntries,
+        loadedFiles: data.diff_files,
+      }),
     });
   },