Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: reorder options for consistency (DHIS2-9004) (519b0ba) v34 #1211

Merged
merged 2 commits into from
Aug 25, 2020
Merged

fix: reorder options for consistency (DHIS2-9004) (519b0ba) v34 #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
634145a
chore: cherry-pick 519b0b
martinkrulltott Jul 27, 2020
53cc4f7
chore: en.pot
martinkrulltott Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/app/i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2020-05-25T18:22:35.064Z\n"
"PO-Revision-Date: 2020-05-25T18:22:35.064Z\n"
"POT-Creation-Date: 2020-08-21T09:51:29.294Z\n"
"PO-Revision-Date: 2020-08-21T09:51:29.294Z\n"

msgid "Rename successful"
msgstr ""
Expand Down Expand Up @@ -733,24 +733,24 @@ msgstr ""
msgid "Data"
msgstr ""

msgid "Axes"
msgstr ""

msgid "Style"
msgstr ""

msgid "Display"
msgstr ""

msgid "Lines"
msgstr ""

msgid "Axes"
msgstr ""

msgid "Vertical (y) axis"
msgstr ""

msgid "Horizontal (x) axis"
msgstr ""

msgid "Style"
msgstr ""

msgid "Chart style"
msgstr ""

Expand Down
39 changes: 27 additions & 12 deletions packages/app/src/modules/options/areaConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ import RangeAxisLabel from '../../components/VisualizationOptions/Options/RangeA
import DomainAxisLabel from '../../components/VisualizationOptions/Options/DomainAxisLabel'
import HideLegend from '../../components/VisualizationOptions/Options/HideLegend'
import HideTitle from '../../components/VisualizationOptions/Options/HideTitle'
import Title from '../../components/VisualizationOptions/Options/Title'
import HideSubtitle from '../../components/VisualizationOptions/Options/HideSubtitle'
import Subtitle from '../../components/VisualizationOptions/Options/Subtitle'
import CompletedOnly from '../../components/VisualizationOptions/Options/CompletedOnly'

export default [
Expand All @@ -30,23 +28,31 @@ export default [
getLabel: () => i18n.t('Data'),
content: [
{
key: 'data-section-1',
key: 'data-display',
getLabel: () => i18n.t('Display'),
content: React.Children.toArray([
<ShowData />,
<PercentStackedValues />,
<CumulativeValues />,
<HideEmptyRowItems />,
<SortOrder />,
]),
},
{
key: 'data-lines',
getLabel: () => i18n.t('Lines'),
content: React.Children.toArray([
<RegressionType />,
<TargetLine />,
<BaseLine />,
<SortOrder />,
<AggregationType />,
]),
},
{
key: 'data-advanced',
getLabel: () => i18n.t('Advanced'),
content: React.Children.toArray([<CompletedOnly />]),
content: React.Children.toArray([
<AggregationType />,
<CompletedOnly />,
]),
},
],
},
Expand All @@ -55,7 +61,8 @@ export default [
getLabel: () => i18n.t('Axes'),
content: [
{
key: 'axes-section-1',
key: 'axes-vertical-axis',
getLabel: () => i18n.t('Vertical (y) axis'),
content: React.Children.toArray([
<RangeAxisMinValue />,
<RangeAxisMaxValue />,
Expand All @@ -65,19 +72,27 @@ export default [
<DomainAxisLabel />,
]),
},
{
key: 'axes-horizontal-axis',
getLabel: () => i18n.t('Horizontal (x) axis'),
content: React.Children.toArray([<DomainAxisLabel />]),
},
],
},
{
key: 'style-tab',
getLabel: () => i18n.t('Style'),
content: [
{
key: 'style-section-1',
key: 'style-chart-style',
getLabel: () => i18n.t('Chart style'),
content: React.Children.toArray([<ShowData />, <HideLegend />]),
},
{
key: 'style-titles',
getLabel: () => i18n.t('Titles'),
content: React.Children.toArray([
<HideLegend />,
<Title />,
<HideTitle />,
<Subtitle />,
<HideSubtitle />,
]),
},
Expand Down
39 changes: 27 additions & 12 deletions packages/app/src/modules/options/lineConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ import RangeAxisLabel from '../../components/VisualizationOptions/Options/RangeA
import DomainAxisLabel from '../../components/VisualizationOptions/Options/DomainAxisLabel'
import HideLegend from '../../components/VisualizationOptions/Options/HideLegend'
import HideTitle from '../../components/VisualizationOptions/Options/HideTitle'
import Title from '../../components/VisualizationOptions/Options/Title'
import HideSubtitle from '../../components/VisualizationOptions/Options/HideSubtitle'
import Subtitle from '../../components/VisualizationOptions/Options/Subtitle'
import CompletedOnly from '../../components/VisualizationOptions/Options/CompletedOnly'

export default [
Expand All @@ -29,22 +27,30 @@ export default [
getLabel: () => i18n.t('Data'),
content: [
{
key: 'data-section-1',
key: 'data-display',
getLabel: () => i18n.t('Display'),
content: React.Children.toArray([
<ShowData />,
<CumulativeValues />,
<HideEmptyRowItems />,
<SortOrder />,
]),
},
{
key: 'data-lines',
getLabel: () => i18n.t('Lines'),
content: React.Children.toArray([
<RegressionType />,
<TargetLine />,
<BaseLine />,
<SortOrder />,
<AggregationType />,
]),
},
{
key: 'data-advanced',
getLabel: () => i18n.t('Advanced'),
content: React.Children.toArray([<CompletedOnly />]),
content: React.Children.toArray([
<AggregationType />,
<CompletedOnly />,
]),
},
],
},
Expand All @@ -53,7 +59,8 @@ export default [
getLabel: () => i18n.t('Axes'),
content: [
{
key: 'axes-section-1',
key: 'axes-vertical-axis',
getLabel: () => i18n.t('Vertical (y) axis'),
content: React.Children.toArray([
<RangeAxisMinValue />,
<RangeAxisMaxValue />,
Expand All @@ -63,19 +70,27 @@ export default [
<DomainAxisLabel />,
]),
},
{
key: 'axes-horizontal-axis',
getLabel: () => i18n.t('Horizontal (x) axis'),
content: React.Children.toArray([<DomainAxisLabel />]),
},
],
},
{
key: 'style-tab',
getLabel: () => i18n.t('Style'),
content: [
{
key: 'style-section-1',
key: 'style-chart-style',
getLabel: () => i18n.t('Chart style'),
content: React.Children.toArray([<ShowData />, <HideLegend />]),
},
{
key: 'style-titles',
getLabel: () => i18n.t('Titles'),
content: React.Children.toArray([
<HideLegend />,
<Title />,
<HideTitle />,
<Subtitle />,
<HideSubtitle />,
]),
},
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/modules/options/stackedColumnConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default [
key: 'data-display',
getLabel: () => i18n.t('Display'),
content: React.Children.toArray([
<ShowData />,
<PercentStackedValues />,
<CumulativeValues />,
<HideEmptyRowItems />,
Expand Down Expand Up @@ -86,6 +85,7 @@ export default [
key: 'style-chart-style',
getLabel: () => i18n.t('Chart style'),
content: React.Children.toArray([
<ShowData />,
<NoSpaceBetweenColumns />,
<HideLegend />,
/* TODO new option <BackgroundLines /> */
Expand Down