1 files changed, 14 insertions, 88 deletions
diff --git a/app/assets/javascripts/projects/pipelines/charts/index.js b/app/assets/javascripts/projects/pipelines/charts/index.js
index f6e79f0ab51..7e746423b6a 100644
--- a/app/assets/javascripts/projects/pipelines/charts/index.js
+++ b/app/assets/javascripts/projects/pipelines/charts/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
-import ProjectPipelinesChartsLegacy from './components/app_legacy.vue';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import ProjectPipelinesCharts from './components/app.vue';
 
 Vue.use(VueApollo);
@@ -10,99 +10,25 @@ const apolloProvider = new VueApollo({
   defaultClient: createDefaultClient(),
 });
 
-const mountPipelineChartsApp = el => {
-  // Not all of the values will be defined since some them will be
-  // empty depending on the value of the graphql_pipeline_analytics
-  // feature flag, once the rollout of the feature flag is completed
-  // the undefined values will be deleted
-  const {
-    countsFailed,
-    countsSuccess,
-    countsTotal,
-    countsTotalDuration,
-    successRatio,
-    timesChartLabels,
-    timesChartValues,
-    lastWeekChartLabels,
-    lastWeekChartTotals,
-    lastWeekChartSuccess,
-    lastMonthChartLabels,
-    lastMonthChartTotals,
-    lastMonthChartSuccess,
-    lastYearChartLabels,
-    lastYearChartTotals,
-    lastYearChartSuccess,
-    projectPath,
-  } = el.dataset;
+const mountPipelineChartsApp = (el) => {
+  const { projectPath } = el.dataset;
 
-  const parseAreaChartData = (labels, totals, success) => {
-    let parsedData = {};
-
-    try {
-      parsedData = {
-        labels: JSON.parse(labels),
-        totals: JSON.parse(totals),
-        success: JSON.parse(success),
-      };
-    } catch {
-      parsedData = {};
-    }
-
-    return parsedData;
-  };
-
-  if (gon?.features?.graphqlPipelineAnalytics) {
-    return new Vue({
-      el,
-      name: 'ProjectPipelinesChartsApp',
-      components: {
-        ProjectPipelinesCharts,
-      },
-      apolloProvider,
-      provide: {
-        projectPath,
-      },
-      render: createElement => createElement(ProjectPipelinesCharts, {}),
-    });
-  }
+  const shouldRenderDeploymentFrequencyCharts = parseBoolean(
+    el.dataset.shouldRenderDeploymentFrequencyCharts,
+  );
 
   return new Vue({
     el,
-    name: 'ProjectPipelinesChartsAppLegacy',
+    name: 'ProjectPipelinesChartsApp',
     components: {
-      ProjectPipelinesChartsLegacy,
+      ProjectPipelinesCharts,
+    },
+    apolloProvider,
+    provide: {
+      projectPath,
+      shouldRenderDeploymentFrequencyCharts,
     },
-    render: createElement =>
-      createElement(ProjectPipelinesChartsLegacy, {
-        props: {
-          counts: {
-            failed: countsFailed,
-            success: countsSuccess,
-            total: countsTotal,
-            successRatio,
-            totalDuration: countsTotalDuration,
-          },
-          timesChartData: {
-            labels: JSON.parse(timesChartLabels),
-            values: JSON.parse(timesChartValues),
-          },
-          lastWeekChartData: parseAreaChartData(
-            lastWeekChartLabels,
-            lastWeekChartTotals,
-            lastWeekChartSuccess,
-          ),
-          lastMonthChartData: parseAreaChartData(
-            lastMonthChartLabels,
-            lastMonthChartTotals,
-            lastMonthChartSuccess,
-          ),
-          lastYearChartData: parseAreaChartData(
-            lastYearChartLabels,
-            lastYearChartTotals,
-            lastYearChartSuccess,
-          ),
-        },
-      }),
+    render: (createElement) => createElement(ProjectPipelinesCharts, {}),
   });
 };