From d5a24021a4e5839b3c7afabc50d46f4e12b8bbaf Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 21 Nov 2018 15:07:54 +0000
Subject: [PATCH] Revert "Merge branch 'ide-open-all-mr-files' into 'master'"

This reverts merge request !23234
---
 .../javascripts/ide/stores/actions/file.js    |  9 ++----
 .../ide/stores/actions/merge_request.js       |  1 -
 .../unreleased/ide-open-all-mr-files.yml      |  5 ---
 .../ide/stores/actions/merge_request_spec.js  | 31 ++-----------------
 4 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 changelogs/unreleased/ide-open-all-mr-files.yml

diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index a297740bd5f..30dcf7ef4df 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -56,10 +56,7 @@ export const setFileActive = ({ commit, state, getters, dispatch }, path) => {
   dispatch('scrollToTab');
 };
 
-export const getFileData = (
-  { state, commit, dispatch },
-  { path, makeFileActive = true, openFile = makeFileActive },
-) => {
+export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive = true }) => {
   const file = state.entries[path];
 
   if (file.raw || (file.tempFile && !file.prevPath)) return Promise.resolve();
@@ -74,8 +71,8 @@ export const getFileData = (
       const normalizedHeaders = normalizeHeaders(headers);
       setPageTitle(decodeURI(normalizedHeaders['PAGE-TITLE']));
 
-      if (data) commit(types.SET_FILE_DATA, { data, file });
-      if (openFile) commit(types.TOGGLE_FILE_OPEN, path);
+      commit(types.SET_FILE_DATA, { data, file });
+      if (makeFileActive) commit(types.TOGGLE_FILE_OPEN, path);
       if (makeFileActive) dispatch('setFileActive', path);
       commit(types.TOGGLE_LOADING, { entry: file });
     })
diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js
index 8404c6d4f72..3ac2f8b3698 100644
--- a/app/assets/javascripts/ide/stores/actions/merge_request.js
+++ b/app/assets/javascripts/ide/stores/actions/merge_request.js
@@ -161,7 +161,6 @@ export const openMergeRequest = (
             dispatch('getFileData', {
               path: change.new_path,
               makeFileActive: ind === 0,
-              openFile: true,
             });
           }
         }
diff --git a/changelogs/unreleased/ide-open-all-mr-files.yml b/changelogs/unreleased/ide-open-all-mr-files.yml
deleted file mode 100644
index 6a5ea8908fc..00000000000
--- a/changelogs/unreleased/ide-open-all-mr-files.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Open first 10 merge request files in IDE
-merge_request:
-author:
-type: fixed
diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/javascripts/ide/stores/actions/merge_request_spec.js
index d8e9260e932..3a4e0d7507f 100644
--- a/spec/javascripts/ide/stores/actions/merge_request_spec.js
+++ b/spec/javascripts/ide/stores/actions/merge_request_spec.js
@@ -262,28 +262,16 @@ describe('IDE store merge request actions', () => {
         bar: {},
       };
 
-      const originalDispatch = store.dispatch;
-
-      spyOn(store, 'dispatch').and.callFake((type, payload) => {
+      spyOn(store, 'dispatch').and.callFake(type => {
         switch (type) {
           case 'getMergeRequestData':
             return Promise.resolve(testMergeRequest);
           case 'getMergeRequestChanges':
             return Promise.resolve(testMergeRequestChanges);
-          case 'getFiles':
-          case 'getMergeRequestVersions':
-          case 'getBranchData':
-          case 'setFileMrChange':
-            return Promise.resolve();
           default:
-            return originalDispatch(type, payload);
+            return Promise.resolve();
         }
       });
-      spyOn(service, 'getFileData').and.callFake(() =>
-        Promise.resolve({
-          headers: {},
-        }),
-      );
     });
 
     it('dispatch actions for merge request data', done => {
@@ -315,17 +303,7 @@ describe('IDE store merge request actions', () => {
     });
 
     it('updates activity bar view and gets file data, if changes are found', done => {
-      store.state.entries.foo = {
-        url: 'test',
-      };
-      store.state.entries.bar = {
-        url: 'test',
-      };
-
-      testMergeRequestChanges.changes = [
-        { new_path: 'foo', path: 'foo' },
-        { new_path: 'bar', path: 'bar' },
-      ];
+      testMergeRequestChanges.changes = [{ new_path: 'foo' }, { new_path: 'bar' }];
 
       openMergeRequest(store, mr)
         .then(() => {
@@ -343,11 +321,8 @@ describe('IDE store merge request actions', () => {
             expect(store.dispatch).toHaveBeenCalledWith('getFileData', {
               path: change.new_path,
               makeFileActive: i === 0,
-              openFile: true,
             });
           });
-
-          expect(store.state.openFiles.length).toBe(testMergeRequestChanges.changes.length);
         })
         .then(done)
         .catch(done.fail);
-- 
GitLab