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.

Sign up for GitHub

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

Jump to bottom

feat: [DHIS2-16123] Add inheritable TEAs to Relationships #3464

Merged
merged 5 commits into from
Dec 1, 2023
Merged

feat: [DHIS2-16123] Add inheritable TEAs to Relationships #3464

merged 5 commits into from
Dec 1, 2023

Conversation

eirikhaugstulen
Copy link
Contributor

Tech summary:

  • Added a hook that checks if the current trackedEntityType has any inheritable attributes and fetches the values if there are any.

@eirikhaugstulen eirikhaugstulen marked this pull request as ready for review November 16, 2023 12:04
@eirikhaugstulen eirikhaugstulen requested a review from a team as a code owner November 16, 2023 12:04
superskip
superskip reviewed Nov 16, 2023
View reviewed changes
Copy link
Contributor

@superskip superskip left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Review service time! 😄

The big thing I noticed is that there is still missing inheritance from non-TET attributes.
In addition you'll find that I've added the usual assorted code comments below.

...ure-core/components/Pages/common/TEIRelationshipsWidget/RegisterTei/RegisterTei.container.js Outdated Show resolved Hide resolved
...s/capture-core/components/Pages/common/TEIRelationshipsWidget/useInheritedAttributeValues.js Outdated Show resolved Hide resolved
...ure-core/components/FormFields/New/Fields/OrgUnitField/SingleOrgUnitSelectField.component.js Show resolved Hide resolved
...dules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useFormValues.js
@@ -152,7 +150,7 @@ export const useFormValues = ({ program, trackedEntityInstanceAttributes, orgUni
formFoundation &&
Object.entries(formFoundation).length > 0 &&
formValuesReadyRef.current === false &&
areAttributesWithSubvaluesReady
!!clientAttributesWithSubvalues
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice! NIT: Can omit !!

...s/capture-core/components/Pages/common/TEIRelationshipsWidget/useInheritedAttributeValues.js Outdated Show resolved Hide resolved
...pture-core/components/DataEntries/TeiRegistrationEntry/hooks/useFormValuesFromSearchTerms.js Outdated Show resolved Hide resolved
...pture-core/components/DataEntries/TeiRegistrationEntry/hooks/useFormValuesFromSearchTerms.js Show resolved Hide resolved
@eirikhaugstulen
Copy link
Contributor Author

Review service time! 😄

The big thing I noticed is that there is still missing inheritance from non-TET attributes. In addition you'll find that I've added the usual assorted code comments below.

Thanks for the review @superskip - fixed all of the things mentioned above!
I was not aware that you could have inheritance on Data Elements 🤔 Can you give me a tip on where to configure this?

superskip
superskip reviewed Nov 17, 2023
View reviewed changes
Copy link
Contributor

@superskip superskip left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@eirikhaugstulen Good job getting through the comments so quickly 🙂

Clarification: TEAs not associated with the TET (for example phone number in TB program).

...s/capture-core/components/Pages/common/TEIRelationshipsWidget/useInheritedAttributeValues.js Outdated Show resolved Hide resolved
.../common/TEIRelationshipsWidget/RegisterTei/DataEntry/Enrollment/dataEntryEnrollment.types.js Outdated Show resolved Hide resolved
@eirikhaugstulen
Copy link
Contributor Author

All right, @superskip - now I get what you mean. Should be better now!

superskip
superskip approved these changes Nov 27, 2023
View reviewed changes
Copy link
Contributor

@superskip superskip left a comment

Choose a reason for hiding this comment

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

LGTM 🎉

@github-actions GitHub Actions
Copy link

🚀 Deployed on https://deploy-preview-3464--dhis2-capture.netlify.app

geethaalwan
geethaalwan approved these changes Nov 30, 2023
View reviewed changes
Copy link

@geethaalwan geethaalwan left a comment

Choose a reason for hiding this comment

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

Tested successfully on 2.41,2.40.3,2.39.4,2.38.6 versions

@eirikhaugstulen eirikhaugstulen merged commit 620b008 into master Dec 1, 2023
36 checks passed
@eirikhaugstulen eirikhaugstulen deleted the eh/feat/DHIS2-16123_InheritableTEAs branch December 1, 2023 07:07
dhis2-bot added a commit that referenced this pull request Dec 3, 2023
@dhis2-bot
chore(release): cut 100.47.0 [skip release]
efa835e 
# [100.47.0](v100.46.1...v100.47.0) (2023-12-03)

### Bug Fixes

* **translations:** sync translations from transifex (master) ([e20fb8c](e20fb8c))

### Features

* [DHIS2-16123] Add inheritable TEAs to Relationships ([#3464](#3464)) ([620b008](620b008))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.47.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@superskip superskip superskip approved these changes

@geethaalwan geethaalwan geethaalwan approved these changes

@simonadomnisoru simonadomnisoru Awaiting requested review from simonadomnisoru

@JoakimSM JoakimSM Awaiting requested review from JoakimSM

Assignees
No one assigned
Labels
released testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eirikhaugstulen @dhis2-bot @geethaalwan @superskip