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: show offline message for EE maps [v40] [DHIS2-14993] #2268

Merged
merged 1 commit into from
Mar 22, 2023

Conversation

jenniferarnesen
Copy link
Collaborator

This PR fixes 2 things:

  • the offline message was not showing on EE maps. A blank item was shown, leading user to think the map just wasn't loading.
  • The legacy plugin (old ER and EV) was not resizing in edit mode.
  • Refactor: no longer need DefaultPlugin (merged together with LegacyPlugin)
  • and MapPlugin (everything now handled in Visualization.js).

Backport of #2254

* fix: consolidate legacy and default plugin and fix ER/EV resizing

* fix: show offline message on EE maps

---------

Co-authored-by: Jan Henrik Øverland <janhenrik.overland@gmail.com>
@jenniferarnesen jenniferarnesen changed the title fix: show offline message for EE maps [v40] [DHIS2-] fix: show offline message for EE maps [v40] [DHIS2-14993] Mar 22, 2023
@dhis2-bot
Copy link
Contributor

🚀 Deployed on https://pr-2268--dhis2-dashboard.netlify.app

@dhis2-bot dhis2-bot temporarily deployed to netlify March 22, 2023 12:43 Inactive
@jenniferarnesen jenniferarnesen merged commit 2949600 into v40 Mar 22, 2023
@jenniferarnesen jenniferarnesen deleted the fix/ee-offline-message-final-v40 branch March 22, 2023 14:47
jenniferarnesen added a commit that referenced this pull request May 3, 2023
…2268)

* fix: consolidate legacy and default plugin and fix ER/EV resizing

* fix: show offline message on EE maps

---------

Co-authored-by: Jan Henrik Øverland <janhenrik.overland@gmail.com>
jenniferarnesen added a commit that referenced this pull request May 3, 2023
* fix: consolidate legacy and default plugin and fix resizing (#2254) (#2268)

* fix: consolidate legacy and default plugin and fix ER/EV resizing

* fix: show offline message on EE maps

---------

Co-authored-by: Jan Henrik Øverland <janhenrik.overland@gmail.com>

* fix: fix props handling when switching Map <-> DV plugins (#2272)

* feat(iframe-plugin): wait to load plugins from cache to save network [DHIS2-15097] (#2285)

* feat(iframe-plugin): receive pwa installation status from plugins

* chore: add todos

* fix: wait to render until the first item of the type has gotten the plugin

* fix: add property to the top-most item of each iframe plugin type

* fix: dont use the <Layer> component

* chore: cli-app-scripts upgrade

* fix: remove unused var

* refactor: combine loops

---------

Co-authored-by: Jen Jones Arnesen <jennifer@dhis2.org>

* fix: disable ll plugin if it doesnt support installationStatus

* fix: clean up and lint

* fix: handle case where LL is not installed

* fix: center spinner

---------

Co-authored-by: Jan Henrik Øverland <janhenrik.overland@gmail.com>
Co-authored-by: Edoardo Sabadelli <edoardo@dhis2.org>
Co-authored-by: Kai Vandivier <49666798+KaiVandivier@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants