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: DHIS2-10830 capture app will crash when program is missing some orgUnits #1600

Merged
merged 17 commits into from
Apr 9, 2021

Conversation

paschalidi
Copy link
Contributor

@paschalidi paschalidi commented Apr 1, 2021

This is based on #1598 would be amazing if you could check that PR first @JoakimSM 🙏

https://jira.dhis2.org/browse/DHIS2-10830

This bug will appear only when we login with the user englishB. @vilkg I thought this is a good opportunity to write a smoke test for that user. Let me know your thoughts please. As I said on slack I am concerned QA might be doing the same sort of testing. If this is the case we might want to find a way not to duplicate that effort 🙂

JoakimSM and others added 13 commits March 1, 2021 13:39
* chore: only the fail true is on

* chore: fixes existing tests

* chore: reduces time

* chore: drops time more

* chore: adds 1000 ms

* chore: bring time to 20000

* chore: fixes new page

* chore: bring time down to 7000

* chore: time is 12000

* chore: timer is 14000

* chore: time equals 12000

* feat: extracts the functions

* chore: drops time to 6000

* chore: up to 12000

* chore: 15000

* chore: rebase and splits the shared steps

* chore: addmission date and missing steps

* chore: random and

* chore: fixes the tests

* chore: typo

* fix: program error bug (#1532)

* chore: solves the bug

* chore: covers with tests

* chore: adds missing test cases
## [1.15.1](v1.15.0...v1.15.1) (2021-03-04)

### Bug Fixes

* the bug ([#1536](#1536)) ([fd2616f](fd2616f))
* fix: DHIS2-10738 pressing the back button after a fallback crashes app (#1581)

* chore: sets to false

* chore: covers bug case

* fix: the bug (#1580)
@paschalidi paschalidi requested a review from JoakimSM April 1, 2021 09:54
@paschalidi paschalidi changed the base branch from v36 to cp/merge/master-onto-v36 April 1, 2021 10:07
@paschalidi paschalidi requested a review from vilkg April 1, 2021 10:09
Copy link
Contributor

@vilkg vilkg left a comment

Choose a reason for hiding this comment

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

Nice! Cypress tests fail though :(

@paschalidi
Copy link
Contributor Author

@vilkg this is a backend issue, I believe @JoakimSM knows more about it.

Base automatically changed from cp/merge/master-onto-v36 to v36 April 8, 2021 10:25
Copy link
Member

@JoakimSM JoakimSM left a comment

Choose a reason for hiding this comment

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

Thanks @paschalidi!

I pushed an additional commit to ensure organisationUnits in Program are never undefined / null.

@paschalidi paschalidi merged commit dc1a351 into v36 Apr 9, 2021
@paschalidi paschalidi deleted the cp/fix/DHIS2-10830-orgunit-breaking-capture branch April 9, 2021 09:55
dhis2-bot added a commit that referenced this pull request Apr 23, 2021
# [1.16.0](v1.15.1...v1.16.0) (2021-04-23)

### Bug Fixes

* **translations:** [DHIS2-8998] translate strings ([b92350c](b92350c))
* correct app name and title specified in d2.config.js ([#1599](#1599)) ([f14cf01](f14cf01))
* DHIS2-10711 duplicated calls on search page ([#1572](#1572)) ([1360124](1360124))
* DHIS2-10712 duplicate checking on save only ([3665b76](3665b76))
* DHIS2-10713 when optionSet use EQ to filter ([#1624](#1624)) ([60b3764](60b3764)), closes [#1618](#1618)
* DHIS2-10715 working lists default sorting ([e8280c3](e8280c3))
* DHIS2-10716 use code if option not found ([b80effd](b80effd))
* DHIS2-10723 ([#1622](#1622)) ([#1631](#1631)) ([fce7307](fce7307))
* DHIS2-10723 port on 2.36.0 ([#1630](#1630)) ([#1633](#1633)) ([b47524f](b47524f)), closes [#1622](#1622)
* **translations:** [DHIS2-8998] missing translation ([#1617](#1617)) ([70b103e](70b103e))
* DHIS2-10738 pressing the back button after a fallback crashes app ([#1581](#1581)) ([6a75e9c](6a75e9c))
* DHIS2-10765 use form names ([8578891](8578891))
* DHIS2-10765 use form names ([ab74dc3](ab74dc3))
* DHIS2-10830 capture app will crash when program is missing some orgUnits ([#1600](#1600)) ([dc1a351](dc1a351)), closes [#1483](#1483) [#1532](#1532) [#1410](#1410) [#1536](#1536) [#1536](#1536) [#1588](#1588) [#1581](#1581) [#1580](#1580) [#1589](#1589)
* DHIS2-9931 wording from Find to Search ([#1540](#1540)) ([0893bad](0893bad))
* TECH-542 Switch to new endpoint for org units ([dba014e](dba014e))
* the bug ([#1536](#1536)) ([043f4fd](043f4fd))
* the bug ([#1580](#1580)) ([c491a00](c491a00))
* **translations:** sync translations from transifex (v36) ([c017642](c017642))

### Features

* adds new icon for capture app ([#1534](#1534)) ([c700edd](c700edd))
* adds smaller icon ([#1544](#1544)) ([181a94c](181a94c))
* DHIS2-10218 stages and events widget - user can see a list of the different stages ([524dd92](524dd92))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 1.16.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