BUGFIX: RAIL-1062 Area chart should have only one viewBy attribute an…

…d only one stackBy attribute
gooddata · Jul 20, 2018 · 02a8475 · 02a8475
1 parent 43d3f6b
commit 02a8475
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 35 deletions.
diff --git a/examples/src/components/AreaChartExample.jsx b/examples/src/components/AreaChartExample.jsx
@@ -79,23 +79,21 @@ export class AreaChartExample extends Component {
             }
         ];
 
-        const attributes = [
-            {
-                visualizationAttribute: {
-                    displayForm: {
-                        identifier: monthDateIdentifier
-                    },
-                    localIdentifier: 'month'
-                }
+        const viewBy = {
+            visualizationAttribute: {
+                displayForm: {
+                    identifier: monthDateIdentifier
+                },
+                localIdentifier: 'month'
             }
-        ];
+        };
 
         return (
             <div style={{ height: 300 }} className="s-area-chart">
                 <AreaChart
                     projectId={projectId}
                     measures={measures}
-                    viewBy={attributes}
+                    viewBy={viewBy}
                     onLoadingChanged={this.onLoadingChanged}
                     onError={this.onError}
                     config={{

diff --git a/examples/src/components/StackedAreaChartExample.jsx b/examples/src/components/StackedAreaChartExample.jsx
@@ -79,23 +79,21 @@ export class StackedAreaChartExample extends Component {
             }
         ];
 
-        const attributes = [
-            {
-                visualizationAttribute: {
-                    displayForm: {
-                        identifier: monthDateIdentifier
-                    },
-                    localIdentifier: 'month'
-                }
+        const viewBy = {
+            visualizationAttribute: {
+                displayForm: {
+                    identifier: monthDateIdentifier
+                },
+                localIdentifier: 'month'
             }
-        ];
+        };
 
         return (
             <div style={{ height: 300 }} className="s-area-chart">
                 <AreaChart
                     projectId={projectId}
                     measures={measures}
-                    viewBy={attributes}
+                    viewBy={viewBy}
                     onLoadingChanged={this.onLoadingChanged}
                     onError={this.onError}
                     config={{

diff --git a/src/components/AreaChart.tsx b/src/components/AreaChart.tsx
@@ -11,8 +11,8 @@ import { getStackingResultSpec } from '../helpers/resultSpec';
 
 export interface IAreaChartBucketProps extends ICommonChartProps {
     measures: VisualizationObject.BucketItem[];
-    viewBy?: VisualizationObject.IVisualizationAttribute[];
-    stackBy?: VisualizationObject.IVisualizationAttribute[];
+    viewBy?: VisualizationObject.IVisualizationAttribute;
+    stackBy?: VisualizationObject.IVisualizationAttribute;
     filters?: VisualizationObject.VisualizationObjectFilter[];
     sortBy?: AFM.SortItem[];
 }
@@ -39,11 +39,11 @@ export function AreaChart(props: IAreaChartProps): JSX.Element {
         },
         {
             localIdentifier: 'attributes',
-            items: props.viewBy ? props.viewBy : []
+            items: props.viewBy ? [props.viewBy] : []
         },
         {
             localIdentifier: 'stacks',
-            items: props.stackBy ? props.stackBy : []
+            items: props.stackBy ? [props.stackBy] : []
         }
     ];
 

diff --git a/stories/core_components/AreaChart.tsx b/stories/core_components/AreaChart.tsx
@@ -22,7 +22,7 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1, MEASURE_2]}
-                    viewBy={[ATTRIBUTE_1]}
+                    viewBy={ATTRIBUTE_1}
                     onError={onErrorHandler}
                     LoadingComponent={null}
                     ErrorComponent={null}
@@ -36,7 +36,7 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1, MEASURE_2]}
-                    viewBy={[ATTRIBUTE_1]}
+                    viewBy={ATTRIBUTE_1}
                     onError={onErrorHandler}
                     config={{
                         stacking: false
@@ -53,7 +53,7 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1, MEASURE_2]}
-                    viewBy={[ATTRIBUTE_1]}
+                    viewBy={ATTRIBUTE_1}
                     onError={onErrorHandler}
                     config={{
                         stacking: true
@@ -70,8 +70,8 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1]}
-                    viewBy={[ATTRIBUTE_1]}
-                    stackBy={[ATTRIBUTE_2]}
+                    viewBy={ATTRIBUTE_1}
+                    stackBy={ATTRIBUTE_2}
                     onError={onErrorHandler}
                     LoadingComponent={null}
                     ErrorComponent={null}
@@ -85,8 +85,8 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1]}
-                    viewBy={[ATTRIBUTE_1]}
-                    stackBy={[ATTRIBUTE_2]}
+                    viewBy={ATTRIBUTE_1}
+                    stackBy={ATTRIBUTE_2}
                     onError={onErrorHandler}
                     config={{
                         stacking: false
@@ -103,7 +103,7 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1, MEASURE_2]}
-                    viewBy={[ATTRIBUTE_1]}
+                    viewBy={ATTRIBUTE_1}
                     onError={onErrorHandler}
                     LoadingComponent={null}
                     ErrorComponent={null}
@@ -118,7 +118,7 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1, MEASURE_2]}
-                    viewBy={[ATTRIBUTE_1]}
+                    viewBy={ATTRIBUTE_1}
                     onError={onErrorHandler}
                     LoadingComponent={null}
                     ErrorComponent={null}
@@ -132,7 +132,7 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1, MEASURE_WITH_NULLS]}
-                    viewBy={[ATTRIBUTE_1]}
+                    viewBy={ATTRIBUTE_1}
                     onError={onErrorHandler}
                     LoadingComponent={null}
                     ErrorComponent={null}
@@ -145,7 +145,7 @@ storiesOf('Core components/AreaChart', module)
                 <AreaChart
                     projectId="storybook"
                     measures={[MEASURE_1, MEASURE_WITH_NULLS]}
-                    viewBy={[ATTRIBUTE_1]}
+                    viewBy={ATTRIBUTE_1}
                     onError={onErrorHandler}
                     config={{
                         stacking: false