Merge pull request #21638 from opf/merge-release/17.0-20260112162124

Merge release/17.0 into dev

Author: myabc

app/components/admin/custom_fields/hierarchy/items_component.html.erb

@@ -59,7 +59,7 @@ See COPYRIGHT and LICENSE files for more details.
 
                     component.with_heading(tag: :h3).with_content(I18n.t(blank_header_text))
                     component.with_description { I18n.t(blank_description_text) }
-                    component.with_primary_action(tag: :a, href: new_item_path) do |button|
+                    component.with_primary_action(href: new_item_path) do |button|
                       button.with_leading_visual_icon(icon: :plus)
                       I18n.t(:label_item)
                     end

app/components/filter/filter_component.html.erb

@@ -34,10 +34,18 @@
             }
           ) do %>
         <fieldset class="advanced-filters--container">
-          <a title="<%= t("js.close_form_title") %>"
-             href=""
-             class="advanced-filters--close icon-context icon-close"
-             data-action="filter--filters-form#toggleDisplayFilters"></a>
+          <%=
+            render(
+              Primer::Beta::IconButton.new(
+                icon: :x,
+                scheme: :invisible,
+                classes: "advanced-filters--close",
+                tooltip_direction: :se,
+                aria: { label: t("js.close_form_title") },
+                data: { action: "filter--filters-form#toggleDisplayFilters" }
+              )
+            )
+          %>
           <legend><%= t(:label_filter_plural) %></legend>
           <ul class="advanced-filters--filters">
             <% each_filter do |filter, filter_active, additional_options| %>

app/components/groups/table_component.rb

@@ -54,7 +54,7 @@ def render_blank_slate
         component.with_visual_icon(icon: blank_icon, size: :medium) if blank_icon
         component.with_heading(tag: :h2) { blank_title }
         component.with_description { blank_description }
-        component.with_primary_action(label: t(:label_group_new), tag: :a, href: new_group_path) do |button|
+        component.with_primary_action(label: t(:label_group_new), href: new_group_path) do |button|
           button.with_leading_visual_icon(icon: :plus)
           t("activerecord.models.group")
         end

app/components/individual_principal_base_filter_component.html.erb

@@ -32,10 +32,18 @@ See COPYRIGHT and LICENSE files for more details.
   <fieldset class="simple-filters--container <%= collapsed_class %>" data-members-form-target="filterContainer">
     <legend><%= t(:label_filter_plural) %></legend>
     <% if has_close_icon? %>
-      <a title="<%= t("js.close_form_title") %>"
-         data-action="members-form#toggleMemberFilter"
-         class="toggle-member-filter-link simple-filters--close icon-context icon-close">
-      </a>
+      <%=
+        render(
+          Primer::Beta::IconButton.new(
+            icon: :x,
+            scheme: :invisible,
+            classes: "simple-filters--close",
+            tooltip_direction: :se,
+            aria: { label: t("js.close_form_title") },
+            data: { action: "members-form#toggleMemberFilter" }
+          )
+        )
+      %>
     <% end %>
     <ul class="simple-filters--filters">
       <% if has_statuses? %>

app/components/projects/settings/creation_wizard/blank_slate_component.html.erb

@@ -33,28 +33,12 @@ See COPYRIGHT and LICENSE files for more details.
       render(Primer::Beta::Blankslate.new) do |component|
         component.with_visual_icon(icon: :"project-template")
         component.with_heading(tag: :h2).with_content(title)
-        component.with_description do
-          flex_layout do |flex|
-            flex.with_row(mb: 2) do
-              render(Primer::Beta::Text.new(color: :subtle)) { description }
-            end
-
-            flex.with_row(mt: 4) do
-              render(
-                Primer::Beta::Button.new(
-                  scheme: :primary,
-                  mobile_icon: nil,
-                  mobile_label: label,
-                  aria: { label: },
-                  tag: :a,
-                  href: helpers.toggle_project_settings_creation_wizard_path(@project),
-                  data: { turbo_method: :post }
-                )
-              ) do
-                label
-              end
-            end
-          end
+        component.with_description_content(description)
+        component.with_primary_action(
+          href: helpers.toggle_project_settings_creation_wizard_path(@project),
+          data: { turbo_method: :post }
+        ) do
+          label
         end
       end
     end

app/components/shares/empty_state_component.html.erb

@@ -3,13 +3,5 @@
       component.with_heading(tag: :h2).with_content(
         blankslate_config[:heading_text]
       )
-      component.with_description do
-        flex_layout do |flex|
-          flex.with_row(mb: 2) do
-            render(Primer::Beta::Text.new(color: :subtle)) do
-              blankslate_config[:description_text]
-            end
-          end
-        end
-      end
+      component.with_description_content(blankslate_config[:description_text])
     end %>

app/components/shares/project_queries/empty_state_component.html.erb

@@ -3,13 +3,5 @@
       component.with_heading(tag: :h2).with_content(
         blankslate_config[:heading_text]
       )
-      component.with_description do
-        flex_layout do |flex|
-          flex.with_row(mb: 2) do
-            render(Primer::Beta::Text.new(color: :subtle)) do
-              blankslate_config[:description_text]
-            end
-          end
-        end
-      end
+      component.with_description_content(blankslate_config[:description_text])
     end %>

app/contracts/work_packages/copy_project_contract.rb

@@ -42,6 +42,12 @@ class CopyProjectContract < CopyContract
     delegate :to_s,
              to: :model
 
+    def valid?(_context = nil)
+      # For project copying, we want to preserve the exact state
+      # even if copied work packages would normally be invalid
+      true
+    end
+
     def validate_model? = false
 
     private

app/models/queries/capabilities/filters/context_filter.rb

@@ -35,7 +35,8 @@ class Queries::Capabilities::Filters::ContextFilter < Queries::Capabilities::Fil
 
   def split_values
     values.map do |value|
-      if (matches = value.match(/\A([gw])(\d*)\z/))
+      # @deprecated Remove the context `p` for projects for 17.2
+      if (matches = value.match(/\A([gwp])(\d*)\z/))
         {
           context_key: matches[1],
           context_id: matches[2]

app/models/queries/capabilities/filters/id_filter.rb

@@ -35,7 +35,8 @@ class Queries::Capabilities::Filters::IdFilter < Queries::Capabilities::Filters:
 
   def split_values
     values.map do |value|
-      if (matches = value.match(/\A(\w+\/\w+)\/([wg])(\d*)-(\d+)\z/))
+      # @deprecated Remove the context `p` for projects for 17.2
+      if (matches = value.match(/\A(\w+\/\w+)\/([gwp])(\d*)-(\d+)\z/))
         {
           action: matches[1],
           context_key: matches[2],