From 2dcb09a1d99e02e925ab1b8dfc93dcbfdf0a5389 Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Tue, 30 Jan 2024 16:06:33 +0000 Subject: [PATCH] Remove non-edition worldwide organisation links We have switched from non-edition links to edition links for worldwide organisations in https://github.com/alphagov/whitehall/pull/8778. --- .../publisher_v2/links.json | 36 ------------------- .../formats/worldwide_organisation.jsonnet | 11 ------ 2 files changed, 47 deletions(-) diff --git a/content_schemas/dist/formats/worldwide_organisation/publisher_v2/links.json b/content_schemas/dist/formats/worldwide_organisation/publisher_v2/links.json index 7c7219d03..78d27f113 100644 --- a/content_schemas/dist/formats/worldwide_organisation/publisher_v2/links.json +++ b/content_schemas/dist/formats/worldwide_organisation/publisher_v2/links.json @@ -10,26 +10,14 @@ "type": "object", "additionalProperties": false, "properties": { - "corporate_information_pages": { - "description": "Corporate information pages for this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, "finder": { "description": "Powers links from content back to finders the content is surfaced on", "$ref": "#/definitions/guid_list" }, - "home_page_offices": { - "description": "The offices, other than the main office, to be shown on the home page of this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, "lead_organisations": { "description": "DEPRECATED: A subset of organisations that should be emphasised in relation to this content item. All organisations specified here should also be part of the organisations array.", "$ref": "#/definitions/guid_list" }, - "main_office": { - "description": "The main office for this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, "mainstream_browse_pages": { "description": "Powers the /browse section of the site. These are known as sections in some legacy apps.", "$ref": "#/definitions/guid_list" @@ -38,10 +26,6 @@ "description": "The user needs this piece of content meets.", "$ref": "#/definitions/guid_list" }, - "office_staff": { - "description": "People currently appointed to office staff roles in this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, "ordered_related_items": { "description": "Related items, can be any page on GOV.UK. Mostly used for mainstream content to power the sidebar. Ordering of the links is determined by the editor in Content Tagger.", "$ref": "#/definitions/guid_list" @@ -72,22 +56,6 @@ "$ref": "#/definitions/guid_list", "maxItems": 1 }, - "primary_role_person": { - "description": "The person currently appointed to a primary role in this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, - "roles": { - "description": "All roles associated with this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, - "secondary_role_person": { - "description": "The person currently appointed to a secondary role in this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, - "sponsoring_organisations": { - "description": "Sponsoring organisations for this Worldwide Organisation", - "$ref": "#/definitions/guid_list" - }, "suggested_ordered_related_items": { "description": "Used for displaying related content on most pages, except for step-by-step and fatality notices. Links and their ordering are determined by the machine learning algorithms.", "$ref": "#/definitions/guid_list" @@ -99,10 +67,6 @@ "topics": { "description": "Powers the /topic section of the site. These are known as specialist sectors in some legacy apps.", "$ref": "#/definitions/guid_list" - }, - "world_locations": { - "description": "World Locations associated with this Worldwide Organisation", - "$ref": "#/definitions/guid_list" } } }, diff --git a/content_schemas/formats/worldwide_organisation.jsonnet b/content_schemas/formats/worldwide_organisation.jsonnet index 3f5766392..b27232137 100644 --- a/content_schemas/formats/worldwide_organisation.jsonnet +++ b/content_schemas/formats/worldwide_organisation.jsonnet @@ -111,17 +111,6 @@ }, }, }, - links: (import "shared/base_links.jsonnet") + { - corporate_information_pages: "Corporate information pages for this Worldwide Organisation", - main_office: "The main office for this Worldwide Organisation", - home_page_offices: "The offices, other than the main office, to be shown on the home page of this Worldwide Organisation", - primary_role_person: "The person currently appointed to a primary role in this Worldwide Organisation", - secondary_role_person: "The person currently appointed to a secondary role in this Worldwide Organisation", - office_staff: "People currently appointed to office staff roles in this Worldwide Organisation", - sponsoring_organisations: "Sponsoring organisations for this Worldwide Organisation", - world_locations: "World Locations associated with this Worldwide Organisation", - roles: "All roles associated with this Worldwide Organisation", - }, edition_links: (import "shared/base_edition_links.jsonnet") + { contacts: "The contacts linked to offices of this Worldwide Organisation", corporate_information_pages: "Corporate information pages for this Worldwide Organisation",