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: consolidate legacy and default plugin and fix resizing #2254

Merged
merged 5 commits into from
Mar 20, 2023

Conversation

jenniferarnesen
Copy link
Collaborator

@jenniferarnesen jenniferarnesen commented Mar 19, 2023

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).

image

@dhis2-bot
Copy link
Contributor

dhis2-bot commented Mar 19, 2023

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

@dhis2-bot dhis2-bot temporarily deployed to netlify March 19, 2023 15:28 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify March 19, 2023 15:42 Inactive
Copy link
Member

@edoardo edoardo left a comment

Choose a reason for hiding this comment

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

It looks i18n.pot is loosing some strings that are needed (no filters, install app, plugin not available).

There's 1 lint error to fix.

@dhis2-bot dhis2-bot temporarily deployed to netlify March 19, 2023 20:03 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify March 19, 2023 21:02 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify March 19, 2023 22:47 Inactive
@jenniferarnesen jenniferarnesen merged commit d4e3c03 into master Mar 20, 2023
@jenniferarnesen jenniferarnesen deleted the fix/legacy-plugin-resize branch March 20, 2023 07:19
dhis2-bot added a commit that referenced this pull request Mar 20, 2023
## [99.10.21](v99.10.20...v99.10.21) (2023-03-20)

### Bug Fixes

* consolidate legacy and default plugin and fix resizing ([#2254](#2254)) ([d4e3c03](d4e3c03))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 99.10.21 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

jenniferarnesen added a commit that referenced this pull request Mar 22, 2023
* 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 Mar 22, 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
…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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants