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

Remove specialist topic code from Publishing API #2669

Closed
wants to merge 19 commits into from
Closed

Remove specialist topic code from Publishing API #2669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bf0fa5f
Remove topic taxonomy taxons
unoduetre Mar 14, 2024
b155257
Remove topic taxonomy taxons (dist)
unoduetre Mar 14, 2024
234c0ee
Remove links to topics
unoduetre Mar 14, 2024
00f784c
Remove links to topics (dist)
unoduetre Mar 14, 2024
a624df0
Remove topic content schema
unoduetre Mar 14, 2024
2f69bb1
Remove topic content schema (dist)
unoduetre Mar 14, 2024
ad572f9
Remove topics from email alert types
unoduetre Mar 14, 2024
2a8893b
Remove topics from email alert types (dist)
unoduetre Mar 14, 2024
ddaf127
Remove topic tags
unoduetre Mar 14, 2024
513f78f
Remove topic tags (dist)
unoduetre Mar 14, 2024
e20c58c
Fix specs other than Pact specs
unoduetre Mar 15, 2024
ac09a5a
Revert removing topic taxonomy taxons
unoduetre Mar 15, 2024
09d159a
Revert removing topic taxonomy taxons (dist)
unoduetre Mar 15, 2024
f7ba0ff
Fix Pact specs
unoduetre Mar 15, 2024
1ec47ae
Remove specialist topics from database
unoduetre Mar 14, 2024
aab4de5
Merge branch 'main' into 2417-remove-specialist-topic-code-from-publi…
unoduetre Mar 15, 2024
97884ee
Remove topic from allowed_document_types.yml
unoduetre Mar 15, 2024
524c8ba
Fix after merging main
unoduetre Mar 15, 2024
e684811
Remove topic from allowed_document_types.yml (dist)
unoduetre Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions content_schemas/examples/call_for_evidence/frontend/closed_call_for_evidence.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,6 @@
"document_type": "organisation",
"analytics_identifier": "D1198"
}
],
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's cherry pick 234c0ee and 00f784c into its own work - "Remove specialist topics from whitehall_edition_links and base_link schemas, and update relevant schema examples."

I think the CI will fail until we've updated any code that looks for topics in links. Eg breadcrumbs in the gem. In fact having this PR as its own piece of work will help us identify dependencies and give us a to do list of code to update.

"topics": [
{
"content_id": "62e08e6f-9161-42c6-b9dd-0cf8fcab2c69",
"title": "Climate change and energy",
"api_path": "/api/content/environment/climate-change-energy",
"base_path": "/environment/climate-change-energy",
"api_url": "https://www.gov.uk/api/content/environment/climate-change-energy",
"web_url": "https://www.gov.uk/environment/climate-change-energy",
"locale": "en"
}
]
}
}
12 changes: 0 additions & 12 deletions content_schemas/examples/consultation/frontend/open_consultation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,6 @@
"web_url": "https://www.gov.uk/government/world/topic/higher-education",
"locale": "en"
}
],
"topics": [
{
"content_id": "d8ceea35-f206-459c-ad31-4793218111ec",
"title": "Higher education administration",
"base_path": "/topic/higher-education/administration",
"api_path": "/api/content/topic/higher-education/administration",
"api_url": "https://www.gov.uk/api/content/topic/higher-education/administration",
"web_url": "https://www.gov.uk/topic/higher-education/administration",
"locale": "en",
"document_type": "topic"
}
]
}
}
12 changes: 0 additions & 12 deletions content_schemas/examples/consultation/frontend/unopened_consultation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,6 @@
"locale": "en",
"document_type": "document_collection"
}
],
"topics": [
{
"content_id": "ce0487a3-72a9-4348-acd8-0d5b41a5a724",
"title": "Nuclear regulation",
"api_path": "/api/content/topic/environmental-management/nuclear-regulation",
"base_path": "/topic/environmental-management/nuclear-regulation",
"api_url": "https://www.gov.uk/api/content/topic/environmental-management/nuclear-regulation",
"web_url": "https://www.gov.uk/topic/environmental-management/nuclear-regulation",
"locale": "en",
"document_type": "topic"
}
]
}
}
18 changes: 0 additions & 18 deletions content_schemas/examples/detailed_guide/frontend/best-practice-detailed-guide.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,24 +138,6 @@
"web_url": "https://www.gov.uk/government/organisations/uk-visas-and-immigration"
}
],
"topics": [
{
"api_path": "/api/content/topic/immigration-operational-guidance/sponsorship",
"base_path": "/topic/immigration-operational-guidance/sponsorship",
"content_id": "72f7b519-bd58-422a-8eee-b3f0c63aaeeb",
"description": "List of information about Sponsorship.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2015-08-11T14:45:09Z",
"schema_name": "topic",
"title": "Sponsorship",
"withdrawn": false,
"links": {
},
"api_url": "https://www.gov.uk/api/content/topic/immigration-operational-guidance/sponsorship",
"web_url": "https://www.gov.uk/topic/immigration-operational-guidance/sponsorship"
}
],
"available_translations": [
{
"title": "Apply for a Tier 4 sponsor licence",
Expand Down
22 changes: 0 additions & 22 deletions content_schemas/examples/detailed_guide/frontend/detailed_guide.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,6 @@
]
}
}
],
"topics": [
{
"content_id": "6e1d83bc-d37a-447c-bdac-31be4b441417",
"title": "PAYE",
"base_path": "/topic/business-tax/paye",
"api_path": "/api/content/topic/business-tax/paye",
"api_url": "https://www.gov.uk/api/content/topic/business-tax/paye",
"web_url": "https://www.gov.uk/topic/business-tax/paye",
"locale": "en",
"document_type": "topic"
},
{
"content_id": "a481832e-5f10-4d3b-8131-a064b36730ae",
"title": "Business tax",
"base_path": "/topic/business-tax",
"api_path": "/api/content/topic/business-tax",
"api_url": "https://www.gov.uk/api/content/topic/business-tax",
"web_url": "https://www.gov.uk/topic/business-tax",
"locale": "en",
"document_type": "topic"
}
]
}
}
22 changes: 0 additions & 22 deletions content_schemas/examples/detailed_guide/frontend/political_detailed_guide.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,6 @@
"locale": "en",
"document_type": "detailed_guide"
}
],
"topics": [
{
"content_id": "0d59f5e7-a230-4bac-b02c-624a59a34dab",
"title": "Low carbon energy",
"api_path": "/api/content/topic/climate-change-energy/low-carbon-energy",
"base_path": "/topic/climate-change-energy/low-carbon-energy",
"api_url": "https://www.gov.uk/api/content/topic/climate-change-energy/low-carbon-energy",
"web_url": "https://www.gov.uk/topic/climate-change-energy/low-carbon-energy",
"locale": "en",
"document_type": "topic"
},
{
"content_id": "57c6699d-ceda-4168-9d23-3fed774ca776",
"title": "Climate change and energy",
"api_path": "/api/content/topic/climate-change-energy",
"base_path": "/topic/climate-change-energy",
"api_url": "https://www.gov.uk/api/content/topic/climate-change-energy",
"web_url": "https://www.gov.uk/topic/climate-change-energy",
"locale": "en",
"document_type": "topic"
}
]
}
}
30 changes: 0 additions & 30 deletions content_schemas/examples/detailed_guide/frontend/translated_detailed_guide.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,36 +182,6 @@
"title": "Prepare a charity trustees' annual report",
"web_url": "https://www.gov.uk/guidance/prepare-a-charity-trustees-annual-report"
}
],
"topics": [
{
"analytics_identifier": null,
"api_path": "/api/content/topic/running-charity/money-accounts",
"api_url": "https://www.gov.uk/api/content/topic/running-charity/money-accounts",
"base_path": "/topic/running-charity/money-accounts",
"content_id": "6db5a402-5916-4820-89a6-a19c6c9e085e",
"description": "List of information about Charity money, tax and accounts.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2015-08-11T15:10:00.000+00:00",
"schema_name": "topic",
"title": "Charity money, tax and accounts",
"web_url": "https://www.gov.uk/topic/running-charity/money-accounts"
},
{
"analytics_identifier": null,
"api_path": "/api/content/topic/running-charity/managing-charity",
"api_url": "https://www.gov.uk/api/content/topic/running-charity/managing-charity",
"base_path": "/topic/running-charity/managing-charity",
"content_id": "cf2ab891-5bd9-4788-8254-f9444423719c",
"description": "List of information about Managing your charity.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2016-03-21T13:12:32.000+00:00",
"schema_name": "topic",
"title": "Managing your charity",
"web_url": "https://www.gov.uk/topic/running-charity/managing-charity"
}
]
},
"locale": "en",
Expand Down
18 changes: 0 additions & 18 deletions content_schemas/examples/document_collection/frontend/best-practice-document-collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,24 +252,6 @@
"web_url": "https://www.gov.uk/government/policies/road-safety"
}
],
"topics": [
{
"api_path": "/api/content/topic/driving-motorcyle-instructors/improving-training-skills",
"base_path": "/topic/driving-motorcyle-instructors/improving-training-skills",
"content_id": "13c0788e-ed54-4b91-ac96-bac7f795c390",
"description": "List of information about Improving your training skills.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2017-02-24T16:33:23Z",
"schema_name": "topic",
"title": "Improving your training skills",
"withdrawn": false,
"links": {
},
"api_url": "https://www.gov.uk/api/content/topic/driving-motorcyle-instructors/improving-training-skills",
"web_url": "https://www.gov.uk/topic/driving-motorcyle-instructors/improving-training-skills"
}
],
"available_translations": [
{
"title": "National standards for driving and riding",
Expand Down
21 changes: 0 additions & 21 deletions content_schemas/examples/document_collection/frontend/document_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,27 +253,6 @@
"locale": "en"
}
],
"topics": [
{
"content_id": "6e1d83bc-d37a-447c-bdac-31be4b441417",
"title": "PAYE",
"base_path": "/topic/business-tax/paye",
"api_path": "/api/content/topic/business-tax/paye",
"api_url": "https://www.gov.uk/api/content/topic/business-tax/paye",
"web_url": "https://www.gov.uk/topic/business-tax/paye",
"locale": "en",
"document_type": "topic"
},
{
"content_id": "a481832e-5f10-4d3b-8131-a064b36730ae",
"title": "Business tax",
"base_path": "/topic/business-tax",
"api_path": "/api/content/topic/business-tax",
"api_url": "https://www.gov.uk/api/content/topic/business-tax",
"web_url": "https://www.gov.uk/topic/business-tax",
"locale": "en"
}
],
"policies": [
{
"content_id": "ec736c24-aed1-4635-8f3c-389222ca312d",
Expand Down
19 changes: 0 additions & 19 deletions content_schemas/examples/guide/frontend/guide-with-facet-groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,25 +636,6 @@
"web_url": "http://www.dev.gov.uk/education/school-curriculum"
}
],
"topics": [
{
"analytics_identifier": null,
"api_path": "/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"base_path": "/topic/schools-colleges-childrens-services/curriculum-qualifications",
"content_id": "28e39d16-c279-46c6-a7cd-b0a807686928",
"description": "List of information about Curriculum and qualifications.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2016-12-15T16:08:00Z",
"schema_name": "topic",
"title": "Curriculum and qualifications",
"withdrawn": false,
"links": {
},
"api_url": "http://www.dev.gov.uk/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"web_url": "http://www.dev.gov.uk/topic/schools-colleges-childrens-services/curriculum-qualifications"
}
],
"available_translations": [
{
"title": "The national curriculum",
Expand Down
19 changes: 0 additions & 19 deletions content_schemas/examples/guide/frontend/guide-with-no-parent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,25 +673,6 @@
"web_url": "http://www.dev.gov.uk/education/school-curriculum"
}
],
"topics": [
{
"analytics_identifier": null,
"api_path": "/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"base_path": "/topic/schools-colleges-childrens-services/curriculum-qualifications",
"content_id": "28e39d16-c279-46c6-a7cd-b0a807686928",
"description": "List of information about Curriculum and qualifications.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2016-12-15T16:08:00Z",
"schema_name": "topic",
"title": "Curriculum and qualifications",
"withdrawn": false,
"links": {
},
"api_url": "http://www.dev.gov.uk/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"web_url": "http://www.dev.gov.uk/topic/schools-colleges-childrens-services/curriculum-qualifications"
}
],
"available_translations": [
{
"title": "The national curriculum",
Expand Down
19 changes: 0 additions & 19 deletions content_schemas/examples/guide/frontend/guide-with-related-link-overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,25 +711,6 @@
"web_url": "http://www.dev.gov.uk/education/school-curriculum"
}
],
"topics": [
{
"analytics_identifier": null,
"api_path": "/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"base_path": "/topic/schools-colleges-childrens-services/curriculum-qualifications",
"content_id": "28e39d16-c279-46c6-a7cd-b0a807686928",
"description": "List of information about Curriculum and qualifications.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2016-12-15T16:08:00Z",
"schema_name": "topic",
"title": "Curriculum and qualifications",
"withdrawn": false,
"links": {
},
"api_url": "http://www.dev.gov.uk/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"web_url": "http://www.dev.gov.uk/topic/schools-colleges-childrens-services/curriculum-qualifications"
}
],
"available_translations": [
{
"title": "The national curriculum",
Expand Down
19 changes: 0 additions & 19 deletions content_schemas/examples/guide/frontend/guide-with-step-navs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,25 +860,6 @@
"web_url": "http://www.dev.gov.uk/education/school-curriculum"
}
],
"topics": [
{
"analytics_identifier": null,
"api_path": "/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"base_path": "/topic/schools-colleges-childrens-services/curriculum-qualifications",
"content_id": "28e39d16-c279-46c6-a7cd-b0a807686928",
"description": "List of information about Curriculum and qualifications.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2016-12-15T16:08:00Z",
"schema_name": "topic",
"title": "Curriculum and qualifications",
"withdrawn": false,
"links": {
},
"api_url": "http://www.dev.gov.uk/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"web_url": "http://www.dev.gov.uk/topic/schools-colleges-childrens-services/curriculum-qualifications"
}
],
"available_translations": [
{
"title": "The national curriculum",
Expand Down
19 changes: 0 additions & 19 deletions content_schemas/examples/guide/frontend/guide.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,25 +711,6 @@
"web_url": "http://www.dev.gov.uk/education/school-curriculum"
}
],
"topics": [
{
"analytics_identifier": null,
"api_path": "/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"base_path": "/topic/schools-colleges-childrens-services/curriculum-qualifications",
"content_id": "28e39d16-c279-46c6-a7cd-b0a807686928",
"description": "List of information about Curriculum and qualifications.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2016-12-15T16:08:00Z",
"schema_name": "topic",
"title": "Curriculum and qualifications",
"withdrawn": false,
"links": {
},
"api_url": "http://www.dev.gov.uk/api/content/topic/schools-colleges-childrens-services/curriculum-qualifications",
"web_url": "http://www.dev.gov.uk/topic/schools-colleges-childrens-services/curriculum-qualifications"
}
],
"available_translations": [
{
"title": "The national curriculum",
Expand Down
18 changes: 0 additions & 18 deletions ...schemas/examples/guide/frontend/single-page-guide-with-step-navs-and-hide-navigation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,24 +1385,6 @@
"web_url": "https://www.gov.uk/transport/car-driving-tests"
}
],
"topics": [
{
"api_path": "/api/content/topic/driving-tests-and-learning-to-drive/car",
"base_path": "/topic/driving-tests-and-learning-to-drive/car",
"content_id": "d28083b0-7176-4279-bbb8-9ac62e8f0757",
"description": "Services and information for car driving tests and learning to drive a car.",
"document_type": "topic",
"locale": "en",
"public_updated_at": "2018-04-06T14:11:32Z",
"schema_name": "topic",
"title": "Cars",
"withdrawn": false,
"links": {
},
"api_url": "https://www.gov.uk/api/content/topic/driving-tests-and-learning-to-drive/car",
"web_url": "https://www.gov.uk/topic/driving-tests-and-learning-to-drive/car"
}
],
"available_translations": [
{
"title": "Driving test: cars",
Expand Down
Loading