[pull] dev from opf:dev

Gemfile

@@ -412,4 +412,4 @@ end
 
 gem "openproject-octicons", "~>19.23.0"
 gem "openproject-octicons_helper", "~>19.23.0"
-gem "openproject-primer_view_components", "~>0.59.1"
+gem "openproject-primer_view_components", "~>0.59.2"

Gemfile.lock

@@ -399,7 +399,7 @@ GEM
     bindata (2.5.0)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    brakeman (7.0.0)
+    brakeman (7.0.1)
       racc
     browser (6.2.0)
     builder (3.3.0)
@@ -504,7 +504,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-monads (1.8.2)
+    dry-monads (1.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
@@ -858,7 +858,7 @@ GEM
       actionview
       openproject-octicons (= 19.23.0)
       railties
-    openproject-primer_view_components (0.59.1)
+    openproject-primer_view_components (0.59.2)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.23.0)
@@ -1063,18 +1063,18 @@ GEM
     rspec-support (3.13.2)
     rspec-wait (1.0.1)
       rspec (>= 3.4)
-    rubocop (1.75.1)
+    rubocop (1.75.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.43.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.43.0)
+    rubocop-ast (1.44.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -1215,7 +1215,7 @@ GEM
       public_suffix
     vcr (6.3.1)
       base64
-    vernier (1.6.0)
+    vernier (1.7.0)
     view_component (3.22.0)
       activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (= 1.3.4)
@@ -1391,7 +1391,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.23.0)
   openproject-octicons_helper (~> 19.23.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.59.1)
+  openproject-primer_view_components (~> 0.59.2)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1535,7 +1535,7 @@ CHECKSUMS
   bigdecimal (3.1.9) sha256=2ffc742031521ad69c2dfc815a98e426a230a3d22aeac1995826a75dabfad8cc
   bindata (2.5.0) sha256=29dccb8ba1cc9de148f24bb88930840c62db56715f0f80eccadd624d9f3d2623
   bootsnap (1.18.4) sha256=ac4c42af397f7ee15521820198daeff545e4c360d2772c601fbdc2c07d92af55
-  brakeman (7.0.0) sha256=1a0122b0c70f17519a61548a53a332c0acc19e3aa10b445e15e025a4b13b8577
+  brakeman (7.0.1) sha256=ec751d439820ed9d04d4ed00ff4fb21ac91689fcbb6cc564b786a4061c8f720d
   browser (6.2.0) sha256=281d5295788825c9396427c292c2d2be0a5c91875c93c390fde6e5d61a5ace2d
   budgets (1.0.0)
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
@@ -1593,7 +1593,7 @@ CHECKSUMS
   dry-inflector (1.2.0) sha256=22f5d0b50fd57074ae57e2ca17e3b300e57564c218269dcf82ff3e42d3f38f2e
   dry-initializer (3.2.0) sha256=37d59798f912dc0a1efe14a4db4a9306989007b302dcd5f25d0a2a20c166c4e3
   dry-logic (1.6.0) sha256=da6fedbc0f90fc41f9b0cc7e6f05f5d529d1efaef6c8dcc8e0733f685745cea2
-  dry-monads (1.8.2) sha256=662e0b4515bc41048e0e2c033db86327839649a53bff383489096e47a71f22b0
+  dry-monads (1.8.3) sha256=5fbc06ae4ff76ae081922a902be998673703304d10b46b08931696f2c8decc06
   dry-schema (1.14.1) sha256=2fcd7539a7099cacae6a22f6a3a2c1846fe5afeb1c841cde432c89c6cb9b9ff1
   dry-types (1.8.2) sha256=c84e9ada69419c727c3b12e191e0ed7d2c6d58d040d55e79ea16e0ebf8b3ec0f
   dry-validation (1.11.1) sha256=70900bb5a2d911c8aab566d3e360c6bff389b8bf92ea8e04885ce51c41ff8085
@@ -1757,7 +1757,7 @@ CHECKSUMS
   openproject-octicons (19.23.0) sha256=bf69988c440b4aef249b2cb30e7c4139370e3b5d0c6e77ef2323eb0f48a37c13
   openproject-octicons_helper (19.23.0) sha256=d501eb62e323e326ce56eb9e4ea0d499dfca8ec5c382843c78025a529a0a8156
   openproject-openid_connect (1.0.0)
-  openproject-primer_view_components (0.59.1) sha256=bd747e187093269e54fc8e26df9a1465765d138dd468e7c6c5e1774f597b08e3
+  openproject-primer_view_components (0.59.2) sha256=7830dc1c678a08d6474e7b492a7836946b7379798b6dd22e09d69e7a34ed7f0f
   openproject-recaptcha (1.0.0)
   openproject-reporting (1.0.0)
   openproject-storages (1.0.0)
@@ -1847,8 +1847,8 @@ CHECKSUMS
   rspec-retry (0.6.2) sha256=6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858
   rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec
   rspec-wait (1.0.1) sha256=50ce9cc7cd20b8bb67b95a4ed56b59a16d4af7e86ae91b28dbf20eeaa2481d1f
-  rubocop (1.75.1) sha256=c12900c55b0b52e6ed1384f7f7575beb92047019ce37ca14b9572d80239adc29
-  rubocop-ast (1.43.0) sha256=92cd649e336ce10212cb2f2b29028f487777ecc477f108f437a1dce1ee3db79a
+  rubocop (1.75.2) sha256=8efde647e278417e8074421b007e0d7d7c591482ef99d980528b18fea015a7c8
+  rubocop-ast (1.44.0) sha256=77fdaf4aacf0c7d1ef887b075686124fb4ae5743d42ff7e73bb1c0d6b61b5d0a
   rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
   rubocop-factory_bot (2.27.1) sha256=9d744b5916778c1848e5fe6777cc69855bd96548853554ec239ba9961b8573fe
   rubocop-openproject (0.2.0) sha256=2300ed6b638a34a9368b458dc5fb618ae396da6a27670b50519ad1e3cea65ccb
@@ -1917,7 +1917,7 @@ CHECKSUMS
   validate_email (0.1.6) sha256=9dfe9016d527b17a8d3a6e95e4dc50a125400eef899d13d4cc2a254393f82ee4
   validate_url (1.0.15) sha256=72fe164c0713d63a9970bd6700bea948babbfbdcec392f2342b6704042f57451
   vcr (6.3.1) sha256=37b56e157e720446a3f4d2d39919cabef8cb7b6c45936acffd2ef8229fec03ed
-  vernier (1.6.0) sha256=dc9b489f720e25881dc5cd1e12ac237a980dc78919477aa8f1e02d8725987346
+  vernier (1.7.0) sha256=b64c3e0cf1ddf1842e0afca8b09b1664d391b22f0ebfcc924cc2fbb2536231d9
   view_component (3.22.0) sha256=70e350abeb77a8710d94b335e68f79bc51da5d1640bc486c5b9bb8b589f0f2c5
   virtus (2.0.0) sha256=8841dae4eb7fcc097320ba5ea516bf1839e5d056c61ee27138aa4bddd6e3d1c2
   warden (1.2.9) sha256=46684f885d35a69dbb883deabf85a222c8e427a957804719e143005df7a1efd0

app/components/add_button_component.html.erb

@@ -1,5 +1,5 @@
 <%= render(
-      Primer::ButtonComponent.new(
+      Primer::Beta::Button.new(
         scheme: :primary,
         aria: { label: aria_label },
         title:,

app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb

@@ -48,8 +48,8 @@ See COPYRIGHT and LICENSE files for more details.
 
       concat(
         render(Primer::Alpha::Dialog::Footer.new(show_divider: false)) do
-          concat(render(Primer::ButtonComponent.new(data: { "close-dialog-id": dialog_id })) { cancel_button_text })
-          concat(render(Primer::ButtonComponent.new(scheme: :primary, type: :submit)) { submit_button_text })
+          concat(render(Primer::Beta::Button.new(data: { "close-dialog-id": dialog_id })) { cancel_button_text })
+          concat(render(Primer::Beta::Button.new(scheme: :primary, type: :submit)) { submit_button_text })
         end
       )
     end

app/components/my/access_token/new_access_token_form_component.html.erb

@@ -62,11 +62,11 @@ See COPYRIGHT and LICENSE files for more details.
 
         collection.with_component(Primer::Alpha::Dialog::Footer.new) do
           component_collection do |footer|
-            footer.with_component(Primer::ButtonComponent.new(data: { "close-dialog-id": "new-access-token-dialog" })) do
+            footer.with_component(Primer::Beta::Button.new(data: { "close-dialog-id": "new-access-token-dialog" })) do
               I18n.t("button_cancel")
             end
 
-            footer.with_component(Primer::ButtonComponent.new(scheme: :primary, type: :submit, test_selector: "create-api-token-button")) do
+            footer.with_component(Primer::Beta::Button.new(scheme: :primary, type: :submit, test_selector: "create-api-token-button")) do
               I18n.t("my.access_token.new_access_token_dialog_submit_button_text")
             end
           end

app/components/projects/configure_view_modal_component.html.erb

@@ -50,9 +50,9 @@
     <% end %>
   <% end %>
   <%= render(Primer::Alpha::Dialog::Footer.new) do %>
-    <%= render(Primer::ButtonComponent.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %>
+    <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %>
     <%= render(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             scheme: :primary,
             type: :submit,
             data: { "test-selector": "#{MODAL_ID}-submit" },

app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb

@@ -12,11 +12,11 @@
 
         collection.with_component(Primer::Alpha::Dialog::Footer.new) do
           component_collection do |modal_footer|
-            modal_footer.with_component(Primer::ButtonComponent.new(data: { "close-dialog-id": "project-custom-field-section-dialog#{@project_custom_field_section.id}" })) do
+            modal_footer.with_component(Primer::Beta::Button.new(data: { "close-dialog-id": "project-custom-field-section-dialog#{@project_custom_field_section.id}" })) do
               t("button_cancel")
             end
 
-            modal_footer.with_component(Primer::ButtonComponent.new(scheme: :primary, type: :submit)) do
+            modal_footer.with_component(Primer::Beta::Button.new(scheme: :primary, type: :submit)) do
               t("button_save")
             end
           end

app/components/work_package_relations_tab/add_work_package_child_dialog_component.html.erb

@@ -17,7 +17,7 @@
     d.with_footer do
       component_collection do |buttons|
         buttons.with_component(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             data: {
               "close-dialog-id": DIALOG_ID
             }
@@ -26,7 +26,7 @@
           t("button_cancel")
         end
         buttons.with_component(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             scheme: :primary,
             form: FORM_ID,
             data: { turbo: true },

app/components/work_package_relations_tab/index_component.sass

@@ -2,5 +2,5 @@
 // It can't be nested inside the BEM model as it's placed as a #top-layer element.
 #new-relation-action-menu-list,
 #new-child-action-menu-list
-  max-height: 450px
+  max-height: 470px
   max-width: 280px

app/components/work_package_relations_tab/work_package_relation_dialog_component.html.erb

@@ -18,14 +18,14 @@
     d.with_footer do
       component_collection do |buttons|
         buttons.with_component(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             data: { "close-dialog-id": DIALOG_ID }
           )
         ) do
           t(:button_cancel)
         end
         buttons.with_component(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             scheme: :primary,
             form: FORM_ID,
             data: { turbo: true },

app/components/work_packages/date_picker/date_form_component.html.erb

@@ -4,7 +4,7 @@
       flex_layout do |start_date|
         start_date.with_row(classes: container_classes(:start_date)) do
           render(
-            Primer::ButtonComponent.new(
+            Primer::Beta::Button.new(
               tag: :a,
               href: single_date_field_button_link("start_date"),
               data: { turbo_frame: "wp-datepicker-dialog--content", morph: true },
@@ -31,7 +31,7 @@
         flex_layout do |due_date|
           due_date.with_row(classes: container_classes(:due_date), data: { skip_morphing: true }) do
             render(
-              Primer::ButtonComponent.new(
+              Primer::Beta::Button.new(
                 tag: :a,
                 href: single_date_field_button_link("due_date"),
                 data: { turbo_frame: "wp-datepicker-dialog--content", morph: true },

app/components/work_packages/date_picker/dialog_content_component.html.erb

@@ -76,7 +76,7 @@
         collection.with_component(Primer::Alpha::Dialog::Footer.new) do
           component_collection do |footer|
             footer.with_component(
-              Primer::ButtonComponent.new(
+              Primer::Beta::Button.new(
                 data: { action: "work-packages--date-picker--preview#cancel" },
                 test_selector: "op-datepicker-modal--action"
               )
@@ -85,7 +85,7 @@
             end
 
             footer.with_component(
-              Primer::ButtonComponent.new(
+              Primer::Beta::Button.new(
                 scheme: :primary,
                 type: :submit,
                 form: DIALOG_FORM_ID,

app/components/work_packages/dialogs/create_dialog_component.html.erb

@@ -1,12 +1,14 @@
 <%=
-  render(Primer::Alpha::Dialog.new(
-    id: "create-work-package-dialog",
-    title: I18n.t(:label_work_package_new),
-    size: :xlarge,
-    data: {
-      'keep-open-on-submit': true,
-    }
-  )) do |dialog|
+  render(
+    Primer::Alpha::Dialog.new(
+      id: "create-work-package-dialog",
+      title: I18n.t(:label_work_package_new),
+      size: :xlarge,
+      data: {
+        "keep-open-on-submit": true
+      }
+    )
+  ) do |dialog|
     dialog.with_header(variant: :large)
     dialog.with_body do
       render(WorkPackages::Dialogs::CreateFormComponent.new(work_package:, project:))
@@ -15,18 +17,20 @@
     dialog.with_footer do
       component_collection do |modal_footer|
         modal_footer.with_component(
-          Primer::ButtonComponent.new(
-            data: { 'close-dialog-id': "create-work-package-dialog" }
-          )) do
+          Primer::Beta::Button.new(
+            data: { "close-dialog-id": "create-work-package-dialog" }
+          )
+        ) do
           I18n.t(:button_cancel)
         end
 
         modal_footer.with_component(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             scheme: :primary,
             form: "create-work-package-form",
             type: :submit
-          )) do
+          )
+        ) do
           if @work_package.persisted?
             I18n.t(:button_save)
           else

app/components/work_packages/exports/generate/modal_dialog_component.html.erb

@@ -130,9 +130,9 @@
     end %>
   <% end %>
   <% dialog.with_footer do %>
-    <%= render(Primer::ButtonComponent.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %>
+    <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %>
     <%= render(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             scheme: :primary,
             type: :submit,
             form: GENERATE_PDF_FORM_ID,

app/components/work_packages/exports/modal_dialog_component.html.erb

@@ -69,9 +69,9 @@
             ) %>
       <% end %>
     <% end %>
-    <%= render(Primer::ButtonComponent.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %>
+    <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %>
     <%= render(
-          Primer::ButtonComponent.new(
+          Primer::Beta::Button.new(
             data: {
               "work-packages--export--dialog-target": "submit"
             },

app/models/work_package_custom_field.rb

@@ -47,10 +47,15 @@ class WorkPackageCustomField < CustomField
   }
 
   scope :visible_by_user, ->(user) {
-    where(projects: { id: Project.visible(user) })
-      .where(types: { id: Type.enabled_in(Project.visible(user)) })
-      .or(where(is_for_all: true).references(:projects, :types))
-      .includes(:projects, :types)
+    # Prefer a subquery to a join to avoid the database query returning
+    # the cross product of projects, types and custom fields.
+    where(id:
+      unscoped
+        .where(projects: { id: Project.visible(user) })
+        .where(types: { id: Type.enabled_in(Project.visible(user)) })
+        .or(unscoped.where(is_for_all: true))
+        .includes(:projects, :types)
+        .select(:id))
   }
 
   scope :usable_as_custom_action, -> {

config/locales/crowdin/af.yml

@@ -3789,7 +3789,7 @@ af:
       heading: "Project life cycle"
       heading_description: "Project life cycle define the project phases that can be used for your project planning and will appear in the overview page of each project. These attributes can be enabled or disabled but not re-ordered at a project level."
       label_add: "Add"
-      label_add_description: "Add life cycle definition"
+      label_add_description: "Add project phase definition"
       filter:
         label: "Search project phase"
       section_header: "Phases"

config/locales/crowdin/ar.yml

@@ -3951,7 +3951,7 @@ ar:
       heading: "Project life cycle"
       heading_description: "Project life cycle define the project phases that can be used for your project planning and will appear in the overview page of each project. These attributes can be enabled or disabled but not re-ordered at a project level."
       label_add: "Add"
-      label_add_description: "Add life cycle definition"
+      label_add_description: "Add project phase definition"
       filter:
         label: "Search project phase"
       section_header: "Phases"

config/locales/crowdin/az.yml

@@ -3789,7 +3789,7 @@ az:
       heading: "Project life cycle"
       heading_description: "Project life cycle define the project phases that can be used for your project planning and will appear in the overview page of each project. These attributes can be enabled or disabled but not re-ordered at a project level."
       label_add: "Add"
-      label_add_description: "Add life cycle definition"
+      label_add_description: "Add project phase definition"
       filter:
         label: "Search project phase"
       section_header: "Phases"

config/locales/crowdin/be.yml

@@ -3871,7 +3871,7 @@ be:
       heading: "Project life cycle"
       heading_description: "Project life cycle define the project phases that can be used for your project planning and will appear in the overview page of each project. These attributes can be enabled or disabled but not re-ordered at a project level."
       label_add: "Add"
-      label_add_description: "Add life cycle definition"
+      label_add_description: "Add project phase definition"
       filter:
         label: "Search project phase"
       section_header: "Phases"

config/locales/crowdin/bg.yml

@@ -3789,7 +3789,7 @@ bg:
       heading: "Project life cycle"
       heading_description: "Project life cycle define the project phases that can be used for your project planning and will appear in the overview page of each project. These attributes can be enabled or disabled but not re-ordered at a project level."
       label_add: "Add"
-      label_add_description: "Add life cycle definition"
+      label_add_description: "Add project phase definition"
       filter:
         label: "Search project phase"
       section_header: "Phases"