Merge pull request #11450 from alphagov/configurable-taxons

ChrisBAshton · web-flow · commit e028374b8fad · 2026-05-14T16:02:38.000+01:00
Make "requires_taxon?" a StandardEdition configurable thing [WHIT-3341]
diff --git a/app/models/concerns/standard_edition/taxon.rb b/app/models/concerns/standard_edition/taxon.rb
@@ -0,0 +1,7 @@
+module StandardEdition::Taxon
+  extend ActiveSupport::Concern
+
+  def requires_taxon?
+    type_instance.settings["taxon_required"]
+  end
+end
diff --git a/app/models/configurable_document_types/case_study.json b/app/models/configurable_document_types/case_study.json
@@ -110,6 +110,7 @@
     "organisations": null,
     "backdating_enabled": true,
     "history_mode_enabled": true,
+    "taxon_required": true,
     "translations_enabled": true
   }
 }
diff --git a/app/models/configurable_document_types/government_response.json b/app/models/configurable_document_types/government_response.json
@@ -126,6 +126,7 @@
     "organisations": null,
     "backdating_enabled": true,
     "history_mode_enabled": true,
+    "taxon_required": true,
     "translations_enabled": true
   }
 }
diff --git a/app/models/configurable_document_types/history_page.json b/app/models/configurable_document_types/history_page.json
@@ -88,6 +88,7 @@
     "backdating_enabled": false,
     "history_mode_enabled": false,
     "file_attachments_enabled": false,
+    "taxon_required": true,
     "translations_enabled": false
   }
 }
diff --git a/app/models/configurable_document_types/news_story.json b/app/models/configurable_document_types/news_story.json
@@ -126,6 +126,7 @@
     "organisations": null,
     "backdating_enabled": true,
     "history_mode_enabled": true,
+    "taxon_required": true,
     "translations_enabled": true
   }
 }
diff --git a/app/models/configurable_document_types/press_release.json b/app/models/configurable_document_types/press_release.json
@@ -126,6 +126,7 @@
     "organisations": null,
     "backdating_enabled": true,
     "history_mode_enabled": true,
+    "taxon_required": true,
     "translations_enabled": true
   }
 }
diff --git a/app/models/configurable_document_types/topical_event.json b/app/models/configurable_document_types/topical_event.json
@@ -199,6 +199,7 @@
     "organisations": null,
     "backdating_enabled": false,
     "history_mode_enabled": false,
+    "taxon_required": true,
     "translations_enabled": false
   }
 }
diff --git a/app/models/configurable_document_types/world_news_story.json b/app/models/configurable_document_types/world_news_story.json
@@ -111,6 +111,7 @@
     "organisations": null,
     "backdating_enabled": true,
     "history_mode_enabled": true,
+    "taxon_required": true,
     "translations_enabled": true
   }
 }
diff --git a/app/models/edition.rb b/app/models/edition.rb
@@ -60,7 +60,7 @@ class Edition < ApplicationRecord
   validates_with LinkCheckReportValidator, on: :publish # TODO: make this a configurable StandardEdition property
   validates_with InternalPathLinksValidator, attribute: :body, on: :publish # TODO: make this a configurable StandardEdition property
   validates_with GovspeakContactEmbedValidator, attribute: :body, on: :publish, unless: ->(record) { record.is_a?(StandardEdition) }
-  validates_with TaxonValidator, on: :publish, if: :requires_taxon? # TODO: make this a configurable StandardEdition property
+  validates_with TaxonValidator, on: :publish, if: :requires_taxon?
 
   validates :creator, presence: true
   validates :title, presence: true, if: :title_required?, length: { maximum: 255 }
diff --git a/app/models/standard_edition.rb b/app/models/standard_edition.rb
@@ -11,6 +11,7 @@ class StandardEdition < Edition
   include Edition::WorldwideOrganisations
   include HasBlockContent
   include StandardEdition::LeadImage
+  include StandardEdition::Taxon
 
   FEATURED_DOCUMENTS_DISPLAY_LIMIT = 6
 
diff --git a/features/fixtures/test_configurable_document_type.json b/features/fixtures/test_configurable_document_type.json
@@ -196,6 +196,7 @@
     "rendering_app": "frontend",
     "organisations": null,
     "backdating_enabled": false,
+    "taxon_required": false,
     "translations_enabled": true,
     "file_attachments_enabled": true,
     "features_enabled": true,
diff --git a/features/fixtures/test_configurable_document_type_group.json b/features/fixtures/test_configurable_document_type_group.json
@@ -39,6 +39,7 @@
       "rendering_app": "frontend",
       "organisations": null,
       "backdating_enabled": false,
+      "taxon_required": false,
       "translations_enabled": true,
       "images": {
         "enabled": true,
@@ -96,6 +97,7 @@
       "organisations": null,
       "backdating_enabled": false,
       "translations_enabled": true,
+      "taxon_required": false,
       "images": {
         "enabled": true,
         "usages": {
diff --git a/features/step_definitions/standard_edition_steps.rb b/features/step_definitions/standard_edition_steps.rb
@@ -169,7 +169,7 @@ def default_content_for_locale(locale)
 Then(/^I am on the summary page of the draft titled "([^"]*)"$/) do |title|
   expect(page).to_not have_css(".govuk-error-summary")
   expect(page.find("h1")).to have_content(title)
-  expect(page).to have_content("Your document has been saved.")
+  expect(page).to have_content("Your document has been saved")
   expect(page).to have_content("Test configurable document type")
 end
 
diff --git a/public/configurable-document-type.schema.json b/public/configurable-document-type.schema.json
@@ -456,6 +456,10 @@
           "type": "boolean",
           "description": "Whether file attachments are allowed for this document type. When enabled, it renders the Attachments tab."
         },
+        "taxon_required": {
+          "type": "boolean",
+          "description": "Whether a taxon (topic or world) is required for this document type."
+        },
         "translations_enabled": {
           "type": "boolean",
           "description": "Whether translations are supported for this document type."
@@ -472,6 +476,7 @@
         "backdating_enabled",
         "history_mode_enabled",
         "file_attachments_enabled",
+        "taxon_required",
         "translations_enabled"
       ]
     }
diff --git a/test/fixtures/test_schema.json b/test/fixtures/test_schema.json
@@ -44,6 +44,7 @@
     "organisations": null,
     "backdating_enabled": true,
     "history_mode_enabled": true,
+    "taxon_required": true,
     "translations_enabled": true
   }
 }
diff --git a/test/unit/app/models/concerns/standard_edition/taxon_test.rb b/test/unit/app/models/concerns/standard_edition/taxon_test.rb
@@ -0,0 +1,29 @@
+require "test_helper"
+
+class StandardEdition::TaxonTest < ActiveSupport::TestCase
+  test "requires_taxon? returns true when taxon is required for the document type" do
+    test_type = build_configurable_document_type("test_type_with_taxon_required", {
+      "settings" => {
+        "taxon_required" => true,
+      },
+    })
+    ConfigurableDocumentType.setup_test_types(test_type)
+
+    edition = create(:standard_edition, configurable_document_type: "test_type_with_taxon_required")
+
+    assert edition.requires_taxon?
+  end
+
+  test "requires_taxon? returns false when taxon is not required for the document type" do
+    test_type = build_configurable_document_type("test_type_with_taxon_not_required", {
+      "settings" => {
+        "taxon_required" => false,
+      },
+    })
+    ConfigurableDocumentType.setup_test_types(test_type)
+
+    edition = create(:standard_edition, configurable_document_type: "test_type_with_taxon_not_required")
+
+    assert_not edition.requires_taxon?
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@`
`110`	`110`	`"organisations": null,`
`111`	`111`	`"backdating_enabled": true,`
`112`	`112`	`"history_mode_enabled": true,`
	`113`	`+ "taxon_required": true,`
`113`	`114`	`"translations_enabled": true`
`114`	`115`	`}`
`115`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@`
`126`	`126`	`"organisations": null,`
`127`	`127`	`"backdating_enabled": true,`
`128`	`128`	`"history_mode_enabled": true,`
	`129`	`+ "taxon_required": true,`
`129`	`130`	`"translations_enabled": true`
`130`	`131`	`}`
`131`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@`
`88`	`88`	`"backdating_enabled": false,`
`89`	`89`	`"history_mode_enabled": false,`
`90`	`90`	`"file_attachments_enabled": false,`
	`91`	`+ "taxon_required": true,`
`91`	`92`	`"translations_enabled": false`
`92`	`93`	`}`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,7 @@`
`199`	`199`	`"organisations": null,`
`200`	`200`	`"backdating_enabled": false,`
`201`	`201`	`"history_mode_enabled": false,`
	`202`	`+ "taxon_required": true,`
`202`	`203`	`"translations_enabled": false`
`203`	`204`	`}`
`204`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@`
`111`	`111`	`"organisations": null,`
`112`	`112`	`"backdating_enabled": true,`
`113`	`113`	`"history_mode_enabled": true,`
	`114`	`+ "taxon_required": true,`
`114`	`115`	`"translations_enabled": true`
`115`	`116`	`}`
`116`	`117`	`}`