Merge pull request #8282 from alphagov/remove-obsolete-date-selection…

…-component Remove unused datetime select component
alphagov · Sep 21, 2023 · d353912 · d353912
2 parents f8c50c2 + 109d403
commit d353912
Show file tree

Hide file tree

Showing 30 changed files with 44 additions and 261 deletions.
diff --git a/app/views/admin/call_for_evidence_responses/_form.html.erb b/app/views/admin/call_for_evidence_responses/_form.html.erb
@@ -5,7 +5,7 @@
     legend_text: "Published on (required)",
     heading_size: "l"
   } do %>
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
       prefix: prefix,
       field_name: "published_on",
       date_only: true,

diff --git a/app/views/admin/calls_for_evidence/_date_fields.html.erb b/app/views/admin/calls_for_evidence/_date_fields.html.erb
@@ -4,7 +4,7 @@
     heading_size: "l",
     id: "edition_opening_at",
   } do %>
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
       field_name: "opening_at",
       prefix: "edition",
       error_items: errors_for(edition.errors, :opening_at),
@@ -50,7 +50,7 @@
     heading_size: "l",
     id: "edition_closing_at",
   } do %>
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
       field_name: "closing_at",
       prefix: "edition",
       error_items: errors_for(edition.errors, :closing_at),

diff --git a/app/views/admin/consultation_responses/_form.html.erb b/app/views/admin/consultation_responses/_form.html.erb
@@ -5,7 +5,7 @@
     legend_text: "Published on (required)",
     heading_size: "l"
   } do %>
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
       prefix: prefix,
       field_name: "published_on",
       date_only: true,

diff --git a/app/views/admin/consultations/_date_fields.html.erb b/app/views/admin/consultations/_date_fields.html.erb
@@ -4,7 +4,7 @@
     heading_size: "l",
     id: "edition_opening_at",
   } do %>
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
         field_name: "opening_at",
         prefix: "edition",
         error_items: errors_for(edition.errors, :opening_at),
@@ -50,7 +50,7 @@
     heading_size: "l",
     id: "edition_closing_at",
   } do %>
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
         field_name: "closing_at",
         prefix: "edition",
         error_items: errors_for(edition.errors, :closing_at),

diff --git a/app/views/admin/editions/_first_published_at.html.erb b/app/views/admin/editions/_first_published_at.html.erb
@@ -1,4 +1,4 @@
-<% first_published_at_fields = render("components/datetime_fields_with_govuk_date_component", {
+<% first_published_at_fields = render("components/datetime_fields", {
       field_name: "first_published_at",
       prefix: "edition",
       date_hint: "For example, 01 08 2022",

diff --git a/app/views/admin/editions/_review_reminder_fields.html.erb b/app/views/admin/editions/_review_reminder_fields.html.erb
@@ -17,7 +17,7 @@
               track_label: "Set a reminder to review this content after it has been published",
               track_action: "clicked",
             },
-            conditional: render("components/datetime_fields_with_govuk_date_component", {
+            conditional: render("components/datetime_fields", {
               field_name: "review_at",
               prefix: "edition[document_attributes][review_reminder_attributes]",
               date_only: true,

diff --git a/app/views/admin/editions/_scheduled_publication_fields.html.erb b/app/views/admin/editions/_scheduled_publication_fields.html.erb
@@ -20,7 +20,7 @@
         label: "Schedule for publication",
         value: 1,
         checked: params[:scheduled_publication_active] == "1" || edition.scheduled_publication.present?,
-        conditional: render("components/datetime_fields_with_govuk_date_component", {
+        conditional: render("components/datetime_fields", {
               field_name: "scheduled_publication",
               prefix: "edition",
               error_items: errors_for(edition.errors, :scheduled_publication),

diff --git a/app/views/admin/governments/_form.html.erb b/app/views/admin/governments/_form.html.erb
@@ -19,7 +19,7 @@
         legend_text: "Dates",
         heading_size: "l"
       } do %>
-        <%= render "components/datetime_fields_with_govuk_date_component", {
+        <%= render "components/datetime_fields", {
           date_only: true,
           prefix: "government",
           field_name: "start_date",
@@ -51,7 +51,7 @@
           error_items: errors_for(government.errors, :start_date)
         } %>
 
-        <%= render "components/datetime_fields_with_govuk_date_component", {
+        <%= render "components/datetime_fields", {
           date_only: true,
           prefix: "government",
           field_name: "end_date",

diff --git a/app/views/admin/offsite_links/_form.html.erb b/app/views/admin/offsite_links/_form.html.erb
@@ -39,7 +39,7 @@
     end
   } %>
 
-  <%= render "components/datetime_fields_with_govuk_date_component", {
+  <%= render "components/datetime_fields", {
     prefix: "offsite_link",
     field_name: "date",
     date_heading: "Date",

diff --git a/app/views/admin/organisations/_closed_fields.html.erb b/app/views/admin/organisations/_closed_fields.html.erb
@@ -64,7 +64,7 @@
   },
 } %>
 
-<%= render "components/datetime_fields_with_govuk_date_component", {
+<%= render "components/datetime_fields", {
   date_only: true,
   prefix: "organisation",
   field_name: "closed_at",

diff --git a/app/views/admin/review_reminders/_form.html.erb b/app/views/admin/review_reminders/_form.html.erb
@@ -1,5 +1,5 @@
 <%= form_with model: review_reminder, url: [:admin, document, review_reminder] do |form| %>
-  <%= render("components/datetime_fields_with_govuk_date_component", {
+  <%= render("components/datetime_fields", {
     field_name: "review_at",
     prefix: "review_reminder",
     date_only: true,

diff --git a/app/views/admin/role_appointments/_form.html.erb b/app/views/admin/role_appointments/_form.html.erb
@@ -29,7 +29,7 @@
   } do %>
     <%= render "start_date_field", heading_size: "m", form: form %>
 
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
       date_heading: "End date",
       heading_size: "m",
       field_name: "ended_at",

diff --git a/app/views/admin/role_appointments/_start_date_field.html.erb b/app/views/admin/role_appointments/_start_date_field.html.erb
@@ -1,4 +1,4 @@
-<%= render "components/datetime_fields_with_govuk_date_component", {
+<%= render "components/datetime_fields", {
   date_heading: "Start date (required)",
   heading_size: heading_size,
   field_name: "started_at",

diff --git a/app/views/admin/speeches/_delivered_on_fields.html.erb b/app/views/admin/speeches/_delivered_on_fields.html.erb
@@ -9,7 +9,7 @@
     heading_size: "l",
     id: "edition_delivered_on",
   } do %>
-    <%= render "components/datetime_fields_with_govuk_date_component", {
+    <%= render "components/datetime_fields", {
         field_name: "delivered_on",
         prefix: "edition",
         error_items: errors_for(edition.errors, :delivered_on),

diff --git a/app/views/admin/statistics_announcement_date_changes/new.html.erb b/app/views/admin/statistics_announcement_date_changes/new.html.erb
@@ -10,7 +10,7 @@
         legend_text: "Release date",
         heading_size: "l"
       } do %>
-        <%= render "components/datetime_fields_with_govuk_date_component", {
+        <%= render "components/datetime_fields", {
           id: "statistics_announcement_date_change_release_date",
           date_heading: "Date (required)",
           field_name: "release_date",

diff --git a/app/views/admin/statistics_announcements/_form.html.erb b/app/views/admin/statistics_announcements/_form.html.erb
@@ -69,7 +69,7 @@
       legend_text: "Release date",
       heading_size: "l"
     } do %>
-      <%= render "components/datetime_fields_with_govuk_date_component", {
+      <%= render "components/datetime_fields", {
         id: "statistics_announcement_statistics_announcement_dates_release_date",
         date_heading: "Date (required)",
         field_name: "release_date",

diff --git a/app/views/admin/topical_events/_form.html.erb b/app/views/admin/topical_events/_form.html.erb
@@ -63,7 +63,7 @@
       heading_size: "l",
       margin_bottom: 2
     } do %>
-      <%= render "components/datetime_fields_with_govuk_date_component", {
+      <%= render "components/datetime_fields", {
         date_only: true,
         prefix: "topical_event",
         field_name: "start_date",
@@ -96,7 +96,7 @@
         error_items: errors_for(topical_event.errors, :start_date)
       } %>
 
-      <%= render "components/datetime_fields_with_govuk_date_component", {
+      <%= render "components/datetime_fields", {
         date_only: true,
         prefix: "topical_event",
         field_name: "end_date",

diff --git a/...fields_with_govuk_date_component.html.erb → app/views/components/_datetime_fields.erb b/...fields_with_govuk_date_component.html.erb → app/views/components/_datetime_fields.erb
diff --git a/app/views/components/_datetime_fields.html.erb b/app/views/components/_datetime_fields.html.erb
diff --git a/features/step_definitions/admin_statistics_announcements_steps.rb b/features/step_definitions/admin_statistics_announcements_steps.rb
@@ -117,7 +117,7 @@
   fill_in :statistics_announcement_title, with: announcement_title
   fill_in :statistics_announcement_summary, with: "Summary of publication"
   within "#statistics_announcement_statistics_announcement_dates_release_date" do
-    fill_in_govuk_publishing_date_and_time_field(1.year.from_now.to_s)
+    fill_in_date_and_time_field(1.year.from_now.to_s)
   end
   select organisation.name, from: :statistics_announcement_organisations
 
@@ -141,7 +141,7 @@
   click_on "Change dates"
 
   within "#statistics_announcement_date_change_release_date" do
-    fill_in_govuk_publishing_date_and_time_field("14-Dec-#{Time.zone.today.year.next} 09:30")
+    fill_in_date_and_time_field("14-Dec-#{Time.zone.today.year.next} 09:30")
   end
 
   choose "Exact date (confirmed)"