diff --git a/src/components/VisualizationTypeSelector/ListItemIcon.js b/src/components/VisualizationTypeSelector/ListItemIcon.js index 9fcc741b1e..54df88158c 100644 --- a/src/components/VisualizationTypeSelector/ListItemIcon.js +++ b/src/components/VisualizationTypeSelector/ListItemIcon.js @@ -7,6 +7,7 @@ import { VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, + VIS_TYPE_DONUT, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, @@ -46,6 +47,8 @@ const ListItemIcon = ({ iconType, style }) => { return case VIS_TYPE_PIE: return + case VIS_TYPE_DONUT: + return case VIS_TYPE_GAUGE: return case VIS_TYPE_LINE: diff --git a/src/modules/layoutValidation.js b/src/modules/layoutValidation.js index 9a7fdf3c2e..06c8513aad 100644 --- a/src/modules/layoutValidation.js +++ b/src/modules/layoutValidation.js @@ -4,6 +4,7 @@ import { VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_PIE, + VIS_TYPE_DONUT, VIS_TYPE_GAUGE, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, @@ -144,6 +145,7 @@ const validateOutlierTableLayout = (layout) => { export const validateLayout = (layout) => { switch (layout.type) { case VIS_TYPE_PIE: + case VIS_TYPE_DONUT: return validatePieLayout(layout) case VIS_TYPE_YEAR_OVER_YEAR_COLUMN: case VIS_TYPE_YEAR_OVER_YEAR_LINE: diff --git a/src/modules/options/config.js b/src/modules/options/config.js index 2d1f11b614..686b22c07f 100644 --- a/src/modules/options/config.js +++ b/src/modules/options/config.js @@ -2,6 +2,7 @@ import { VIS_TYPE_PIVOT_TABLE, VIS_TYPE_PIE, VIS_TYPE_GAUGE, + VIS_TYPE_DONUT, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_SCATTER, VIS_TYPE_OUTLIER_TABLE, @@ -51,6 +52,7 @@ export const getOptionsByType = ({ case VIS_TYPE_GAUGE: return gaugeConfig() case VIS_TYPE_PIE: + case VIS_TYPE_DONUT: return pieConfig() case VIS_TYPE_SINGLE_VALUE: return singleValueConfig() diff --git a/src/modules/visualization.js b/src/modules/visualization.js index b58247bec2..ef283bcbac 100644 --- a/src/modules/visualization.js +++ b/src/modules/visualization.js @@ -8,6 +8,7 @@ import { VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, + VIS_TYPE_DONUT, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, @@ -32,6 +33,7 @@ export const visTypes = [ VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, + VIS_TYPE_DONUT, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, @@ -69,6 +71,9 @@ export const getVisTypeDescriptions = () => ({ [VIS_TYPE_PIE]: i18n.t( 'Compare parts of a whole at a single point in time. Recommend period as filter.' ), + [VIS_TYPE_DONUT]: i18n.t( + 'Pie with a hole :-)' + ), [VIS_TYPE_RADAR]: i18n.t( 'Compare several items against multiple variables.' ), diff --git a/src/reducers/current.js b/src/reducers/current.js index 082d524db6..1bac661ad3 100644 --- a/src/reducers/current.js +++ b/src/reducers/current.js @@ -2,6 +2,7 @@ import { VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_PIE, + VIS_TYPE_DONUT, VIS_TYPE_GAUGE, VIS_TYPE_OUTLIER_TABLE, VIS_TYPE_SINGLE_VALUE, @@ -53,6 +54,7 @@ export default (state = DEFAULT_CURRENT, action) => { case SET_CURRENT_FROM_UI: { switch (action.value.ui.type) { case VIS_TYPE_PIE: + case VIS_TYPE_DONUT: return getPieCurrentFromUi(state, action.value.ui) case VIS_TYPE_SINGLE_VALUE: case VIS_TYPE_GAUGE: @@ -92,6 +94,7 @@ export const sGetCurrentFromUi = (state) => { switch (ui.type) { case VIS_TYPE_PIE: + case VIS_TYPE_DONUT: return getPieCurrentFromUi(state, ui) case VIS_TYPE_SINGLE_VALUE: case VIS_TYPE_GAUGE: