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

chore: backport multi-calendar functionality into 38.x #2239

Merged
merged 2 commits into from
Mar 7, 2023

Conversation

kabaros
Copy link
Collaborator

@kabaros kabaros commented Mar 2, 2023

Implements LIBS-471

Requires dhis2/analytics#1439


Key features

  1. Backport multi-calendar functionality into DV 38.x

Screenshots

From deploy link

image

@dhis2-bot
Copy link
Contributor

dhis2-bot commented Mar 2, 2023

@kabaros kabaros force-pushed the 38x/backport-multi-calendar branch 6 times, most recently from 8bd2ada to d71ceb5 Compare March 2, 2023 14:28
@cypress
Copy link

cypress bot commented Mar 2, 2023

Passing run #1693 ↗︎

0 581 0 0 Flakiness 0

Details:

Merge 1b9518c into 4990dc2...
Project: Data Visualizer App Commit: 6c94fe4076 ℹ️
Status: Passed Duration: 08:56 💡
Started: Mar 3, 2023 8:37 AM Ended: Mar 3, 2023 8:46 AM

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@kabaros
Copy link
Collaborator Author

kabaros commented Mar 2, 2023

I tested that the multi-calendar periods are working on this back-port. I had to change some settings for the e2e tests to make them pass as well.

For some reason reason, the netlify deploy link stopped working giving a CORS error when trying to login. It was OK a bit earlier.

@kabaros kabaros marked this pull request as ready for review March 2, 2023 15:54
@kabaros
Copy link
Collaborator Author

kabaros commented Mar 2, 2023

tested it works on the deploy link pointing to: https://debug.dhis2.org/2.38dev

image

image

image

Copy link
Member

@amcgee amcgee left a comment

Choose a reason for hiding this comment

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

Change look good, thanks @kabaros ! I'd just recommend using a caret range (^21.9.0) instead of pinning the version of analytics.

@@ -13,7 +13,7 @@
"redux-mock-store": "^1.5.4"
},
"dependencies": {
"@dhis2/analytics": "^21.8.2",
"@dhis2/analytics": "21.9.0",
Copy link
Member

Choose a reason for hiding this comment

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

@kabaros should this be pinned to 21.9.0 or should it be an open range ^21.9.0? I think the latter for consistency unless there's a strong reason to pin the version

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

no, no strong reasons - updated it now.

packages/plugin/package.json Outdated Show resolved Hide resolved
@kabaros kabaros force-pushed the 38x/backport-multi-calendar branch from 62d4625 to 7aad9fa Compare March 3, 2023 08:31
@kabaros kabaros force-pushed the 38x/backport-multi-calendar branch from 7aad9fa to 1b9518c Compare March 3, 2023 08:34
@janhenrikoverland janhenrikoverland merged commit 0f47490 into 38.x Mar 7, 2023
@janhenrikoverland janhenrikoverland deleted the 38x/backport-multi-calendar branch March 7, 2023 08:40
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 38.3.9 🎉

The release is available on:

Your semantic-release bot 📦🚀

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants