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

feat: upgrade to ui@5 (TECH-385) #891

Merged
merged 24 commits into from
Jun 16, 2020
Merged

Conversation

jenniferarnesen
Copy link
Collaborator

@jenniferarnesen jenniferarnesen commented Jun 5, 2020

Implements TECH-385

Depends on dhis2/analytics#476

Changes include:

  • upgrade from @dhis2/ui-core v4 to @dhis2/ui v5
  • add styled-jsx as dependency since @dhis2/ui declares it as a peer dependency (it was already installed due to other dependencies)
  • The FilterSelector popover now uses @dhis2/ui instead of material-ui
  • margin-bottom added to EditTitleBar to account for some spacing changes between ui4 and ui5

The Filter popover has been changed from material-ui to dhis2/ui:
Before (with MUI):

After (dhis2/ui):

Overlay with circular loader
Before (ui v4):

After (ui v5):

Vis Item loader:

Before (ui v4):

After (ui v5):

@jenniferarnesen jenniferarnesen marked this pull request as draft June 5, 2020 05:28
@jenniferarnesen
Copy link
Collaborator Author

Found: The Dashboard Item menu is more dense:
Before (ui v4):

After (ui v5):

@jenniferarnesen jenniferarnesen marked this pull request as ready for review June 5, 2020 16:42
@jenniferarnesen jenniferarnesen changed the title fix: upgrade to ui version 5 fix: upgrade to ui version 5 (TECH-385) Jun 5, 2020
@martinkrulltott
Copy link
Contributor

martinkrulltott commented Jun 9, 2020

I just merged #885. Please double check to make sure that the Dynamic Dimension is working as expected with the ui@5 upgrade as well, once dhis2/analytics#476 has been merged and the Analytics version has been bumped in this PR.

@janhenrikoverland
Copy link
Collaborator

Found: The Dashboard Item menu is more dense:
Before (ui v4):

After (ui v5):

Dense is good 👍

@martinkrulltott martinkrulltott changed the title fix: upgrade to ui version 5 (TECH-385) feat: upgrade to ui@5 (TECH-385) Jun 11, 2020
Copy link
Contributor

@martinkrulltott martinkrulltott left a comment

Choose a reason for hiding this comment

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

Looks good. Approved with minor comments. Should also wait for latest Analytics dhis2/analytics#476 and bump before merging.

src/components/ItemFilter/FilterSelector.js Outdated Show resolved Hide resolved
@@ -1,6 +1,7 @@
.section {
display: flex;
justify-content: space-between;
margin-bottom: 14px;
Copy link
Contributor

Choose a reason for hiding this comment

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

margin-bottom: var(--spacers-dp16)?

jenniferarnesen pushed a commit to dhis2/analytics that referenced this pull request Jun 11, 2020
Implements TECH-387
Upgrades ui-core dep to ui@5 (which has a lot of breaking changes)

Relates to dhis2/data-visualizer-app#1068 and dhis2/dashboard-app#891

Major topics:

* PeriodSelector refactored to use name again
* DynamicDimension refactored, note: won't work with pagination!
* New stories for Filter, PeriodDimension and DynamicDimension
* Any component using Transfer, SingleSelect or MultiSelect should've been updated
dhis2-bot added a commit to dhis2/analytics that referenced this pull request Jun 11, 2020
@martinkrulltott
Copy link
Contributor

All instances of Menu needs to be replaced by FlyoutMenu, as per https://developers.dhis2.org/2020/05/ui-5/

The original Menu component has been renamed to FlyoutMenu, which will render a menu in a Card and allows for submenus.

@jenniferarnesen jenniferarnesen merged commit d551b81 into master Jun 16, 2020
@jenniferarnesen jenniferarnesen deleted the fix/upgrrade-ui-to-5 branch June 16, 2020 17:42
dhis2-bot added a commit that referenced this pull request Nov 26, 2020
# [31.1.0](v31.0.1...v31.1.0) (2020-11-26)

### Bug Fixes

* **translations:** sync translations from transifex (master) ([3e55743](3e55743))
* dashboard filter - filter dialog incorrectly shows filter as selected even though it was removed [DHIS2-9560] ([#1074](#1074)) ([54be7c3](54be7c3))
* flyoutMenu thinks every item is a flyout and stops propagation ([#1326](#1326)) ([326dd53](326dd53))
* **translations:** sync translations from transifex (master) ([08d2ca0](08d2ca0))
* **translations:** sync translations from transifex (master) ([32590e4](32590e4))
* **translations:** sync translations from transifex (master) ([f1b76c4](f1b76c4))
* **translations:** sync translations from transifex (master) ([2ef2caa](2ef2caa))
* **translations:** sync translations from transifex (master) ([9dc9a2a](9dc9a2a))
* **translations:** sync translations from transifex (master) ([a10cc54](a10cc54))
* **translations:** sync translations from transifex (master) ([fac8f80](fac8f80))
* **translations:** sync translations from transifex (master) ([e7982d6](e7982d6))
* **translations:** sync translations from transifex (master) ([838e1a1](838e1a1))
* **translations:** sync translations from transifex (master) ([d19c13f](d19c13f))
* **translations:** sync translations from transifex (master) ([3c4f359](3c4f359))
* **translations:** sync translations from transifex (master) ([b3b8a49](b3b8a49))
* **translations:** sync translations from transifex (master) ([bfb34df](bfb34df))
* **translations:** sync translations from transifex (master) ([1cbadba](1cbadba))
* **translations:** sync translations from transifex (master) ([#1295](#1295)) ([b8fdac9](b8fdac9))
* **translations:** sync translations from transifex (master) ([#1323](#1323)) ([26f5d8c](26f5d8c))
* force type COLUMN when viewing table as chart [DHIS2-9599] ([#1317](#1317)) ([fd2f1bb](fd2f1bb))
* ou item filter on App items was crashing Dashboards [DHIS2-9725] ([#1183](#1183)) ([614a42f](614a42f))
* restore schemas list needed for orgunitdlg and interpretations ([#1307](#1307)) ([4e3c83e](4e3c83e))
* switching from table to chart shows wrong data [DHIS2-9599] ([#1196](#1196)) ([ab60389](ab60389))
* try another format ([cc0df29](cc0df29))
* **translations:** sync translations from transifex (master) ([b4e24fb](b4e24fb))
* **translations:** sync translations from transifex (master) ([184a45e](184a45e))
* **translations:** sync translations from transifex (master) ([1cc0b5d](1cc0b5d))
* **translations:** sync translations from transifex (master) ([088e02a](088e02a))
* allow series in the request string ([#1148](#1148)) ([ef7d04e](ef7d04e))
* changing View As on one item was incorrectly causing other items to also change view [DHIS2-9590] ([#1111](#1111)) ([436b354](436b354))
* check whether the dashboard id has been set after the check for existing dashboards [DHIS2-9738] ([#1164](#1164)) ([05a8413](05a8413))
* use better spacing in item title when the title wraps to multiple lines ([#1099](#1099)) ([f76ed0e](f76ed0e))
* use correct prop name for D2Shim ([#1202](#1202)) ([5d521c6](5d521c6))
* **translations:** sync translations from transifex (master) ([b01a670](b01a670))
* add info in print preview about items that were shortened to fit on page [DHIS2-9423] ([#1045](#1045)) ([fde9ef1](fde9ef1))
* apply scrollbar to the dashboard area below the control bars and headerbar [DHIS2-9371] ([#1034](#1034)) ([ed049fe](ed049fe))
* bump Analytics to v11.0.5 and DV plugin to latest ([#1097](#1097)) ([b1d7fab](b1d7fab))
* console warning about invalid dom nesting ([#1049](#1049)) ([7039355](7039355))
* filter bar position (DHIS2-9453) ([#1073](#1073)) ([f573db0](f573db0))
* include title page in edit preview but scroll to below it [DHIS2-9417] ([#1038](#1038)) ([2c49410](2c49410))
* patch rgl with fix ([#1046](#1046)) ([33b046d](33b046d))
* print preview wasnt calculating page bottom correctly ([#1028](#1028)) ([505ad07](505ad07))
* remove unhelpful warning ([#1064](#1064)) ([d6e27e9](d6e27e9))
* save default dashboard title if user does not provide a title [DHIS2-9234] ([#1022](#1022)) ([32d390d](32d390d))
* scroll to top when switching dashboard ([#1040](#1040)) ([b7e6fab](b7e6fab))
* set overflow to hidden for vis and map items ([#1050](#1050)) ([d3b8d93](d3b8d93))
* set passive to true for scroll event listener in ProgressiveLoadingContainer [DHIS2-9508] ([#1084](#1084)) ([763881b](763881b))
* unmount map when switching dashboard mode or changing active type [DHIS2-9558] ([#1083](#1083)) ([147000e](147000e))
* upgrade plugin and analytics ([#1105](#1105)) ([db98d5c](db98d5c))
* **translations:** sync translations from transifex (master) ([0a41693](0a41693))
* **translations:** sync translations from transifex (master) ([491d592](491d592))
* setting selectedId to null caused endless spinner [DHIS2-9337] ([5e899a4](5e899a4))
* tweak info text and style ([#1048](#1048)) ([207530b](207530b))
* use hooks to exert finer control on setting dashboard [DHIS2-9508] ([#1067](#1067)) ([96f50f2](96f50f2))
* **translations:** sync translations from transifex (master) ([7badec8](7badec8))
* **translations:** sync translations from transifex (master) ([6a2bb23](6a2bb23))
* update analytics and dv-plugin ([#1039](#1039)) ([d726aae](d726aae))
* update dashboard scrollbar based on changes to window height [DHIS2-9427] ([#1047](#1047)) ([91999c7](91999c7))
* **translations:** sync translations from transifex (master) ([9dfdbfd](9dfdbfd))
* **translations:** sync translations from transifex (master) ([27a864d](27a864d))
* **translations:** sync translations from transifex (master) ([b1805ad](b1805ad))
* **translations:** sync translations from transifex (master) ([99a89e4](99a89e4))
* @dhis2/[email protected] ([#334](#334)) ([ffce4e5](ffce4e5))
* base url in production ([#1014](#1014)) ([4e63032](4e63032))
* **translations:** sync translations from transifex (master) ([7835db2](7835db2))
* add some more space above description ([#1004](#1004)) ([77dbf1f](77dbf1f))
* **translations:** sync translations from transifex (master) ([6097637](6097637))
* **translations:** sync translations from transifex (master) ([f0cf309](f0cf309))
* **translations:** sync translations from transifex (master) ([f849d52](f849d52))
* @dhis2/[email protected] ([#335](#335)) ([8e65eef](8e65eef))
* add missing reset css for lists ([#700](#700)) ([d73a618](d73a618))
* add title proptype for item header ([#525](#525)) ([1fef3e3](1fef3e3))
* [email protected]@34.3.34 ([#691](#691)) ([119e4f1](119e4f1))
* calculate item height accounting for long title [DHIS2-8492] ([#664](#664)) ([e1f73c9](e1f73c9))
* clear the item filters after the dashboard has been switched ([#612](#612)) ([8d8357f](8d8357f))
* cli-style commit hooks ([#520](#520)) ([f5bdc85](f5bdc85))
* conditionally show the Show More button in item selector ([#326](#326)) ([09d4c87](09d4c87))
* dashboard filter clear button ([#343](#343)) ([7e681d5](7e681d5))
* dashboards loading spinner (DHIS2-8384) + flash bug ([#613](#613)) ([ce2535b](ce2535b))
* [email protected] (DHIS2-8476) ([#662](#662)) ([b6b03c0](b6b03c0))
* [email protected] (DHIS2-8486) ([#663](#663)) ([4be5a31](4be5a31))
* dimensions as array (DHIS2-7787) ([#526](#526)) ([3647034](3647034))
* edit mode performance improvements ([#617](#617)) ([d8bcb58](d8bcb58))
* fall back to old types for visualizations ([#524](#524)) ([fbe93f4](fbe93f4))
* filter redesign ([#528](#528)) ([852459c](852459c))
* filter width + input bug ([#567](#567)) ([751cbc4](751cbc4))
* formatting ([#714](#714)) ([356a3a6](356a3a6))
* hide current vis type as option in 'view as' (DHIS2-8400) ([#616](#616)) ([38ae5fc](38ae5fc))
* hide scrollbar for chart items ([#337](#337)) ([a3b8848](a3b8848))
* hide titles for maps (DHIS2-8616) ([#718](#718)) ([2449234](2449234))
* hide vis action buttons for single value charts ([#336](#336)) ([b42812a](b42812a))
* interpretation comments delete DHIS2-8299 ([#541](#541)) ([6d2b568](6d2b568))
* List items not appearing to get added in edit mode (DHIS2-8567) ([#699](#699)) ([e06c4da](e06c4da))
* make dashboard items draggable again by passing down event props ([#523](#523)) ([86d7d3e](86d7d3e))
* Pass correct style prop to chart plugin on resize & update snapshots ([#299](#299)) ([07c6dec](07c6dec))
* pie tooltip DHIS2-7532 ([#349](#349)) ([fab7ab8](fab7ab8))
* [email protected] ([#593](#593)) ([6119bf2](6119bf2))
* prop types warnings DHIS2-8334 ([#569](#569)) ([381ce06](381ce06))
* remove unused dependency [TECH-316] ([#665](#665)) ([3a8e1a7](3a8e1a7))
* removes the 'view as' menu from gauge and pie ([#615](#615)) ([fd57417](fd57417))
* request program stage for dimensions ([#346](#346)) ([0d00250](0d00250))
* return the right url based on the report type ([#732](#732)) ([c707e93](c707e93))
* revert some css module changes and fix missing units ([#715](#715)) ([123c31d](123c31d))
* set filter badge top position based on offset height ([#301](#301)) ([70f248c](70f248c))
* set focus properties so textfield maintains focus when popover opens ([#297](#297)) ([771854e](771854e))
* set font-weight to 700 according to spec ([#618](#618)) ([e48e080](e48e080))
* update analytics/dv plugin dependencies ([#339](#339)) ([8796bb4](8796bb4))
* update dep for rich text parser fix ([#320](#320)) ([875e9ec](875e9ec))
* update plugin dep ([d837d8c](d837d8c))
* update plugin dep ([#661](#661)) ([febe988](febe988))
* updated dv-plugin for latest legend features ([#570](#570)) ([ae5c95f](ae5c95f))
* upgrade analytics so no ui-core mismatch ([#564](#564)) ([f154dbb](f154dbb))
* upgrade app-runtime-adapter-d2 to fix missing sharing translations ([#1016](#1016)) ([a0841ae](a0841ae))
* upgrade d2 to 31.8.1 ([#619](#619)) ([0671e1d](0671e1d))
* upgrade data-visualizer-plugin to 34.2.5 ([#566](#566)) ([1ccbd66](1ccbd66))
* upgrade DV plugin for single value support ([#332](#332)) ([0b643c7](0b643c7))
* upgrade dv plugin to v34.3.28 ([#623](#623)) ([6e9f30a](6e9f30a))
* upgrade [email protected] ([#620](#620)) ([6ac468b](6ac468b))
* upgrade ui-widgets to 2.1.1 for proper translations ([#851](#851)) ([47e098a](47e098a))
* use measured height of dashboard item in view mode [DHIS2-8492] ([#674](#674)) ([09658e3](09658e3))
* use the new visualizations api ([#591](#591)) ([a89c1cb](a89c1cb))
* use ui alertbar instead of material-ui ([#1149](#1149)) ([6fb0c99](6fb0c99))
* wrap VisPlugin with Fatal error boundary ([#621](#621)) ([1388a8d](1388a8d))
* **filters:** dimension items selection ([#278](#278)) ([8344c4a](8344c4a))
* **filters:** filter the list of dimensions usable as filters ([#287](#287)) ([6569200](6569200))
* **filters:** wrap badges + clear/disable filters on dashboard switch and edit mode ([#280](#280)) ([ad3e3c3](ad3e3c3))
* **styles:** fix styles for filter selector ([#308](#308)) ([3da2b30](3da2b30))
* **TextItem:** use all the vertical space for the input ([#283](#283)) ([9419d28](9419d28))

### Features

* add support for multi root ou in filters ([#345](#345)) ([31dd611](31dd611))
* buffer while scrolling with progressive loading. ([#273](#273)) ([7bea49b](7bea49b))
* condense item header options into a single menu ([#568](#568)) ([993981b](993981b))
* dashboards filters ([#275](#275)) ([bc22817](bc22817))
* Enable epi-weekly periods in filter ([#331](#331)) ([c3d6afc](c3d6afc))
* fetch items chart data on app level ([#271](#271)) ([a2e3e94](a2e3e94))
* implements latest Dynamic Dimension selector from Analytics (DHIS2-8831) ([#885](#885)) ([f878995](f878995)), closes [dhis2/data-visualizer-app#1046](dhis2/data-visualizer-app#1046)
* implements latest Period Selector from Analytics (DHIS2-8807) ([#872](#872)) ([886ccce](886ccce))
* print dashboard [DHIS2-7045] ([#1015](#1015)) ([20cb64f](20cb64f))
* progressive dashboard loading ([#244](#244)) ([19bd63b](19bd63b))
* Show "more button" disabled instead of hiding it ([#323](#323)) ([28396c3](28396c3))
* upgrade to ui@5 (TECH-385) ([#891](#891)) ([d551b81](d551b81)), closes [dhis2/analytics#476](dhis2/analytics#476)
* use the new visualizations type instead of report tables and charts ([#540](#540)) ([8742a6a](8742a6a))

### Reverts

* remove file inadvertently added to master before its time ([#1264](#1264)) ([b6d80f3](b6d80f3))
* Revert "fix: use better spacing in item title when the title wraps to multiple lines (#1099)" (#1112) ([5a0b3b2](5a0b3b2)), closes [#1099](#1099) [#1112](#1112)
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 31.1.0 🎉

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.

4 participants