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.

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: update 'No data' handling #3408

Merged
merged 8 commits into from
Nov 29, 2024
Merged

fix: update 'No data' handling #3408

merged 8 commits into from
Nov 29, 2024

Conversation

BRaimbault
Copy link
Collaborator

@BRaimbault BRaimbault commented Nov 21, 2024

Implement DHIS2-18427
Linked maps-gl PR: dhis2/maps-gl#596
Backport to v39 PR: #3415


  • Bump maps-gl dependency to get fix on tooltip 'No data' logic and labelSource to support labelNoData for "name and value" and "value" labels.
  • Update getLabelStyle to return labelNoData for labelSource in maps-gl:
    return {
    fontSize,
    fontStyle: labelFontStyle || LABEL_FONT_STYLE,
    fontWeight: labelFontWeight || LABEL_FONT_WEIGHT,
    lineHeight: parseInt(fontSize, 10) * 1.2 + 'px',
    color: cssColor(labelFontColor) || LABEL_FONT_COLOR,
    paddingTop: '10px',
    }
  • Update pop-up 'No data' logic:
    {i18n.t('Value')}: {value ? value : i18n.t('No data')}

Checklist:

  • Jest tests added
  • Cypress tests added
  • Manual testing complete
  • Dashboard tested
  • Update maps-gl dependency (to not point to d2-ci)

Before:
image

After:
image

@dhis2-bot
Copy link
Contributor

dhis2-bot commented Nov 21, 2024

🚀 Deployed on https://pr-3408.maps.netlify.dhis2.org

@dhis2-bot dhis2-bot temporarily deployed to netlify November 21, 2024 14:23 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify November 22, 2024 12:29 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify November 22, 2024 12:33 Inactive
@BRaimbault BRaimbault marked this pull request as ready for review November 22, 2024 14:39
@dhis2-bot dhis2-bot temporarily deployed to netlify November 22, 2024 14:40 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify November 29, 2024 14:33 Inactive
@BRaimbault BRaimbault merged commit d774e7a into master Nov 29, 2024
18 checks passed
@BRaimbault BRaimbault deleted the fix/DHIS2-18427 branch November 29, 2024 15:05
dhis2-bot added a commit that referenced this pull request Nov 29, 2024
## [100.7.7](v100.7.6...v100.7.7) (2024-11-29)

### Bug Fixes

* update 'No data' handling ([#3408](#3408)) ([d774e7a](d774e7a))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.7.7 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants