Use edition links for Worldwide Organisations #3055
Merged
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
brucebolt
force-pushed
the
add-wworg-edition-links
branch
from
8f692f4 to
66565e1
Compare
brucebolt
force-pushed
the
add-wworg-edition-links
branch
from
66565e1 to
494dc83
Compare
brucebolt
added a commit
that referenced
this pull request
Jan 22, 2024
In #3055, we added support for edition links associated with worldwide organisations. This change included backward compatibility for worldwide organisations without edition links. Once the worldwide organisations have all been republished without non-edition links, we no longer need the backward compatibility here. This also simplifies the code slightly, as the content item now only contains roles that are relevant to the worldwide organisation, rather than needing to filter them on the frontend.
We are switching worldwide organisations to use edition links which do not support multi-level link expanstion. Therefore we need to switch the rendering code to use the new link fields that have been added, in the absence of multi-level links. This change adds support for edition links, but also retains compatibility with non-edition links. This will allow us to deploy the frontend changes in advance of republishing the content items, preventing any downtime of these pages. The code for backward compatibility will be removed once the content items have all been republished with edition links.
We are switching worldwide organisations to use edition links which do not support multi-level link expanstion. Therefore we need to switch the rendering code to use the new link fields that have been added, in the absence of multi-level links. This change adds support for edition links, but also retains compatibility with non-edition links. This will allow us to deploy the frontend changes in advance of republishing the content items, preventing any downtime of these pages. The code for backward compatibility will be removed once the content items have all been republished with edition links.
brucebolt
force-pushed
the
add-wworg-edition-links
branch
from
494dc83 to
ef6aa6a
Compare
brucebolt
added a commit
that referenced
this pull request
Jan 22, 2024
In #3055, we added support for edition links associated with worldwide organisations. This change included backward compatibility for worldwide organisations without edition links. Once the worldwide organisations have all been republished without non-edition links, we no longer need the backward compatibility here. This also simplifies the code slightly, as the content item now only contains roles that are relevant to the worldwide organisation, rather than needing to filter them on the frontend.
brucebolt
added a commit
that referenced
this pull request
Jan 22, 2024
In #3055, we added support for edition links associated with worldwide organisations. This change included backward compatibility for worldwide organisations without edition links. Once the worldwide organisations have all been republished without non-edition links, we no longer need the backward compatibility here. This also simplifies the code slightly, as the content item now only contains roles that are relevant to the worldwide organisation, rather than needing to filter them on the frontend.
brucebolt
added a commit
that referenced
this pull request
Jan 22, 2024
In #3055, we added support for edition links associated with worldwide organisations. This change included backward compatibility for worldwide organisations without edition links. Once the worldwide organisations have all been republished without non-edition links, we no longer need the backward compatibility here. This also simplifies the code slightly, as the content item now only contains roles that are relevant to the worldwide organisation, rather than needing to filter them on the frontend.
brucebolt
added a commit
that referenced
this pull request
Jan 22, 2024
In #3055, we added support for edition links associated with worldwide organisations. This change included backward compatibility for worldwide organisations without edition links. Once the worldwide organisations have all been republished without non-edition links, we no longer need the backward compatibility here. This also simplifies the code slightly, as the content item now only contains roles that are relevant to the worldwide organisation, rather than needing to filter them on the frontend.
callumknights
approved these changes
Jan 24, 2024
hannako
reviewed
Jan 30, 2024
| office_contact_association["office_content_id"] == office_content_id | ||
| }.first | ||
|
|
||
| return unless contact_mapping |
There was a problem hiding this comment.
I notice that we don't perform this check in roles_for_person. Could you possibly link me to the schema change in your publishing API PR that determines this difference?
There was a problem hiding this comment.
It's possible to have an office without a contact, whereas all the people will have a role (as we're only including those people in the content item).
There was a problem hiding this comment.
Ah nice that makes sense, thanks
hannako
approved these changes
Jan 30, 2024
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.
In alphagov/whitehall#8734 and alphagov/publishing-api#2601, we have switched worldwide organisations to use edition links to fix a bug in editionable worldwide organisations.
This applies the changes needed to the frontend to reflect the lack of multi-level link expansion in edition links.
Whilst this change adds support for edition links, it also retains compatibility with non-edition links. This will allow us to deploy the frontend changes in advance of republishing the content items, preventing any downtime of these pages. The code for backward compatibility will be removed once the content items have all been republished with edition links (all the code to be removed has been marked with a comment so it is easy to identify).
Trello card
Follow these steps if you are doing a Rails upgrade.