Maintain lead organisations first when publishing HTML attachments #9166
Conversation
KludgeKML
force-pushed
the
html-attachment-org-ordering
branch
from
0145dc7
to
3f7a05f
Compare
| @@ -38,7 +38,7 @@ def links | |||
| def edition_links | |||
| { | |||
| parent: parent_content_ids, # please use the breadcrumb component when migrating document_type to government-frontend | |||
| organisations: parent.organisations.pluck(:content_id).uniq, | |||
| organisations: (parent.lead_organisations.pluck(:content_id) + parent.supporting_organisations.pluck(:content_id)).uniq, | |||
There was a problem hiding this comment.
Looks like there's already an existing method for retrieving the lead_org_id (and it uses .try to fail gracefully). Can you reuse that method, and add an equivalent for supporting_org_ids that uses .try in the same way?
There was a problem hiding this comment.
Ah, just spotted the existing method only returns one lead org ID, you probably want them all. But lead_org_ids seems a fair method to add.
There was a problem hiding this comment.
I've added in lead_org_ids and supporting_org_ids methods to tidy this up while giving the code a bit more robustness.
| @@ -20,6 +20,10 @@ def access_limited_object | |||
|
|
|||
| delegate :organisations, to: :parent_attachable | |||
|
|
|||
| delegate :lead_organisations, to: :parent_attachable | |||
|
|
|||
| delegate :supporting_organisations, to: :parent_attachable | |||
There was a problem hiding this comment.
Is there a test that can be added to ensure CallForEvidenceResponse and ConsultationResponse delegate these methods? As removing these lines would presumably cause some issues down the line!
There was a problem hiding this comment.
Good idea. Have added tests for this.
KludgeKML
force-pushed
the
html-attachment-org-ordering
branch
2 times, most recently
from
02d8619
to
521daaa
Compare
- add test for ordering. - update existing test to handle new mock requirements - add delegation for call_for_evidence and consultation_response so that they can retrieve lead and supporting organisations separately to pass to presenter. - add tests for delegated methods
KludgeKML
force-pushed
the
html-attachment-org-ordering
branch
from
521daaa
to
921c6c4
Compare
Currently HTML Attachments are publishing with organisations in default order (which means that there's no way for frontend apps to order by putting lead organisations first in the list). This is in contrast to the attachables, which seem to retain some ordering where lead organisations are listed first, example the two links in this ticket:
https://govuk.zendesk.com/agent/tickets/5448531
https://www.gov.uk/government/consultations/improving-the-experiences-of-people-with-mecfs-interim-delivery-plan
https://www.gov.uk/government/consultations/improving-the-experiences-of-people-with-mecfs-interim-delivery-plan/consultation-document-the-interim-delivery-plan-on-mecfs
https://trello.com/c/7d3ERApJ/23-lead-organisation-logos-in-html-publications
Follow these steps if you are doing a Rails upgrade.