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.

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

Remove specialist topic code #2068

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion app/controllers/editions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ def tagging_update_form_params
:previous_version,
:parent,
mainstream_browse_pages: [],
topics: [],
organisations: [],
meets_user_needs: [],
ordered_related_items: [],
Expand Down
4 changes: 0 additions & 4 deletions app/lib/tagging/linkables.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
# to use `content_id`, we may move this functionality into a gem.
module Tagging
class Linkables
def topics
@topics ||= for_nested_document_type("topic")
end

def taxons
@taxons ||= for_document_type("taxon")
end
Expand Down
4 changes: 1 addition & 3 deletions app/lib/tagging/tagging_update_form.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Tagging
class TaggingUpdateForm
include ActiveModel::Model
attr_accessor :content_id, :previous_version, :topics, :organisations, :meets_user_needs, :mainstream_browse_pages, :ordered_related_items, :parent
attr_accessor :content_id, :previous_version, :organisations, :meets_user_needs, :mainstream_browse_pages, :ordered_related_items, :parent

validate :ordered_related_items_paths_exist

Expand All @@ -11,7 +11,6 @@ def self.build_from_publishing_api(content_id, locale)
new(
content_id:,
previous_version: link_set.version,
topics: link_set.links["topics"],
organisations: link_set.links["organisations"],
meets_user_needs: link_set.links["meets_user_needs"],
mainstream_browse_pages: link_set.links["mainstream_browse_pages"],
Expand All @@ -30,7 +29,6 @@ def publish!

def links_payload
{
topics: clean_content_ids(topics),
organisations: clean_content_ids(organisations),
meets_user_needs: clean_content_ids(meets_user_needs),
mainstream_browse_pages: clean_content_ids(mainstream_browse_pages),
Expand Down
3 changes: 0 additions & 3 deletions app/presenters/organisation_content_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ def initialize(scope = Artefact.where(owning_app: "publisher"))
slug
state
browse_pages
topics
organisations
]
end
Expand All @@ -27,8 +26,6 @@ def get_value(header, artefact)
case header
when :browse_pages
expanded_links(content_id, %w[mainstream_browse_pages base_path], /\/browse\//)
when :topics
expanded_links(content_id, %w[topics base_path], /\/topic\//)
when :organisations
expanded_links(content_id, %w[organisations title])
when :format
Expand Down
18 changes: 0 additions & 18 deletions app/views/shared/_tagging.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,6 @@
</p>
</div>

<div class="form-group" id="edition_topics_input">
<%= f.label :topics, "Specialist topic pages", class: 'control-label' %>
<%= f.select :topics, @linkables.topics,
{},
{ multiple: true,
class: 'select2',
data: { placeholder: 'Choose Topics…' } } %>

<p class='help-block'>
Specialist topic pages live under <a href="https://www.gov.uk/topic">/topic</a>.
They contain collections of pages on GOV.UK. Example:
<a href="https://www.gov.uk/topic/business-tax">Business Tax</a> or
<a href="https://www.gov.uk/topic/animal-welfare/pets">Animal Welfare / Pets</a>.
Tagging a page to a specialist topic will send out an
<a href="https://www.gov.uk/topic/business-tax/vat/email-signup">email alert to subscribers</a>.
</p>
</div>

<div class="form-group" id="edition_organisations_input">
<%= f.label :organisations, "Organisations", class: 'control-label' %>
<%= f.select :organisations, @linkables.organisations,
Expand Down
38 changes: 1 addition & 37 deletions test/integration/tagging_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class TaggingTest < JavascriptIntegrationTest
assert_publishing_api_patch_links(
@content_id,
links: {
topics: [],
organisations: [],
meets_user_needs: [],
mainstream_browse_pages: %w[CONTENT-ID-RTI CONTENT-ID-VAT],
Expand All @@ -35,27 +34,6 @@ class TaggingTest < JavascriptIntegrationTest
)
end

should "tag to topics" do
visit_edition @edition
switch_tab "Tagging"

select2 "Oil and Gas / Fields", "Oil and Gas / Distillation (draft)", from: "Specialist topic pages"

save_tags_and_assert_success
assert_publishing_api_patch_links(
@content_id,
links: {
topics: %w[CONTENT-ID-DISTILL CONTENT-ID-FIELDS],
organisations: [],
meets_user_needs: [],
mainstream_browse_pages: [],
ordered_related_items: [],
parent: [],
},
previous_version: 0,
)
end

should "tag to organisations" do
visit_edition @edition
switch_tab "Tagging"
Expand All @@ -66,7 +44,6 @@ class TaggingTest < JavascriptIntegrationTest
assert_publishing_api_patch_links(
@content_id,
links: {
topics: [],
organisations: %w[9a9111aa-1db8-4025-8dd2-e08ec3175e72],
meets_user_needs: [],
mainstream_browse_pages: [],
Expand All @@ -87,7 +64,6 @@ class TaggingTest < JavascriptIntegrationTest
assert_publishing_api_patch_links(
@edition.artefact.content_id,
links: {
topics: [],
organisations: [],
meets_user_needs: %w[CONTENT-ID-USER-NEED],
mainstream_browse_pages: [],
Expand Down Expand Up @@ -147,7 +123,6 @@ class TaggingTest < JavascriptIntegrationTest
assert_publishing_api_patch_links(
@content_id,
links: {
topics: [],
organisations: [],
meets_user_needs: [],
mainstream_browse_pages: [],
Expand Down Expand Up @@ -178,7 +153,6 @@ class TaggingTest < JavascriptIntegrationTest
assert_publishing_api_patch_links(
@content_id,
links: {
topics: [],
organisations: [],
meets_user_needs: [],
mainstream_browse_pages: [],
Expand All @@ -196,13 +170,6 @@ class TaggingTest < JavascriptIntegrationTest
body: {
"content_id" => @content_id,
"expanded_links" => {
"topics" => [
{
"content_id" => "CONTENT-ID-WELLS",
"base_path" => "/topic/oil-and-gas/wells",
"internal_name" => "Oil and Gas / Wells",
},
],
"mainstream_browse_pages" => [
{
"content_id" => "CONTENT-ID-RTI",
Expand All @@ -226,14 +193,12 @@ class TaggingTest < JavascriptIntegrationTest
select2 "Tax / RTI (draft)", "Tax / VAT", from: "Mainstream browse pages"

select2 "Tax / Capital Gains Tax", from: "Breadcrumb"
select2 "Oil and Gas / Fields", from: "Specialist topic pages"

save_tags_and_assert_success

assert_publishing_api_patch_links(
@content_id,
links: {
topics: %w[CONTENT-ID-FIELDS CONTENT-ID-WELLS],
organisations: [],
meets_user_needs: [],
mainstream_browse_pages: %w[CONTENT-ID-RTI CONTENT-ID-VAT],
Expand All @@ -248,7 +213,6 @@ class TaggingTest < JavascriptIntegrationTest
stub_publishing_api_has_links(
"content_id" => @content_id,
"links" => {
topics: %w[CONTENT-ID-WELLS],
mainstream_browse_pages: %w[CONTENT-ID-RTI],
parent: %w[CONTENT-ID-RTI],
},
Expand All @@ -258,7 +222,7 @@ class TaggingTest < JavascriptIntegrationTest

switch_tab "Tagging"

select2 "Oil and Gas / Fields", from: "Specialist topic pages"
select2 "Tax / RTI", from: "Mainstream browse pages"

stub_request(:patch, "#{PUBLISHING_API_V2_ENDPOINT}/links/#{@content_id}")
.to_return(status: 409)
Expand Down
6 changes: 0 additions & 6 deletions test/unit/all_urls_presenter_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ class AllUrlsPresenterTest < ActiveSupport::TestCase
"title" => "HMRC",
},
],
"topics" => [
{
"base_path" => "/topic/business-tax/vat",
},
],
},
}
end
Expand Down Expand Up @@ -50,7 +45,6 @@ class AllUrlsPresenterTest < ActiveSupport::TestCase
assert_equal "Important document", data[0]["Name"]
assert_equal "answer", data[0]["Format"]
assert_equal "HMRC", data[0]["Organisations"]
assert_equal "business-tax/vat", data[0]["Topics"]
assert_equal "business/support,tax/vat", data[0]["Browse pages"]
end

Expand Down
6 changes: 0 additions & 6 deletions test/unit/organisation_content_presenter_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ class OrganisationContentPresenterTest < ActiveSupport::TestCase
"title" => "HMRC",
},
],
"topics" => [
{
"base_path" => "/topic/business-tax/vat",
},
],
},
}
end
Expand Down Expand Up @@ -50,7 +45,6 @@ class OrganisationContentPresenterTest < ActiveSupport::TestCase
assert_equal "Important document", data[0]["Name"]
assert_equal "answer", data[0]["Format"]
assert_equal "HMRC", data[0]["Organisations"]
assert_equal "business-tax/vat", data[0]["Topics"]
assert_equal "business/support,tax/vat", data[0]["Browse pages"]
end

Expand Down
13 changes: 0 additions & 13 deletions test/unit/tagging/linkables_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@ class LinkablesTest < ActiveSupport::TestCase
stub_linkables
end

test "returns sorted topics" do
assert_equal(
{
"Oil and Gas" => [
["Oil and Gas / Distillation (draft)", "CONTENT-ID-DISTILL"],
["Oil and Gas / Fields", "CONTENT-ID-FIELDS"],
["Oil and Gas / Wells", "CONTENT-ID-WELLS"],
],
},
Tagging::Linkables.new.topics,
)
end

test "returns sorted browse pages" do
assert_equal(
{
Expand Down
Loading