Merge pull request #3414 from alphagov/remove-important-metadata-comp…

…onent Remove important metadata component
alphagov · Dec 3, 2024 · d9eb011 · d9eb011
2 parents 11a2578 + f602401
commit d9eb011
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 198 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -54,3 +54,8 @@ $govuk-include-default-font-face: false;
 .constrained-image {
   max-width: 100%;
 }
+
+.inverse-background {
+  background: $govuk-brand-colour;
+  color: govuk-colour("white");
+}
diff --git a/app/assets/stylesheets/components/_important-metadata.scss b/app/assets/stylesheets/components/_important-metadata.scss
diff --git a/app/views/components/_important_metadata.html.erb b/app/views/components/_important_metadata.html.erb
diff --git a/app/views/components/docs/important_metadata.yml b/app/views/components/docs/important_metadata.yml
diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb
@@ -29,8 +29,15 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'components/important_metadata',
-        items: @content_item.important_metadata %>
+    <% if @content_item.important_metadata.any? %>
+      <%= content_tag :div, class: "important-metadata inverse-background responsive-bottom-margin" do %>
+        <%= render "govuk_publishing_components/components/metadata", {
+          inverse: true, 
+          other: @content_item.important_metadata,
+          margin_bottom: 0,
+        } %>
+      <% end %>
+    <% end %>
 
     <%= render "components/contents_list_with_body", contents: @content_item.contents do %>
       <div class="responsive-bottom-margin">

diff --git a/app/views/content_items/fatality_notice.html.erb b/app/views/content_items/fatality_notice.html.erb
@@ -22,8 +22,16 @@
   <div class="govuk-grid-column-two-thirds">
     <div class="content-bottom-margin">
       <div class="responsive-bottom-margin">
-        <%= render 'components/important_metadata',
-          items: @content_item.important_metadata %>
+        <% if @content_item.important_metadata.any? %>
+          <%= content_tag :div, class: "important-metadata inverse-background responsive-bottom-margin" do %>
+            <%= render "govuk_publishing_components/components/metadata", {
+              inverse: true, 
+              other: @content_item.important_metadata,
+              margin_bottom: 0,
+            } %>
+          <% end %>
+        <% end %>
+
         <%= render 'components/figure',
           src: @content_item.image["url"],
           alt: @content_item.image["alt_text"],

diff --git a/app/views/content_items/specialist_document.html.erb b/app/views/content_items/specialist_document.html.erb
@@ -21,8 +21,15 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'components/important_metadata',
-        items: @content_item.important_metadata %>
+    <% if @content_item.important_metadata.any? %>
+      <%= content_tag :div, class: "important-metadata inverse-background responsive-bottom-margin" do %>
+        <%= render "govuk_publishing_components/components/metadata", {
+          inverse: true, 
+          other: @content_item.important_metadata,
+          margin_bottom: 0,
+        } %>
+      <% end %>
+    <% end %>
 
     <%= render "components/contents_list_with_body", contents: @content_item.contents do %>
 

diff --git a/app/views/content_items/speech.html.erb b/app/views/content_items/speech.html.erb
@@ -24,8 +24,15 @@
   <div class="govuk-grid-column-two-thirds">
     <div class="content-bottom-margin">
       <div class="responsive-bottom-margin">
-        <%= render 'components/important_metadata',
-        items: @content_item.important_metadata %>
+        <% if @content_item.important_metadata.any? %>
+          <%= content_tag :div, class: "important-metadata inverse-background responsive-bottom-margin" do %>
+            <%= render "govuk_publishing_components/components/metadata", {
+              inverse: true, 
+              other: @content_item.important_metadata,
+              margin_bottom: 0,
+            } %>
+          <% end %>
+        <% end %>
 
         <%= render 'components/figure',
           src: @content_item.image["url"],

diff --git a/app/views/content_items/statistical_data_set.html.erb b/app/views/content_items/statistical_data_set.html.erb
@@ -24,7 +24,15 @@
 <%= render 'shared/publisher_metadata_with_logo' %>
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'components/important_metadata', items: @content_item.important_metadata %>
+    <% if @content_item.important_metadata.any? %>
+      <%= content_tag :div, class: "important-metadata inverse-background responsive-bottom-margin" do %>
+        <%= render "govuk_publishing_components/components/metadata", {
+          inverse: true, 
+          other: @content_item.important_metadata,
+          margin_bottom: 0,
+        } %>
+      <% end %>
+    <% end %>
 
     <%= render "components/contents_list_with_body", contents: @content_item.contents do %>
       <div class="responsive-bottom-margin">

diff --git a/app/views/content_items/statistics_announcement.html.erb b/app/views/content_items/statistics_announcement.html.erb
@@ -15,20 +15,29 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render "components/important_metadata",
-        items: @content_item.important_metadata,
-        margin_bottom: true %>
+    <% if @content_item.important_metadata.any? %>
+      <%= content_tag :div, class: "important-metadata inverse-background" do %>
+        <%= render "govuk_publishing_components/components/metadata", {
+          inverse: true, 
+          other: @content_item.important_metadata,
+          margin_bottom: 0,
+        } %>
+      <% end %>
+    <% end %>
 
     <% if @content_item.release_date_changed? %>
       <div class="release-date-changed">
-        <%= render "components/important_metadata",
-        title: t("statistics_announcement.changed_date"),
-        items: {
-          t("statistics_announcement.previous_date") => @content_item.previous_release_date,
-          t("statistics_announcement.reason_for_change") => @content_item.release_date_change_reason,
-        },
-        margin_bottom: true
-        %>
+        <%= content_tag :div, class: "inverse-background" do %>
+          <%= render "govuk_publishing_components/components/metadata", {
+            inverse: true, 
+            other: {
+              t("statistics_announcement.previous_date") => @content_item.previous_release_date,
+              t("statistics_announcement.reason_for_change") => @content_item.release_date_change_reason,
+            },
+            margin_bottom: 0,
+            title: t("statistics_announcement.changed_date"),
+          } %>
+        <% end %>
       </div>
     <% end %>
 

diff --git a/config/initializers/dartsass.rb b/config/initializers/dartsass.rb
@@ -5,7 +5,6 @@
   "components/_contents-list-with-body.scss" => "components/_contents-list-with-body.css",
   "components/_download-link.scss" => "components/_download-link.css",
   "components/_figure.scss" => "components/_figure.css",
-  "components/_important-metadata.scss" => "components/_important-metadata.css",
   "components/_published-dates.scss" => "components/_published-dates.css",
   "views/_guide.scss" => "views/_guide.css",
   "views/_html-publication.scss" => "views/_html-publication.css",

diff --git a/test/components/important_metadata_test.rb b/test/components/important_metadata_test.rb
diff --git a/test/integration/fatality_notice_test.rb b/test/integration/fatality_notice_test.rb
@@ -24,7 +24,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest
       from: {
         "Ministry of Defence": "/government/organisations/ministry-of-defence",
       },
-    })
+    }, context_selector: ".metadata-column")
 
     assert_has_important_metadata(
       "Field of operation": { "Zululand": "/government/fields-of-operation/zululand" },
@@ -60,7 +60,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest
     assert_has_metadata({ from: {
       "Ministry of Defence": "/government/organisations/ministry-of-defence",
       "The Rt Hon Sir Eric Pickles MP": "/government/people/eric-pickles",
-    } })
+    } }, context_selector: ".metadata-column")
   end
 
   test "fatality notice with withdrawn notice" do

diff --git a/test/integration/publication_test.rb b/test/integration/publication_test.rb
@@ -25,7 +25,7 @@ class PublicationTest < ActionDispatch::IntegrationTest
         "Environment Agency": "/government/organisations/environment-agency",
         "The Rt Hon Sir Eric Pickles MP": "/government/people/eric-pickles",
       },
-    })
+    }, context_selector: ".metadata-column")
 
     assert_has_structured_data(page, "Article")
 

diff --git a/test/integration/specialist_document_test.rb b/test/integration/specialist_document_test.rb
@@ -24,7 +24,7 @@ class SpecialistDocumentTest < ActionDispatch::IntegrationTest
         "Air Accidents Investigation Branch":
         "/government/organisations/air-accidents-investigation-branch",
       },
-    })
+    }, context_selector: ".metadata-column")
   end
 
   test "renders published and updated in metadata" do

diff --git a/test/integration/speech_test.rb b/test/integration/speech_test.rb
@@ -27,7 +27,7 @@ class SpeechTest < ActionDispatch::IntegrationTest
         "The Rt Hon Andrea Leadsom MP": "/government/people/andrea-leadsom",
       },
       published: "8 March 2016",
-    })
+    }, context_selector: ".metadata-column")
 
     assert_has_important_metadata(
       "Delivered on":

diff --git a/test/integration/statistical_data_set_test.rb b/test/integration/statistical_data_set_test.rb
@@ -15,7 +15,8 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest
     assert_has_metadata({
       published: "13 December 2012",
       from: { "Department for Transport": "/government/organisations/department-for-transport" },
-    })
+    }, context_selector: ".metadata-column")
+
     assert_footer_has_published_dates("Published 13 December 2012")
   end
 

diff --git a/test/integration/statistics_announcement_test.rb b/test/integration/statistics_announcement_test.rb
@@ -17,7 +17,7 @@ class StatisticsAnnouncementTest < ActionDispatch::IntegrationTest
     assert page.has_text?(@content_item["description"])
     assert page.has_css?('img[alt="Accredited official statistics"]')
 
-    within ".app-c-important-metadata" do
+    within ".important-metadata .gem-c-metadata" do
       assert page.has_text?(:all, "Release date: January 2016 (provisional)")
     end
   end
@@ -45,7 +45,7 @@ class StatisticsAnnouncementTest < ActionDispatch::IntegrationTest
     assert page.has_text?(@content_item["description"])
     assert page.has_text?(:all, "Release date: 20 January 2016 9:30am (confirmed)")
 
-    within ".release-date-changed .app-c-important-metadata" do
+    within ".release-date-changed .gem-c-metadata" do
       assert page.has_text?("The release date has been changed")
       assert page.has_text?("Previous date")
       assert page.has_text?("19 January 2016 9:30am")