Filter people roles by organisation #2906
Merged
+26
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jkempster34
added a commit
to alphagov/publishing-api
that referenced
this pull request
Aug 24, 2023
People linked to a worldwide organisation may have multiple roles, some of which are related to other organsaitions. Currently, we are incorrectly displaying these roles on the world wide organisation pages. This copies the approach taken in alphagov/collections#1719. We link to all roles from the worldwide organisation, then filter out the incorrect ones in the rendering app. See also alphagov/whitehall#8162 and alphagov/government-frontend#2906.
jkempster34
added a commit
to alphagov/whitehall
that referenced
this pull request
Aug 24, 2023
People linked to a worldwide organisation may have multiple roles, some of which are related to other organsaitions. Currently, we are incorrectly displaying these roles on the world wide organisation pages. This copies the approach taken in alphagov/collections#1719. We link to all roles from the worldwide organisation, then filter out the incorrect ones in the rendering app. See also alphagov/publishing-api#2478 and alphagov/government-frontend#2906.
People linked to a worldwide organisation may have multiple roles, some of which are related to other organsaitions. Currently, we are incorrectly displaying these roles on the worldwide organisation pages. This copies the approach taken in alphagov/collections#1719. We link to all roles from the worldwide organisation, then filter out the incorrect ones in the rendering app. See also alphagov/publishing-api#2478 and alphagov/whitehall#8162.
jkempster34
force-pushed
the
ww-org-filter-roles
branch
from
b11fe8d to
10e559c
Compare
CristinaRO
reviewed
Aug 24, 2023
| @@ -6,15 +6,25 @@ def schema_name | |||
| end | |||
|
|
|||
| test "description of primary_role_person should have spaces between roles" do | |||
| presenter = create_presenter(WorldwideOrganisationPresenter, content_item: { "links" => { "primary_role_person" => [{ "details" => { "image" => {} }, "links" => { "role_appointments" => [{ "details" => { "current" => true }, "links" => { "role" => [{ "title" => "Example Role 1" }] } }, { "details" => { "current" => true }, "links" => { "role" => [{ "title" => "Example Role 2" }] } }] } }] } }) | |||
| presenter = create_presenter(WorldwideOrganisationPresenter, content_item: { "links" => { "primary_role_person" => [{ "details" => { "image" => {} }, "links" => { "role_appointments" => [{ "details" => { "current" => true }, "links" => { "role" => [{ "content_id" => "1", "title" => "Example Role 1" }] } }, { "details" => { "current" => true }, "links" => { "role" => [{ "content_id" => "2", "title" => "Example Role 2" }] } }] } }], "roles" => [{ "content_id" => "1" }, { "content_id" => "2" }] } }) | |||
There was a problem hiding this comment.
This is an existing ailment of the test, but would there be value in adding a test to check that when a person doesn't have any current roles for this org the presenter doesn't blow up?
There was a problem hiding this comment.
If the persons role isn't in the filter list, they won't be in the content item at all, so this should be a non-problem. I'm wary of adding too many tests if they aren't needed.
I did wonder what happens if a role appointment doesn't have a role, but I don't think that is possible either, and that would have errored previously too
CristinaRO
approved these changes
Aug 24, 2023
jkempster34
added a commit
to alphagov/whitehall
that referenced
this pull request
Aug 25, 2023
People linked to a worldwide organisation may have multiple roles, some of which are related to other organsaitions. Currently, we are incorrectly displaying these roles on the world wide organisation pages. This copies the approach taken in alphagov/collections#1719. We link to all roles from the worldwide organisation, then filter out the incorrect ones in the rendering app. See also alphagov/publishing-api#2478 and alphagov/government-frontend#2906.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Warning
🚨 Do not merge! 🚨
Depends on alphagov/whitehall#8162 being merged and all worldwide organisations being republished
https://trello.com/c/54I3mDxr
People linked to a worldwide organisation may have multiple roles, some of which are related to other organsaitions. Currently, we are incorrectly displaying these roles on the world wide organisation pages.
This copies the approach taken in alphagov/collections#1719. We link to all roles from the worldwide organisation, then filter out the incorrect ones in the rendering app.
See also alphagov/publishing-api#2478 and alphagov/whitehall#8162.
Follow these steps if you are doing a Rails upgrade.