Fixed new Additions

Automatic Diff Navigation

7 files changed, 15 insertions, 11 deletions

diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index b428a9211c2..00e600a1a7f 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -104,7 +104,7 @@ export default {
         </span>
         <changed-file-icon
           :file="file"
-          v-if="file.changed || file.tempFile || file.mrDiff"
+          v-if="file.changed || file.tempFile || file.mrChange"
           class="prepend-top-5 pull-right"
         />
         <new-dropdown
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js
index d828b4e6778..4f1c5988fc5 100644
--- a/app/assets/javascripts/ide/ide_router.js
+++ b/app/assets/javascripts/ide/ide_router.js
@@ -134,12 +134,12 @@ router.beforeEach((to, from, next) => {
                               store.state.entries[change.new_path];
 
                             if (changeTreeEntry) {
-                              store.dispatch('setFileMrDiff', {
+                              store.dispatch('setFileMrChange', {
                                 file: changeTreeEntry,
-                                mrDiff: change.diff,
+                                mrChange: change,
                               });
 
-                              if (ind < 5) {
+                              if (ind < 10) {
                                 store.dispatch('getFileData', {
                                   path: change.new_path,
                                   makeFileActive: ind === 0,
diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js
index 1f69d2211e4..0dd4e009b1d 100644
--- a/app/assets/javascripts/ide/lib/common/model.js
+++ b/app/assets/javascripts/ide/lib/common/model.js
@@ -22,7 +22,7 @@ export default class Model {
       )),
     );
 
-    if (this.file.baseRaw) {
+    if (this.file.mrChange) {
       this.disposable.add(
         (this.baseModel = this.monaco.editor.createModel(
           this.file.baseRaw,
diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js
index cb36300d25c..fd0c5bafaef 100644
--- a/app/assets/javascripts/ide/lib/editor.js
+++ b/app/assets/javascripts/ide/lib/editor.js
@@ -114,6 +114,10 @@ export default class Editor {
       original: model.getBaseModel(),
       modified: model.getModel(),
     });
+
+    this.monaco.editor.createDiffNavigator(this.instance, {
+      alwaysRevealFirst: true,
+    });
   }
 
   setupMonacoTheme() {
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index f9c56a1c8f6..79ae5568d57 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -87,8 +87,8 @@ export const getFileData = (
   });
 };
 
-export const setFileMrDiff = ({ state, commit }, { file, mrDiff }) => {
-  commit(types.SET_FILE_MR_DIFF, { file, mrDiff });
+export const setFileMrChange = ({ state, commit }, { file, mrChange }) => {
+  commit(types.SET_FILE_MR_CHANGE, { file, mrChange });
 };
 
 export const getRawFileData = (
@@ -101,7 +101,7 @@ export const getRawFileData = (
       .getRawFileData(file)
       .then(raw => {
         commit(types.SET_FILE_RAW_DATA, { file, raw });
-        if (file.mrDiff) {
+        if (file.mrChange && file.mrChange.new_file === false) {
           service
             .getBaseRawFileData(file, baseSha)
             .then(baseRaw => {
diff --git a/app/assets/javascripts/ide/stores/mutation_types.js b/app/assets/javascripts/ide/stores/mutation_types.js
index 8d353423212..418cebcf2b2 100644
--- a/app/assets/javascripts/ide/stores/mutation_types.js
+++ b/app/assets/javascripts/ide/stores/mutation_types.js
@@ -48,7 +48,7 @@ export const TOGGLE_FILE_CHANGED = 'TOGGLE_FILE_CHANGED';
 export const SET_CURRENT_BRANCH = 'SET_CURRENT_BRANCH';
 export const SET_ENTRIES = 'SET_ENTRIES';
 export const CREATE_TMP_ENTRY = 'CREATE_TMP_ENTRY';
-export const SET_FILE_MR_DIFF = 'SET_FILE_MR_DIFF';
+export const SET_FILE_MR_CHANGE = 'SET_FILE_MR_CHANGE';
 export const SET_FILE_TARGET_BRANCH = 'SET_FILE_TARGET_BRANCH';
 export const UPDATE_VIEWER = 'UPDATE_VIEWER';
 export const UPDATE_DELAY_VIEWER_CHANGE = 'UPDATE_DELAY_VIEWER_CHANGE';
diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js
index 8e2452fbcf7..98ef6e1b6ff 100644
--- a/app/assets/javascripts/ide/stores/mutations/file.js
+++ b/app/assets/javascripts/ide/stores/mutations/file.js
@@ -66,9 +66,9 @@ export default {
       editorColumn,
     });
   },
-  [types.SET_FILE_MR_DIFF](state, { file, mrDiff }) {
+  [types.SET_FILE_MR_CHANGE](state, { file, mrChange }) {
     Object.assign(file, {
-      mrDiff,
+      mrChange,
     });
   },
   [types.DISCARD_FILE_CHANGES](state, path) {