Merge remote-tracking branch 'origin/release/15.5' into dev

Author: ulferts

Gemfile.lock

@@ -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)
@@ -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

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/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, -> {

frontend/src/app/core/routing/openproject.routes.ts

@@ -182,8 +182,10 @@ export function initializeUiRouterListeners(injector:Injector) {
     openprojectBaseApp = document.querySelector(appBaseSelector);
     uiRouter.urlService.sync();
 
-    // Re-apply the body classes
-    bodyClass(_.get(uiRouter.globals.current, 'data.bodyClasses'), 'add');
+    // Re-apply the body classes if the turbo load event is on the same page (e.g. when creating a child from the relations tab)
+    if (stateService.href(uiRouter.globals.current) === window.location.pathname + window.location.search) {
+      bodyClass(_.get(uiRouter.globals.current, 'data.bodyClasses'), 'add');
+    }
   });
 
   // Uncomment to trace route changes

spec/features/work_packages/navigation_spec.rb

@@ -262,4 +262,17 @@
       expect(page).to have_css "li", text: "The requested resource could not be found"
     end
   end
+
+  # Introduced by regression #60629
+  it "can navigate correctly to non-angular pages (regression #61790)" do
+    global_work_packages = Pages::WorkPackagesTable.new
+    global_work_packages.visit!
+
+    # Navigate to the administration
+    page.find(".op-top-menu-user-avatar").click
+    page.find_test_selector("op-menu--item-action", text: "Administration").click
+
+    # Expect classes to be gone
+    expect(page).to have_no_css("body.router--work-packages-base")
+  end
 end