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: remove internal alert stack and use the platform AlertStack #2796

Merged
merged 26 commits into from
Jul 30, 2024

Conversation

jenniferarnesen
Copy link
Collaborator

@jenniferarnesen jenniferarnesen commented Jul 7, 2023

Fixes: https://dhis2.atlassian.net/browse/DHIS2-15438

The alerts were duplicated because there was both an internal alert stack/bar system as well as the built in one from app-runtime. Solution was to remove the internal alert stack/bar. This meant that the alerts coming from the layer loaders had to be refactored so that loader alerts are no longer are added to redux. Instead the component LayerLoaders use the app-runtime hook (useAlert).

Other changes:

  • skipPluginLogic: true has been added to d2.config.js because of the cli-app-scripts upgrade. Previously we had set a resolution for the dependency to workaround this bug: https://dhis2.atlassian.net/browse/DHIS2-16916. Now, we can remove the resolution as long as we include this config.
  • Testing: confirm that alert messages still show in the dashboard item legend.

Before (see video in Jira issue)

After:
https://github.com/dhis2/maps-app/assets/6113918/309a29c4-e467-47a6-88e3-0e63ef5534b4

For reference, these are all the layer messages (where majority of changes are):

Earth Engine alerts:
image
image
image

Event Layer alerts:
image
image
image
image

Facility layer alerts
image
image

OrgUnit Layer alerts
image
image
image

Thematic Layer alerts
image
image
image
image

TE Layer alerts
image
image

@jenniferarnesen jenniferarnesen marked this pull request as draft July 7, 2023 14:26
@dhis2-bot
Copy link
Contributor

dhis2-bot commented Aug 18, 2023

🚀 Deployed on https://pr-2796--dhis2-maps.netlify.app

@dhis2-bot dhis2-bot temporarily deployed to netlify June 5, 2024 07:26 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify June 5, 2024 07:41 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify June 6, 2024 09:16 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify June 6, 2024 09:26 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify June 6, 2024 14:25 Inactive
@jenniferarnesen jenniferarnesen marked this pull request as ready for review June 6, 2024 14:41
@dhis2-bot dhis2-bot temporarily deployed to netlify June 6, 2024 14:45 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify June 6, 2024 15:09 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify June 12, 2024 07:06 Inactive
@jenniferarnesen jenniferarnesen changed the base branch from dev to master June 21, 2024 09:24
@dhis2-bot dhis2-bot temporarily deployed to netlify July 22, 2024 14:31 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify July 22, 2024 14:38 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify July 23, 2024 09:53 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify July 25, 2024 08:31 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify July 26, 2024 07:29 Inactive
Copy link
Collaborator

@BRaimbault BRaimbault left a comment

Choose a reason for hiding this comment

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

I belive some of the comments need to be addressed. Keep me posted.

src/loaders/earthEngineLoader.js Show resolved Hide resolved
src/loaders/earthEngineLoader.js Outdated Show resolved Hide resolved
src/loaders/orgUnitLoader.js Show resolved Hide resolved
src/loaders/facilityLoader.js Outdated Show resolved Hide resolved
src/loaders/facilityLoader.js Show resolved Hide resolved
src/components/loaders/useLoaderAlerts.js Outdated Show resolved Hide resolved
d2.config.js Show resolved Hide resolved
src/loaders/trackedEntityLoader.js Outdated Show resolved Hide resolved
src/loaders/thematicLoader.js Show resolved Hide resolved
src/loaders/thematicLoader.js Show resolved Hide resolved
@dhis2-bot dhis2-bot temporarily deployed to netlify July 30, 2024 08:54 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify July 30, 2024 15:12 Inactive
@jenniferarnesen jenniferarnesen merged commit 69776ad into master Jul 30, 2024
21 checks passed
@jenniferarnesen jenniferarnesen deleted the fix/duplicated-alert-stack branch July 30, 2024 15:27
dhis2-bot added a commit that referenced this pull request Jul 31, 2024
## [100.5.9](v100.5.8...v100.5.9) (2024-07-31)

### Bug Fixes

* loader alert messages were being duplicated ([#2796](#2796)) ([69776ad](69776ad))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.5.9 🎉

The release is available on:

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

None yet

4 participants