From a0c4286fd14ad3ec923191df57a2c2382db830a8 Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Thu, 14 Sep 2023 10:55:31 +0100 Subject: [PATCH] Remove `placeholder` document type Since all rendering has been moved out of Whitehall, there will be no documents published with the type of `placeholder`. Therefore removing it from the schemas. --- content_schemas/allowed_document_types.yml | 1 - content_schemas/dist/formats/generic/frontend/schema.json | 1 - .../dist/formats/generic/notification/schema.json | 1 - .../dist/formats/generic/publisher_v2/schema.json | 1 - .../frontend/schema.json | 1 - .../notification/schema.json | 1 - .../publisher_v2/schema.json | 1 - .../dist/formats/placeholder/frontend/schema.json | 6 +++--- .../dist/formats/placeholder/notification/schema.json | 6 +++--- .../dist/formats/placeholder/publisher_v2/schema.json | 6 +++--- 10 files changed, 9 insertions(+), 16 deletions(-) diff --git a/content_schemas/allowed_document_types.yml b/content_schemas/allowed_document_types.yml index e2d1e898ce..210b27b3b8 100644 --- a/content_schemas/allowed_document_types.yml +++ b/content_schemas/allowed_document_types.yml @@ -112,7 +112,6 @@ - personal_information_charter - petitions_and_campaigns - place -- placeholder - policy_paper - press_release - procurement diff --git a/content_schemas/dist/formats/generic/frontend/schema.json b/content_schemas/dist/formats/generic/frontend/schema.json index baa100b7f6..e8c15261eb 100644 --- a/content_schemas/dist/formats/generic/frontend/schema.json +++ b/content_schemas/dist/formats/generic/frontend/schema.json @@ -148,7 +148,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/generic/notification/schema.json b/content_schemas/dist/formats/generic/notification/schema.json index aebf496e35..f7e9e8d9e6 100644 --- a/content_schemas/dist/formats/generic/notification/schema.json +++ b/content_schemas/dist/formats/generic/notification/schema.json @@ -172,7 +172,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/generic/publisher_v2/schema.json b/content_schemas/dist/formats/generic/publisher_v2/schema.json index c944650349..ca7113f44d 100644 --- a/content_schemas/dist/formats/generic/publisher_v2/schema.json +++ b/content_schemas/dist/formats/generic/publisher_v2/schema.json @@ -158,7 +158,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json b/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json index d0ae4f272a..03707a454c 100644 --- a/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json +++ b/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json @@ -148,7 +148,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json b/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json index acceee158e..cbb6874f61 100644 --- a/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json +++ b/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json @@ -172,7 +172,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json b/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json index 0cd5939d49..9a400d2bcb 100644 --- a/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json +++ b/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json @@ -158,7 +158,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/placeholder/frontend/schema.json b/content_schemas/dist/formats/placeholder/frontend/schema.json index 48b9c954f5..319d0eac8f 100644 --- a/content_schemas/dist/formats/placeholder/frontend/schema.json +++ b/content_schemas/dist/formats/placeholder/frontend/schema.json @@ -148,7 +148,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", @@ -399,9 +398,10 @@ ] }, "schema_name": { - "description": "Should be of the form 'placeholder_my_format_name'. 'placeholder' is allowed for backwards compatibility.", "type": "string", - "pattern": "^(placeholder|placeholder_.+)$" + "enum": [ + "placeholder" + ] }, "title": { "$ref": "#/definitions/title" diff --git a/content_schemas/dist/formats/placeholder/notification/schema.json b/content_schemas/dist/formats/placeholder/notification/schema.json index 457143fa52..b9cbbaf2a6 100644 --- a/content_schemas/dist/formats/placeholder/notification/schema.json +++ b/content_schemas/dist/formats/placeholder/notification/schema.json @@ -172,7 +172,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", @@ -483,9 +482,10 @@ "$ref": "#/definitions/routes" }, "schema_name": { - "description": "Should be of the form 'placeholder_my_format_name'. 'placeholder' is allowed for backwards compatibility.", "type": "string", - "pattern": "^(placeholder|placeholder_.+)$" + "enum": [ + "placeholder" + ] }, "search_user_need_document_supertype": { "description": "Document supertype grouping core and government documents", diff --git a/content_schemas/dist/formats/placeholder/publisher_v2/schema.json b/content_schemas/dist/formats/placeholder/publisher_v2/schema.json index 10a81a06f0..3e5014ae14 100644 --- a/content_schemas/dist/formats/placeholder/publisher_v2/schema.json +++ b/content_schemas/dist/formats/placeholder/publisher_v2/schema.json @@ -158,7 +158,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", @@ -286,9 +285,10 @@ "$ref": "#/definitions/routes" }, "schema_name": { - "description": "Should be of the form 'placeholder_my_format_name'. 'placeholder' is allowed for backwards compatibility.", "type": "string", - "pattern": "^(placeholder|placeholder_.+)$" + "enum": [ + "placeholder" + ] }, "title": { "$ref": "#/definitions/title"