Commit f3ddb255 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch...

Merge branch '32891-move-scatterplot-on-productivity-analytics-to-second-on-the-dashboard' into 'master'

Resolve "Move scatterplot on productivity analytics to second on the dashboard"

Closes #32891

See merge request gitlab-org/gitlab!17983
parents 25918ea2 ba6375ce
......@@ -177,6 +177,27 @@ export default {
<template v-if="showSecondaryCharts">
<div ref="secondaryCharts">
<metric-chart
v-if="isChartEnabled(chartKeys.scatterplot)"
ref="scatterplot"
class="mb-4"
:title="s__('ProductivityAnalytics|Trendline')"
:is-loading="chartLoading(chartKeys.scatterplot)"
:metric-types="getMetricTypes(chartKeys.scatterplot)"
:chart-data="getScatterPlotMainData"
:selected-metric="getSelectedMetric(chartKeys.scatterplot)"
@metricTypeChange="
metric => setMetricType({ metricType: metric, chartKey: chartKeys.scatterplot })
"
>
<scatterplot
:x-axis-title="s__('ProductivityAnalytics|Merge date')"
:y-axis-title="scatterplotYaxisLabel"
:scatter-data="getScatterPlotMainData"
:median-line-data="getScatterPlotMedianData"
/>
</metric-chart>
<div class="row">
<metric-chart
ref="timeBasedChart"
......@@ -231,27 +252,6 @@ export default {
</metric-chart>
</div>
<metric-chart
v-if="isChartEnabled(chartKeys.scatterplot)"
ref="scatterplot"
class="mb-4"
:title="s__('ProductivityAnalytics|Trendline')"
:is-loading="chartLoading(chartKeys.scatterplot)"
:metric-types="getMetricTypes(chartKeys.scatterplot)"
:chart-data="getScatterPlotMainData"
:selected-metric="getSelectedMetric(chartKeys.scatterplot)"
@metricTypeChange="
metric => setMetricType({ metricType: metric, chartKey: chartKeys.scatterplot })
"
>
<scatterplot
:x-axis-title="s__('ProductivityAnalytics|Merge date')"
:y-axis-title="scatterplotYaxisLabel"
:scatter-data="getScatterPlotMainData"
:median-line-data="getScatterPlotMedianData"
/>
</metric-chart>
<div
class="js-mr-table-sort d-flex flex-column flex-md-row align-items-md-center justify-content-between mb-2"
>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment