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

Add hierarchical locations #4794

Merged
merged 18 commits into from
Jun 24, 2024
Merged

Add hierarchical locations #4794

merged 18 commits into from
Jun 24, 2024

Conversation

gjvoosten
Copy link
Collaborator

@gjvoosten gjvoosten commented May 29, 2024 •
edited
Loading

Locations can now have (multiple) parents and children. It is now also possible to merge alpha-2 and alpha-3 codes when merging locations (of type country).

Closes AB#1085, AB#1110, AB#1111

User changes

  • Users can search for reports, people, organizations, positions and locations within a location hierarchy (e.g. to find all locations in a certain country, or all engagements in a region).

Superuser changes

  • Superusers can set parent locations for a location.

Admin changes

  • When merging locations of type country, admins can now select the alpha-2 and alpha-3 codes to be merged.

System admin changes

  • anet.yml or anet-dictionary.yml needs change
  • db needs migration
  • documentation has changed
  • graphql schema has changed

Checklist

  • Described the user behavior in PR body
  • Referenced/updated all related issues
  • commits follow a repo#issue: Title title format and these 7 rules
  • commits have a clean history, otherwise PR may be squash-merged
  • Added and/or updated unit tests
  • Added and/or updated e2e tests
  • Added and/or updated data migrations
  • Updated documentation
  • Resolved all build errors and warnings
  • Opened debt issues for anything not resolved here

@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 6a31273 to 961d573 Compare May 29, 2024 12:29
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch 2 times, most recently from a5cc28c to e3c9169 Compare May 29, 2024 12:37
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 961d573 to af6abce Compare May 29, 2024 14:30
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch 4 times, most recently from 49616cd to 0196f76 Compare May 30, 2024 10:02
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from af6abce to 46e4976 Compare May 30, 2024 12:45
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from 0196f76 to 7389fce Compare May 30, 2024 12:45
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 46e4976 to 9deb299 Compare June 10, 2024 14:55
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from 7389fce to 21987b2 Compare June 10, 2024 14:55
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 9deb299 to 2c6d327 Compare June 11, 2024 07:00
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from 21987b2 to 47f26a3 Compare June 11, 2024 07:00
@gjvoosten gjvoosten mentioned this pull request Jun 11, 2024
Closed
14 tasks
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from 47f26a3 to 4e31b97 Compare June 11, 2024 08:55
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 2c6d327 to 9cb8104 Compare June 11, 2024 09:19
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch 2 times, most recently from 25671f9 to cc4546a Compare June 11, 2024 11:48
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 9cb8104 to 2e93d28 Compare June 11, 2024 11:52
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch 2 times, most recently from cc51c3e to c453fab Compare June 11, 2024 12:08
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 2e93d28 to 59f87e0 Compare June 12, 2024 09:57
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from c453fab to 3330f36 Compare June 12, 2024 10:06
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 59f87e0 to abdad14 Compare June 13, 2024 08:54
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from 3330f36 to 449eb85 Compare June 13, 2024 08:54
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from abdad14 to 587ddda Compare June 13, 2024 11:38
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from 449eb85 to 4bb6b83 Compare June 13, 2024 11:39
@gjvoosten gjvoosten force-pushed the AB-1095-add-customField-type-geo_location branch from 587ddda to 221db03 Compare June 17, 2024 14:41
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from bbae945 to e389599 Compare June 19, 2024 07:04
@gjvoosten gjvoosten marked this pull request as ready for review June 19, 2024 07:06
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from e389599 to 2835e20 Compare June 19, 2024 07:53
gjvoosten and others added 18 commits June 20, 2024 16:57
@gjvoosten
AB#1085 Add locationRelationships
7ae44e3 
Allow locations to have parents and children.
@gjvoosten
AB#1085 Add recursive location search for locations
40f948c
@gjvoosten
AB#1085 Add recursive location search for reports
95dcdba
@gjvoosten
AB#1085 Add recursive location search for organizations
11d7642
@gjvoosten
AB#1085 Add recursive location search for positions
3cd13da
@gjvoosten
AB#1085 Add recursive location search for people
c2fc91e
@gjvoosten
Replace triple-dots in strings with proper ellipsis character
a610a80
@gjvoosten
AB#1085 Allow any response size during testing
66f46bb
@gjvoosten
AB#1085 Improve message when no locations/organizations are selected …
b2c40e0 
…in the search filter
@gjvoosten
AB#1085 Refactor loop detection code
f0f40b3 
Make code DRY'er and easier to re-use.
Extend the loop detection tests.
@gjvoosten
AB#1085 Add loop detection when updating locations
08a2bfa
@gjvoosten
AB#1085 Add parentLocations to location merge
a1aaade
@gjvoosten
Fix approvalSteps merge when merging locations
1866b02
@gjvoosten
AB#1085 Extend wdio tests for location merge
7d96916
@Chessray @gjvoosten
AB#1110 Add alpha-2 and alpha-3 codes to location merge
0a89da9
@gjvoosten
AB#1083 Clear out alpha-2 and alpha-3 codes when saving a non-country…
7db764c 
… location
@gjvoosten
AB#1110 Add wdio tests for alpha-2 and alpha-3 codes in location merge
f68af0f
@gjvoosten
AB#1111 Optionally hide the map for location and position merge
02dc6e1 
Hide the map when neither side of the merge has location coordinates.
@gjvoosten gjvoosten force-pushed the AB-1085-hierarchical-locations branch from 2835e20 to 02dc6e1 Compare June 20, 2024 14:57
midmarch
midmarch requested changes Jun 24, 2024
View reviewed changes
Copy link
Contributor

@midmarch midmarch 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.

✔️ :Creating location hierarchy:

image

✔️ :Searching location with hierarchy:
image

✔️ :Finding a report in the United States

image

@midmarch
Copy link
Contributor

Also tested merging of 2 locations with the same parent location, worked fine.

midmarch
midmarch approved these changes Jun 24, 2024
View reviewed changes
Copy link
Contributor

@midmarch midmarch left a comment

Choose a reason for hiding this comment

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

LGTM

@gjvoosten gjvoosten merged commit 29d197c into main Jun 24, 2024
21 checks passed
@gjvoosten gjvoosten deleted the AB-1085-hierarchical-locations branch June 24, 2024 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@midmarch midmarch midmarch approved these changes

@Chessray Chessray Awaiting requested review from Chessray

@pacodelcastillolopez pacodelcastillolopez Awaiting requested review from pacodelcastillolopez

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gjvoosten @midmarch @Chessray