3 files changed, 10 insertions, 40 deletions

diff --git a/app/assets/javascripts/reports/codequality_report/store/actions.js b/app/assets/javascripts/reports/codequality_report/store/actions.js
index ddd1747899f..e3238207af2 100644
--- a/app/assets/javascripts/reports/codequality_report/store/actions.js
+++ b/app/assets/javascripts/reports/codequality_report/store/actions.js
@@ -1,34 +1,23 @@
 import axios from '~/lib/utils/axios_utils';
 import * as types from './mutation_types';
-import { parseCodeclimateMetrics, doCodeClimateComparison } from './utils/codequality_comparison';
+import { parseCodeclimateMetrics } from './utils/codequality_parser';
 
 export const setPaths = ({ commit }, paths) => commit(types.SET_PATHS, paths);
 
-export const fetchReports = ({ state, dispatch, commit }, diffFeatureFlagEnabled) => {
+export const fetchReports = ({ state, dispatch, commit }) => {
   commit(types.REQUEST_REPORTS);
 
-  if (diffFeatureFlagEnabled) {
-    return axios
-      .get(state.reportsPath)
-      .then(({ data }) => {
-        return dispatch('receiveReportsSuccess', {
-          newIssues: parseCodeclimateMetrics(data.new_errors, state.headBlobPath),
-          resolvedIssues: parseCodeclimateMetrics(data.resolved_errors, state.baseBlobPath),
-        });
-      })
-      .catch((error) => dispatch('receiveReportsError', error));
-  }
   if (!state.basePath) {
     return dispatch('receiveReportsError');
   }
-  return Promise.all([axios.get(state.headPath), axios.get(state.basePath)])
-    .then((results) =>
-      doCodeClimateComparison(
-        parseCodeclimateMetrics(results[0].data, state.headBlobPath),
-        parseCodeclimateMetrics(results[1].data, state.baseBlobPath),
-      ),
-    )
-    .then((data) => dispatch('receiveReportsSuccess', data))
+  return axios
+    .get(state.reportsPath)
+    .then(({ data }) => {
+      return dispatch('receiveReportsSuccess', {
+        newIssues: parseCodeclimateMetrics(data.new_errors, state.headBlobPath),
+        resolvedIssues: parseCodeclimateMetrics(data.resolved_errors, state.baseBlobPath),
+      });
+    })
     .catch((error) => dispatch('receiveReportsError', error));
 };
 
diff --git a/app/assets/javascripts/reports/codequality_report/store/mutations.js b/app/assets/javascripts/reports/codequality_report/store/mutations.js
index 095e6637966..8edeb6cc976 100644
--- a/app/assets/javascripts/reports/codequality_report/store/mutations.js
+++ b/app/assets/javascripts/reports/codequality_report/store/mutations.js
@@ -3,9 +3,6 @@ import * as types from './mutation_types';
 export default {
   [types.SET_PATHS](state, paths) {
     state.basePath = paths.basePath;
-    state.headPath = paths.headPath;
-    state.baseBlobPath = paths.baseBlobPath;
-    state.headBlobPath = paths.headBlobPath;
     state.reportsPath = paths.reportsPath;
     state.helpPath = paths.helpPath;
   },
diff --git a/app/assets/javascripts/reports/codequality_report/store/utils/codequality_comparison.js b/app/assets/javascripts/reports/codequality_report/store/utils/codequality_parser.js
index b252c8c9817..a794f5f0577 100644
--- a/app/assets/javascripts/reports/codequality_report/store/utils/codequality_comparison.js
+++ b/app/assets/javascripts/reports/codequality_report/store/utils/codequality_parser.js
@@ -1,5 +1,3 @@
-import CodeQualityComparisonWorker from '../../workers/codequality_comparison_worker';
-
 export const parseCodeclimateMetrics = (issues = [], path = '') => {
   return issues.map((issue) => {
     const parsedIssue = {
@@ -27,17 +25,3 @@ export const parseCodeclimateMetrics = (issues = [], path = '') => {
     return parsedIssue;
   });
 };
-
-export const doCodeClimateComparison = (headIssues, baseIssues) => {
-  // Do these comparisons in worker threads to avoid blocking the main thread
-  return new Promise((resolve, reject) => {
-    const worker = new CodeQualityComparisonWorker();
-    worker.addEventListener('message', ({ data }) =>
-      data.newIssues && data.resolvedIssues ? resolve(data) : reject(data),
-    );
-    worker.postMessage({
-      headIssues,
-      baseIssues,
-    });
-  });
-};