Merge branch 'release/17.5' into dev

app/components/admin/settings/project_reserved_identifiers/row_component.rb

@@ -38,11 +38,6 @@ module Admin::Settings::ProjectReservedIdentifiers
       row.slug
     end
 
-    def reserved_at
-      t("admin.reserved_identifiers.reserved_ago",
-        time: helpers.time_ago_in_words(row.created_at))
-    end
-
     def button_links
       [release_button]
     end
@@ -54,7 +49,7 @@ module Admin::Settings::ProjectReservedIdentifiers
         Primer::Beta::Button.new(
           tag: :a,
           href: confirm_dialog_admin_settings_project_reserved_identifier_path(row.id),
-          scheme: :link,
+          scheme: :danger,
           size: :small,
           data: { turbo_stream: true }
         )

app/components/admin/settings/project_reserved_identifiers/table_component.rb

@@ -30,17 +30,17 @@
 
 module Admin::Settings::ProjectReservedIdentifiers
   class TableComponent < OpPrimer::BorderBoxTableComponent
-    columns :project, :identifier, :reserved_at
-    mobile_columns :identifier, :reserved_at
+    columns :project, :identifier
+    main_column :identifier
+    mobile_columns :identifier
 
     def mobile_title = I18n.t("admin.reserved_identifiers.title")
     def has_actions? = true
 
     def headers
       [
-        [:project,     { caption: t("admin.reserved_identifiers.col_project") }],
-        [:identifier,  { caption: t("admin.reserved_identifiers.col_identifier") }],
-        [:reserved_at, { caption: t("admin.reserved_identifiers.col_reserved") }]
+        [:project,    { caption: t("admin.reserved_identifiers.col_project") }],
+        [:identifier, { caption: t("admin.reserved_identifiers.col_identifier") }]
       ]
     end
 

spec/components/admin/settings/project_reserved_identifiers/row_component_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe Admin::Settings::ProjectReservedIdentifiers::RowComponent, type:
     expect(rendered_component).to have_text("old-id")
   end
 
-  it "renders a Release action link pointing to the confirm dialog" do
+  it "renders a Release danger button pointing to the confirm dialog" do
     expect(rendered_component).to have_link(
       I18n.t("admin.reserved_identifiers.btn_release"),
       href: confirm_dialog_admin_settings_project_reserved_identifier_path(slug.id)

spec/components/admin/settings/project_reserved_identifiers/table_component_spec.rb

@@ -36,7 +36,6 @@ RSpec.describe Admin::Settings::ProjectReservedIdentifiers::TableComponent, type
   shared_examples_for "rendering column headings" do
     it_behaves_like "rendering Border Box Grid heading", text: "Project"
     it_behaves_like "rendering Border Box Grid heading", text: "Identifier"
-    it_behaves_like "rendering Border Box Grid heading", text: "Reserved"
     it_behaves_like "rendering Border Box Grid mobile heading", text: "Reserved project identifiers"
   end
 
@@ -57,7 +56,7 @@ RSpec.describe Admin::Settings::ProjectReservedIdentifiers::TableComponent, type
 
     it_behaves_like "rendering Box", row_count: 1
     it_behaves_like "rendering column headings"
-    it_behaves_like "rendering Border Box Grid rows", row_count: 1, col_count: 3
+    it_behaves_like "rendering Border Box Grid rows", row_count: 1, col_count: 2
 
     it "renders the identifier" do
       expect(rendered_component).to have_text("old-id")