1 files changed, 28 insertions, 31 deletions

diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js
index e651c197968..2133cfe4825 100644
--- a/app/assets/javascripts/diffs/store/mutations.js
+++ b/app/assets/javascripts/diffs/store/mutations.js
@@ -23,12 +23,11 @@ export default {
   },
 
   [types.SET_DIFF_DATA](state, data) {
-    const diffData = convertObjectPropsToCamelCase(data, { deep: true });
-    prepareDiffData(diffData);
-    const { tree, treeEntries } = generateTreeList(diffData.diffFiles);
+    prepareDiffData(data);
+    const { tree, treeEntries } = generateTreeList(data.diff_files);
 
     Object.assign(state, {
-      ...diffData,
+      ...convertObjectPropsToCamelCase(data),
       tree: sortTree(tree),
       treeEntries,
     });
@@ -42,7 +41,7 @@ export default {
 
   [types.SET_MERGE_REQUEST_DIFFS](state, mergeRequestDiffs) {
     Object.assign(state, {
-      mergeRequestDiffs: convertObjectPropsToCamelCase(mergeRequestDiffs, { deep: true }),
+      mergeRequestDiffs,
     });
   },
 
@@ -62,19 +61,18 @@ export default {
     const { lineNumbers, contextLines, fileHash } = options;
     const { bottom } = options.params;
     const diffFile = findDiffFile(state.diffFiles, fileHash);
-    const { highlightedDiffLines, parallelDiffLines } = diffFile;
 
     removeMatchLine(diffFile, lineNumbers, bottom);
 
     const lines = addLineReferences(contextLines, lineNumbers, bottom).map(line => ({
       ...line,
-      lineCode: line.lineCode || `${fileHash}_${line.oldLine}_${line.newLine}`,
+      line_code: line.line_code || `${fileHash}_${line.old_line}_${line.new_line}`,
       discussions: line.discussions || [],
     }));
 
     addContextLines({
-      inlineLines: highlightedDiffLines,
-      parallelLines: parallelDiffLines,
+      inlineLines: diffFile.highlighted_diff_lines,
+      parallelLines: diffFile.parallel_diff_lines,
       contextLines: lines,
       bottom,
       lineNumbers,
@@ -82,10 +80,9 @@ export default {
   },
 
   [types.ADD_COLLAPSED_DIFFS](state, { file, data }) {
-    const normalizedData = convertObjectPropsToCamelCase(data, { deep: true });
-    prepareDiffData(normalizedData);
-    const [newFileData] = normalizedData.diffFiles.filter(f => f.fileHash === file.fileHash);
-    const selectedFile = state.diffFiles.find(f => f.fileHash === file.fileHash);
+    prepareDiffData(data);
+    const [newFileData] = data.diff_files.filter(f => f.file_hash === file.file_hash);
+    const selectedFile = state.diffFiles.find(f => f.file_hash === file.file_hash);
     Object.assign(selectedFile, { ...newFileData });
   },
 
@@ -101,20 +98,20 @@ export default {
 
     const discussionLineCode = discussion.line_code;
     const fileHash = discussion.diff_file.file_hash;
-    const lineCheck = ({ lineCode }) =>
-      lineCode === discussionLineCode &&
+    const lineCheck = line =>
+      line.line_code === discussionLineCode &&
       isDiscussionApplicableToLine({
         discussion,
-        diffPosition: diffPositionByLineCode[lineCode],
+        diffPosition: diffPositionByLineCode[line.line_code],
         latestDiff,
       });
 
     state.diffFiles = state.diffFiles.map(diffFile => {
-      if (diffFile.fileHash === fileHash) {
+      if (diffFile.file_hash === fileHash) {
         const file = { ...diffFile };
 
-        if (file.highlightedDiffLines) {
-          file.highlightedDiffLines = file.highlightedDiffLines.map(line => {
+        if (file.highlighted_diff_lines) {
+          file.highlighted_diff_lines = file.highlighted_diff_lines.map(line => {
             if (lineCheck(line)) {
               return {
                 ...line,
@@ -126,8 +123,8 @@ export default {
           });
         }
 
-        if (file.parallelDiffLines) {
-          file.parallelDiffLines = file.parallelDiffLines.map(line => {
+        if (file.parallel_diff_lines) {
+          file.parallel_diff_lines = file.parallel_diff_lines.map(line => {
             const left = line.left && lineCheck(line.left);
             const right = line.right && lineCheck(line.right);
 
@@ -148,7 +145,7 @@ export default {
           });
         }
 
-        if (!file.parallelDiffLines || !file.highlightedDiffLines) {
+        if (!file.parallel_diff_lines || !file.highlighted_diff_lines) {
           file.discussions = file.discussions.concat(discussion);
         }
 
@@ -160,16 +157,16 @@ export default {
   },
 
   [types.REMOVE_LINE_DISCUSSIONS_FOR_FILE](state, { fileHash, lineCode, id }) {
-    const selectedFile = state.diffFiles.find(f => f.fileHash === fileHash);
+    const selectedFile = state.diffFiles.find(f => f.file_hash === fileHash);
     if (selectedFile) {
-      if (selectedFile.parallelDiffLines) {
-        const targetLine = selectedFile.parallelDiffLines.find(
+      if (selectedFile.parallel_diff_lines) {
+        const targetLine = selectedFile.parallel_diff_lines.find(
           line =>
-            (line.left && line.left.lineCode === lineCode) ||
-            (line.right && line.right.lineCode === lineCode),
+            (line.left && line.left.line_code === lineCode) ||
+            (line.right && line.right.line_code === lineCode),
         );
         if (targetLine) {
-          const side = targetLine.left && targetLine.left.lineCode === lineCode ? 'left' : 'right';
+          const side = targetLine.left && targetLine.left.line_code === lineCode ? 'left' : 'right';
 
           Object.assign(targetLine[side], {
             discussions: [],
@@ -177,9 +174,9 @@ export default {
         }
       }
 
-      if (selectedFile.highlightedDiffLines) {
-        const targetInlineLine = selectedFile.highlightedDiffLines.find(
-          line => line.lineCode === lineCode,
+      if (selectedFile.highlighted_diff_lines) {
+        const targetInlineLine = selectedFile.highlighted_diff_lines.find(
+          line => line.line_code === lineCode,
         );
 
         if (targetInlineLine) {