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

Jump to bottom

fix: make series options unavailable for relative items #1280

Merged
merged 13 commits into from
Sep 21, 2020
Merged

fix: make series options unavailable for relative items #1280

merged 13 commits into from
Sep 21, 2020

Conversation

martinkrulltott
Copy link
Contributor

@martinkrulltott martinkrulltott commented Sep 17, 2020 •
edited by edoardo
Loading

Depends on dhis2/analytics#605

To prevent series options from being used with relative items (relative periods, relative org units, assigned categories), series options needs to be disabled for these items.

Relative items will result in the following error message:

image

Relative items are:

  • Assigned Categories
  • Periods from the Relative periods tab
  • User org units
  • Org unit levels and groups

Blocking any of these from presenting the series options is quite straight forward. However, there's a much more complex (edge) case where the user:

  1. add fixed org units or periods (doesn't apply to Assigned Categories)
  2. change type and axes in the series options
  3. add a relative org unit or period (leaving the initial selection as is)
  4. display custom series options for the initial selection and default series options for the relative item(s).

To prevent this case and make sure series options are always disabled when any relative items are in use, dhis2/analytics#605 exports the fn hasRelativeItems which is used to switch between the regular view and the custom series options view.

DV is responsible for:

  1. display an error message for the Series tab when relative items are used
  2. re-enable lines and vertical axis options when relative items are used (even though series options contain multiple axes)

Analytics is responsible for:

  1. the hasRelativeItems logic
  2. generating a chart with single axis props when relative items are used (when multi axes would otherwise be used)

Example

Settings before a relative item has been added
image

image

image

Result
image

Subsequently adding a relative period
image

Settings
image

image

image

Result
image

Fixes: https://jira.dhis2.org/browse/DHIS2-9486.

Display legend option

Radio and font size in the options' Legend tab didn't use the dense variant.

Before:
Screenshot 2020-09-11 at 10 31 36

After:
Screenshot 2020-09-11 at 10 31 52

Limit values tab

Additional style fix for Limit values tab in PT, after checking with @cooper-joe:

Before:
Screenshot 2020-09-16 at 14 50 41

After:
Screenshot 2020-09-16 at 14 51 18

@martinkrulltott martinkrulltott mentioned this pull request Sep 17, 2020
Merged
martinkrulltott added a commit to dhis2/analytics that referenced this pull request Sep 18, 2020
@martinkrulltott
fix: export hasRelativeItems and use as condition for Highcharts conf…
1892347 
…ig (#605)

Exports hasRelativeItems to support dhis2/data-visualizer-app#1280

Uses hasRelativeItems as a condition when generating the Highcharts config, similar to how hasCustomAxes and isDualAxisType is used. I.e. to switch between regular charts and multi axes charts (where e.g. trendline and plotlines are disabled etc).
dhis2-bot added a commit to dhis2/analytics that referenced this pull request Sep 18, 2020
@dhis2-bot
chore(release): cut 11.0.2 [skip ci]
5528d21 
## [11.0.2](v11.0.1...v11.0.2) (2020-09-18)

### Bug Fixes

* export hasRelativeItems and use as condition for Highcharts config ([#605](#605)) ([1892347](1892347)), closes [dhis2/data-visualizer-app#1280](dhis2/data-visualizer-app#1280)
@edoardo edoardo mentioned this pull request Sep 21, 2020
Closed
janhenrikoverland
janhenrikoverland approved these changes Sep 21, 2020
View reviewed changes
Copy link
Collaborator

@janhenrikoverland janhenrikoverland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG

@martinkrulltott martinkrulltott merged commit e8b7cad into master Sep 21, 2020
@martinkrulltott martinkrulltott deleted the fix/series-relative-items branch September 21, 2020 09:46
dhis2-bot added a commit that referenced this pull request Sep 21, 2020
@dhis2-bot
chore(release): cut 35.12.17 [skip ci]
1d59ab7 
## [35.12.17](v35.12.16...v35.12.17) (2020-09-21)

### Bug Fixes

* make series options unavailable for relative items ([#1280](#1280)) ([e8b7cad](e8b7cad))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 35.12.17 🎉

The release is available on:

Your semantic-release bot 📦🚀

janhenrikoverland added a commit that referenced this pull request Sep 24, 2020
@janhenrikoverland
Squashed commit of the following:
bd2dfd2 
commit a9c2d5b
Merge: 4eed188 8e21ccd
Author: Jan Henrik Overland <janhenrik.overland@gmail.com>
Date:   Wed Sep 23 15:06:22 2020 +0200

    Merge remote-tracking branch 'origin/master' into 35.x

commit 8e21ccd
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Sep 23 12:50:22 2020 +0000

    chore(release): cut 35.12.24 [skip ci]

    ## [35.12.24](v35.12.23...v35.12.24) (2020-09-23)

    ### Bug Fixes

    * upgrade analytics ([#1303](#1303)) ([66b1b9a](66b1b9a))

commit 66b1b9a
Author: Jan Henrik Øverland <jan@dhis2.org>
Date:   Wed Sep 23 14:45:10 2020 +0200

    fix: upgrade analytics (#1303)

commit 18add8a
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Sep 23 11:52:01 2020 +0000

    chore(release): cut 35.12.23 [skip ci]

    ## [35.12.23](v35.12.22...v35.12.23) (2020-09-23)

    ### Bug Fixes

    * layout width for pie layout ([#1302](#1302)) ([93e7eb8](93e7eb8))

commit 93e7eb8
Author: Jan Henrik Øverland <jan@dhis2.org>
Date:   Wed Sep 23 13:46:09 2020 +0200

    fix: layout width for pie layout (#1302)

commit c677337
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Sep 23 07:18:54 2020 +0000

    chore(release): cut 35.12.22 [skip ci]

    ## [35.12.22](v35.12.21...v35.12.22) (2020-09-23)

    ### Bug Fixes

    * legend type spacing in SV options ([#1298](#1298)) ([4477292](4477292))

commit 4477292
Author: Edoardo Sabadelli <edoardo@dhis2.org>
Date:   Wed Sep 23 09:13:58 2020 +0200

    fix: legend type spacing in SV options (#1298)

    There was too little space between the Display legend option toggle and the Legend type option in SV.

commit 0a64396
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Sep 23 07:07:20 2020 +0000

    chore(release): cut 35.12.21 [skip ci]

    ## [35.12.21](v35.12.20...v35.12.21) (2020-09-23)

    ### Bug Fixes

    * modal is bumped up when the color picker is opened ([#1299](#1299)) ([e4d2b83](e4d2b83))

commit e4d2b83
Author: Martin <martin@moid.se>
Date:   Wed Sep 23 09:01:55 2020 +0200

    fix: modal is bumped up when the color picker is opened (#1299)

    * add position relative to container of absolut positioned element

commit 9339c3e
Author: @dhis2-bot <apps@dhis2.org>
Date:   Tue Sep 22 23:46:05 2020 +0000

    chore(release): cut 35.12.20 [skip ci]

    ## [35.12.20](v35.12.19...v35.12.20) (2020-09-22)

    ### Bug Fixes

    * **translations:** sync translations from transifex (master) ([963547e](963547e))

commit 963547e
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Sep 23 01:40:51 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit f8d5948
Author: @dhis2-bot <apps@dhis2.org>
Date:   Tue Sep 22 08:12:27 2020 +0000

    chore(release): cut 35.12.19 [skip ci]

    ## [35.12.19](v35.12.18...v35.12.19) (2020-09-22)

    ### Bug Fixes

    * bump Analytics to v11.0.5 ([88b28fe](88b28fe))

commit 88b28fe
Author: Martin Ohlson <martin@moid.se>
Date:   Tue Sep 22 10:06:43 2020 +0200

    fix: bump Analytics to v11.0.5

commit 43c44b4
Author: @dhis2-bot <apps@dhis2.org>
Date:   Mon Sep 21 23:46:50 2020 +0000

    chore(release): cut 35.12.18 [skip ci]

    ## [35.12.18](v35.12.17...v35.12.18) (2020-09-21)

    ### Bug Fixes

    * **translations:** sync translations from transifex (master) ([c0125b2](c0125b2))

commit c0125b2
Author: @dhis2-bot <apps@dhis2.org>
Date:   Tue Sep 22 01:41:40 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit a119ecc
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 16:37:12 2020 +0000

    chore(deps): bump @dhis2/d2-ui-interpretations from 7.0.7 to 7.0.8

    Bumps @dhis2/d2-ui-interpretations from 7.0.7 to 7.0.8.

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 468b61b
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 15:50:52 2020 +0000

    chore(deps): bump @dhis2/analytics from 11.0.2 to 11.0.4

    Bumps [@dhis2/analytics](https://github.com/dhis2/analytics) from 11.0.2 to 11.0.4.
    - [Release notes](https://github.com/dhis2/analytics/releases)
    - [Changelog](https://github.com/dhis2/analytics/blob/master/CHANGELOG.md)
    - [Commits](dhis2/analytics@v11.0.2...v11.0.4)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 6c4268f
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 15:07:20 2020 +0000

    chore(deps): bump @dhis2/ui from 5.5.6 to 5.6.1

    Bumps [@dhis2/ui](https://github.com/dhis2/ui) from 5.5.6 to 5.6.1.
    - [Release notes](https://github.com/dhis2/ui/releases)
    - [Changelog](https://github.com/dhis2/ui/blob/master/CHANGELOG.md)
    - [Commits](dhis2/ui@v5.5.6...v5.6.1)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit ce275c6
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 14:25:48 2020 +0000

    chore(deps): bump @dhis2/d2-ui-file-menu from 7.0.7 to 7.0.8

    Bumps @dhis2/d2-ui-file-menu from 7.0.7 to 7.0.8.

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit cb6b440
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 14:15:55 2020 +0000

    chore(deps): bump @dhis2/app-runtime from 2.2.2 to 2.3.0

    Bumps [@dhis2/app-runtime](https://github.com/dhis2/app-runtime/tree/HEAD/runtime) from 2.2.2 to 2.3.0.
    - [Release notes](https://github.com/dhis2/app-runtime/releases)
    - [Changelog](https://github.com/dhis2/app-runtime/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/dhis2/app-runtime/commits/v2.3.0/runtime)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 1d59ab7
Author: @dhis2-bot <apps@dhis2.org>
Date:   Mon Sep 21 09:51:20 2020 +0000

    chore(release): cut 35.12.17 [skip ci]

    ## [35.12.17](v35.12.16...v35.12.17) (2020-09-21)

    ### Bug Fixes

    * make series options unavailable for relative items ([#1280](#1280)) ([e8b7cad](e8b7cad))

commit e8b7cad
Author: Martin <martin@moid.se>
Date:   Mon Sep 21 11:46:23 2020 +0200

    fix: make series options unavailable for relative items (#1280)

    * display an error message for the Series tab when relative items are used
    * re-enable lines and vertical axis options when relative items are used (even though series options contain multiple axes)

commit ec37fad
Author: @dhis2-bot <apps@dhis2.org>
Date:   Mon Sep 21 08:43:36 2020 +0000

    chore(release): cut 35.12.16 [skip ci]

    ## [35.12.16](v35.12.15...v35.12.16) (2020-09-21)

    ### Bug Fixes

    * keep the visualization name when re-saving after edit ([#1273](#1273)) ([0ad8768](0ad8768))

commit 0ad8768
Author: Edoardo Sabadelli <edoardo@dhis2.org>
Date:   Mon Sep 21 10:36:54 2020 +0200

    fix: keep the visualization name when re-saving after edit (#1273)

    When clicking Save on a stored visualization, keep the same name and
    avoid the default Untitled name be used instead.

    Since no change is actually lost when navigating in and out of an
    interpretation's view, remove the confirm dialog.

    Also, when answering No to the confirm dialog (meaning i don't want to
    navigate to the new URL) restore the previous URL with history.goBack()
    so that the app really is in the same state as before the confirm
    dialog.

commit 60e5bf7
Author: @dhis2-bot <apps@dhis2.org>
Date:   Sun Sep 20 20:32:25 2020 +0000

    chore(release): cut 35.12.15 [skip ci]

    ## [35.12.15](v35.12.14...v35.12.15) (2020-09-20)

    ### Bug Fixes

    * org unit dialog zindex ([#1277](#1277)) ([f970122](f970122))

commit f970122
Author: Martin <martin@moid.se>
Date:   Sun Sep 20 22:26:32 2020 +0200

    fix: org unit dialog zindex (#1277)

    * fix: bump Analytics dep
    * fix: remove old temporary fix

commit 2325dbc
Author: @dhis2-bot <apps@dhis2.org>
Date:   Sat Sep 19 23:47:21 2020 +0000

    chore(release): cut 35.12.14 [skip ci]

    ## [35.12.14](v35.12.13...v35.12.14) (2020-09-19)

    ### Bug Fixes

    * **translations:** sync translations from transifex (master) ([a428cc4](a428cc4))

commit a428cc4
Author: @dhis2-bot <apps@dhis2.org>
Date:   Sun Sep 20 01:41:38 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit 2919f7c
Author: @dhis2-bot <apps@dhis2.org>
Date:   Fri Sep 18 23:46:43 2020 +0000

    chore(release): cut 35.12.13 [skip ci]

    ## [35.12.13](v35.12.12...v35.12.13) (2020-09-18)

    ### Bug Fixes

    * **translations:** sync translations from transifex (master) ([8e92a8e](8e92a8e))

commit 8e92a8e
Author: @dhis2-bot <apps@dhis2.org>
Date:   Sat Sep 19 01:40:48 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit 217d02c
Author: @dhis2-bot <apps@dhis2.org>
Date:   Fri Sep 18 13:54:07 2020 +0000

    chore(release): cut 35.12.12 [skip ci]

    ## [35.12.12](v35.12.11...v35.12.12) (2020-09-18)

    ### Bug Fixes

    * solve font style related issues ([#1266](#1266)) ([4087c08](4087c08))

commit 4087c08
Author: Martin <martin@moid.se>
Date:   Fri Sep 18 15:48:26 2020 +0200

    fix: solve font style related issues (#1266)

    * Add CategoryAxisLabels to Radar and Stacked Area
    * Update the Analytics version and pass visType as props
    * Add z-index to tab bar in options dialog
    * add Display header to SV and PT. Also renamed Display totals and Display empty data to Totals and Empty data
    * remove Mono patterns to Patterns in the colorSet option
    * Prevent '' to be cast to 0 by adding a check in current.js

commit c67e2d1
Author: @dhis2-bot <apps@dhis2.org>
Date:   Thu Sep 17 23:47:10 2020 +0000

    chore(release): cut 35.12.11 [skip ci]

    ## [35.12.11](v35.12.10...v35.12.11) (2020-09-17)

    ### Bug Fixes

    * **translations:** sync translations from transifex (master) ([819bf40](819bf40))

commit 819bf40
Author: @dhis2-bot <apps@dhis2.org>
Date:   Fri Sep 18 01:41:01 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit 06086bc
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 16 04:42:56 2020 +0000

    chore(deps): bump @dhis2/ui from 5.5.5 to 5.5.6

    Bumps [@dhis2/ui](https://github.com/dhis2/ui) from 5.5.5 to 5.5.6.
    - [Release notes](https://github.com/dhis2/ui/releases)
    - [Changelog](https://github.com/dhis2/ui/blob/master/CHANGELOG.md)
    - [Commits](dhis2/ui@v5.5.5...v5.5.6)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 5ecadd3
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 14 14:47:02 2020 +0000

    chore(deps): bump @dhis2/analytics from 10.0.3 to 10.0.5

    Bumps [@dhis2/analytics](https://github.com/dhis2/analytics) from 10.0.3 to 10.0.5.
    - [Release notes](https://github.com/dhis2/analytics/releases)
    - [Changelog](https://github.com/dhis2/analytics/blob/master/CHANGELOG.md)
    - [Commits](dhis2/analytics@v10.0.3...v10.0.5)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 9eea8f2
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 14 14:36:25 2020 +0000

    chore(deps-dev): bump @dhis2/cli-app-scripts from 5.1.0 to 5.2.0

    Bumps [@dhis2/cli-app-scripts](https://github.com/amcgee/dhis2-app-platform/tree/HEAD/cli) from 5.1.0 to 5.2.0.
    - [Release notes](https://github.com/amcgee/dhis2-app-platform/releases)
    - [Changelog](https://github.com/dhis2/app-platform/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/amcgee/dhis2-app-platform/commits/v5.2.0/cli)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 37672ce
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 9 01:06:38 2020 +0000

    chore(deps): bump @dhis2/ui from 5.5.4 to 5.5.5

    Bumps [@dhis2/ui](https://github.com/dhis2/ui) from 5.5.4 to 5.5.5.
    - [Release notes](https://github.com/dhis2/ui/releases)
    - [Changelog](https://github.com/dhis2/ui/blob/master/CHANGELOG.md)
    - [Commits](dhis2/ui@v5.5.4...v5.5.5)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edoardo edoardo edoardo approved these changes

@janhenrikoverland janhenrikoverland janhenrikoverland approved these changes

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@martinkrulltott @dhis2-bot @edoardo @janhenrikoverland