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

fix: [DHIS2-6335] use custom map center point #3312

Merged
merged 82 commits into from
Mar 21, 2024
Merged

fix: [DHIS2-6335] use custom map center point #3312

merged 82 commits into from
Mar 21, 2024

Conversation

simonadomnisoru
Copy link
Contributor

@simonadomnisoru simonadomnisoru commented Jun 13, 2023 •
edited
Loading

DHIS2-6335

Tech summary

  • The orgUnit geometry is retrieved using useApiMetadataQuery(react query) by useCenterPoint hook in the WidgetEnrollment and withCenterPoint HOC in the rest of the forms.
  • The geometry is only retrieved when we open the map and no coordinate/polygon has been saved previously.
  • When the orgUnit is missing the geometry information, a fallback is used to search the parent orgUnit until a viable one is found. The Map will default to London coordinates if no viable geometry info is found.
  • The geometry information is converted based on its type (Point or Polygon) to Array and passed to the Map component.

jasminenguyennn and others added 30 commits December 6, 2022 16:25
@jasminenguyennn
feat: [DHIS2-13237] add coordinate with map
7f8ab42
@jasminenguyennn
chore: minor fix
c9e22f4
@jasminenguyennn
feat: [DHIS2-13237] handle polygon in the map
29b5ee9
@jasminenguyennn
chore: fix flow
02b7e6d
@jasminenguyennn
chore: [DHIS2-13237] convert coordinates
6e392c7
@jasminenguyennn
feat: [DHIS2-13237] open on click and add new location
10c0237
@jasminenguyennn
feat: [DHIS2-13237] handle add geometry
d610ef6
@jasminenguyennn
feat: [DHIS2-13237] update locations
562e73c
@jasminenguyennn
chore: [DHIS2-13237] minor fix
6e1ea40
@jasminenguyennn
Merge branch 'master' into DHIS2-13237
c3d2cc0
@jasminenguyennn
chore: [DHIS2-13237] minor fix
2d7f6f8
@jasminenguyennn
Merge branch 'master' into DHIS2-13237
261dd92
@jasminenguyennn
Merge branch 'master' into DHIS2-13237
bab56da
@jasminenguyennn
fix: minor fix
89f91b0
@jasminenguyennn
Merge branch 'master' into DHIS2-13237
58cf3cf
@jasminenguyennn
chore: [DHIS2-13237] update review feedbacks
7c58207
@jasminenguyennn
chore: [DHIS2-13237] move folder
d94835e
@jasminenguyennn
Merge branch 'master' into DHIS2-13237
1054a57
@jasminenguyennn
chore: [DHIS2-13237] minor add default value
d6586c9
@jasminenguyennn
chore: [DHIS2-13237] update edit polygon
ddb709d
@jasminenguyennn
fix: [DHIS2-13237] minor fix
aee5480
@jasminenguyennn
Merge branch 'master' into DHIS2-13237
1321d38
@jasminenguyennn
chore: [DHIS2-13237] fit bounds
a31ec08
@jasminenguyennn
fix: [DHIS2-13237] fix flow
8b7c0fa
@jasminenguyennn
fix: minor fix
d9a9f2e
@jasminenguyennn
Merge branch 'master' into DHIS2-13237
a24b951
@jasminenguyennn
feat: [DHIS2-13237] add search feature
64e5577
@jasminenguyennn
feat: [DHIS2-13237] add input fields
67da33c
@jasminenguyennn
fix: [DHIS2-13237] fix flow
1f29f52
@jasminenguyennn
feat: [DHIS2-13237] update view/edit state
a3a9dac
JoakimSM
JoakimSM approved these changes Mar 20, 2024
View reviewed changes
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.

👍 Nice, change the query key (see comment) and let's get this one in.

(We should probably change the source org. unit in a couple of places, but we need to discuss it a bit first, so this will be other tickets)

src/core_modules/capture-core/components/FormFields/New/HOC/withCenterPoint.js Outdated
const { orgUnit, ...passOnProps } = props;
const [orgUnitKey, setOrgUnitKey] = useState(orgUnit.id);
const [shouldFetch, setShouldFetch] = useState(false);
const queryKey = ['organisationUnit', orgUnitKey];
Copy link
Member

Choose a reason for hiding this comment

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

Let's change the key to reflect that we are just getting geometry here (so we don't clash with other caches). Suggestion: ['organisationUnit', 'geometry', orgUnitKey]

And use same key in useCenterPoint.js

geethaalwan
geethaalwan approved these changes Mar 21, 2024
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.41,2.40.4,2.39.6,2.38.7 versions

@simonadomnisoru simonadomnisoru merged commit 2dbaffe into master Mar 21, 2024
42 checks passed
@simonadomnisoru simonadomnisoru deleted the DHIS2-6335 branch March 21, 2024 10:28
dhis2-bot added a commit that referenced this pull request Mar 21, 2024
@dhis2-bot
chore(release): cut 100.67.5 [skip release]
813afd1 
## [100.67.5](v100.67.4...v100.67.5) (2024-03-21)

### Bug Fixes

* [DHIS2-6335] use custom map center point ([#3312](#3312)) ([2dbaffe](2dbaffe))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.67.5 🎉

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

@geethaalwan geethaalwan geethaalwan approved these changes

@JoakimSM JoakimSM JoakimSM approved these changes

@superskip superskip Awaiting requested review from superskip

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

Successfully merging this pull request may close these issues.
6 participants
@simonadomnisoru @dhis2-bot @JoakimSM @geethaalwan @superskip @jasminenguyennn