fix: fix axes options for line and area vis types (#857)

dhis2 · Apr 14, 2020 · 9463ea3 · 9463ea3
1 parent 32c6ede
commit 9463ea3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/packages/app/src/modules/options/areaConfig.js b/packages/app/src/modules/options/areaConfig.js
@@ -11,8 +11,7 @@ import TargetLine from '../../components/VisualizationOptions/Options/TargetLine
 import BaseLine from '../../components/VisualizationOptions/Options/BaseLine'
 import SortOrder from '../../components/VisualizationOptions/Options/SortOrder'
 import AggregationType from '../../components/VisualizationOptions/Options/AggregationType'
-import RangeAxisMinValue from '../../components/VisualizationOptions/Options/RangeAxisMinValue'
-import RangeAxisMaxValue from '../../components/VisualizationOptions/Options/RangeAxisMaxValue'
+import AxisRange from '../../components/VisualizationOptions/Options/AxisRange'
 import RangeAxisSteps from '../../components/VisualizationOptions/Options/RangeAxisSteps'
 import RangeAxisDecimals from '../../components/VisualizationOptions/Options/RangeAxisDecimals'
 import RangeAxisLabel from '../../components/VisualizationOptions/Options/RangeAxisLabel'
@@ -55,16 +54,20 @@ export default [
         label: i18n.t('Axes'),
         content: [
             {
-                key: 'axes-section-1',
+                key: 'axes-vertical-axis',
+                label: i18n.t('Vertical (y) axis'),
                 content: React.Children.toArray([
-                    <RangeAxisMinValue />,
-                    <RangeAxisMaxValue />,
+                    <RangeAxisLabel />,
+                    <AxisRange />,
                     <RangeAxisSteps />,
                     <RangeAxisDecimals />,
-                    <RangeAxisLabel />,
-                    <DomainAxisLabel />,
                 ]),
             },
+            {
+                key: 'axes-horizontal-axis',
+                label: i18n.t('Horizontal (x) axis'),
+                content: React.Children.toArray([<DomainAxisLabel />]),
+            },
         ],
     },
     {

diff --git a/packages/app/src/modules/options/lineConfig.js b/packages/app/src/modules/options/lineConfig.js
@@ -10,8 +10,7 @@ import TargetLine from '../../components/VisualizationOptions/Options/TargetLine
 import BaseLine from '../../components/VisualizationOptions/Options/BaseLine'
 import SortOrder from '../../components/VisualizationOptions/Options/SortOrder'
 import AggregationType from '../../components/VisualizationOptions/Options/AggregationType'
-import RangeAxisMinValue from '../../components/VisualizationOptions/Options/RangeAxisMinValue'
-import RangeAxisMaxValue from '../../components/VisualizationOptions/Options/RangeAxisMaxValue'
+import AxisRange from '../../components/VisualizationOptions/Options/AxisRange'
 import RangeAxisSteps from '../../components/VisualizationOptions/Options/RangeAxisSteps'
 import RangeAxisDecimals from '../../components/VisualizationOptions/Options/RangeAxisDecimals'
 import RangeAxisLabel from '../../components/VisualizationOptions/Options/RangeAxisLabel'
@@ -53,16 +52,20 @@ export default [
         label: i18n.t('Axes'),
         content: [
             {
-                key: 'axes-section-1',
+                key: 'axes-vertical-axis',
+                label: i18n.t('Vertical (y) axis'),
                 content: React.Children.toArray([
-                    <RangeAxisMinValue />,
-                    <RangeAxisMaxValue />,
+                    <RangeAxisLabel />,
+                    <AxisRange />,
                     <RangeAxisSteps />,
                     <RangeAxisDecimals />,
-                    <RangeAxisLabel />,
-                    <DomainAxisLabel />,
                 ]),
             },
+            {
+                key: 'axes-horizontal-axis',
+                label: i18n.t('Horizontal (x) axis'),
+                content: React.Children.toArray([<DomainAxisLabel />]),
+            },
         ],
     },
     {