[pull] dev from opf:dev

Gemfile

@@ -215,7 +215,7 @@ gem "dry-container"
 gem "store_attribute", "~> 1.0"
 
 # Appsignal integration
-gem "appsignal", "~> 3.0", require: false
+gem "appsignal", "~> 3.8.1", require: false
 
 gem "view_component"
 # Lookbook
@@ -388,6 +388,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.14.0"
-gem "openproject-octicons_helper", "~>19.14.0"
+gem "openproject-octicons", "~>19.14.1"
+gem "openproject-octicons_helper", "~>19.14.1"
 gem "openproject-primer_view_components", "~>0.34.0"

Gemfile.lock

@@ -331,7 +331,7 @@ GEM
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
     android_key_attestation (0.3.0)
-    appsignal (3.7.6)
+    appsignal (3.8.1)
       rack
     ast (2.4.2)
     attr_required (1.0.2)
@@ -347,10 +347,10 @@ GEM
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
+    aws-sdk-kms (1.84.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.2)
+    aws-sdk-s3 (1.152.3)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
@@ -670,7 +670,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.6.15)
+    lefthook (1.6.16)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -744,7 +744,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.4)
@@ -767,10 +767,10 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.14.0)
-    openproject-octicons_helper (19.14.0)
+    openproject-octicons (19.14.1)
+    openproject-octicons_helper (19.14.1)
       actionview
-      openproject-octicons (= 19.14.0)
+      openproject-octicons (= 19.14.1)
       railties
     openproject-primer_view_components (0.34.0)
       actionview (>= 5.0.0)
@@ -790,7 +790,7 @@ GEM
     parallel (1.25.1)
     parallel_tests (4.7.1)
       parallel
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -984,7 +984,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.0)
@@ -1075,7 +1075,7 @@ GEM
     text-hyphen (1.5.0)
     thor (1.3.1)
     thread_safe (0.3.6)
-    timecop (0.9.9)
+    timecop (0.9.10)
     timeout (0.4.1)
     tpm-key_attestation (0.12.0)
       bindata (~> 2.4)
@@ -1159,7 +1159,7 @@ DEPENDENCIES
   acts_as_tree (~> 2.9.0)
   addressable (~> 2.8.0)
   airbrake (~> 13.0.0)
-  appsignal (~> 3.0)
+  appsignal (~> 3.8.1)
   auto_strip_attributes (~> 2.5)
   awesome_nested_set (~> 3.6.0)
   aws-sdk-core (~> 3.107)
@@ -1257,8 +1257,8 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.14.0)
-  openproject-octicons_helper (~> 19.14.0)
+  openproject-octicons (~> 19.14.1)
+  openproject-octicons_helper (~> 19.14.1)
   openproject-openid_connect!
   openproject-primer_view_components (~> 0.34.0)
   openproject-recaptcha!

app/components/projects/table_component.html.erb

@@ -104,5 +104,5 @@ See COPYRIGHT and LICENSE files for more details.
 </div>
 
 <% if paginated? %>
-  <%= helpers.pagination_links_full model, allowed_params: %i[query_id filters columns sortBy] %>
+  <%= helpers.pagination_links_full model, pagination_options %>
 <% end %>

app/components/projects/table_component.rb

@@ -34,8 +34,8 @@ class TableComponent < ::TableComponent
     options :current_user # adds this option to those of the base class
     options :query
 
-    def initialize(**options)
-      super(rows: [], **options)
+    def initialize(**)
+      super(rows: [], **)
     end
 
     def before_render
@@ -52,7 +52,7 @@ def table_id
     end
 
     def container_class
-      "generic-table--container_visible-overflow"
+      "generic-table--container_visible-overflow generic-table--container_height-100"
     end
 
     ##
@@ -82,6 +82,18 @@ def paginated?
       true
     end
 
+    def pagination_options
+      default_pagination_options.merge(optional_pagination_options)
+    end
+
+    def default_pagination_options
+      { allowed_params: %i[query_id filters columns sortBy] }
+    end
+
+    def optional_pagination_options
+      {}
+    end
+
     def deactivate_class_on_lft_sort
       if sorted_by_lft?
         "spot-link_inactive"

app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.html.erb

@@ -15,7 +15,8 @@
 
       dialog.with_header(
         show_divider: false,
-        visually_hide_title: false
+        visually_hide_title: false,
+        variant: :large
       )
 
       primer_form_with(

app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.rb

@@ -43,14 +43,15 @@ def more_menu_items
         private
 
         def more_menu_detach_project
-          if User.current.admin
+          project = model.first
+          if User.current.admin && project.active?
             {
               scheme: :default,
               icon: nil,
               label: I18n.t("projects.settings.project_custom_fields.actions.deactivate_for_project"),
               href: unlink_admin_settings_project_custom_field_path(
                 id: @table.params[:custom_field].id,
-                project_custom_field_project_mapping: { project_id: model.first.id }
+                project_custom_field_project_mapping: { project_id: project.id }
               ),
               data: { turbo_method: :delete }
             }

app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.rb

@@ -39,6 +39,23 @@ def columns
         def sortable?
           false
         end
+
+        # @override optional_pagination_options are passed to the pagination_options
+        # which are passed to #pagination_links_full in pagination_helper.rb
+        #
+        # In Turbo streamable components, we need to be able to specify the url_for(action:) so that links are
+        # generated in the context of the component index action, instead of any turbo stream actions performing
+        # partial updates on the page.
+        #
+        # params[:url_for_action] is passed to the pagination_options making it's way down to any pagination links
+        # that are generated via link_to which calls url_for which uses the params[:url_for_action] to specify
+        # the controller action that link_to should use.
+        #
+        def optional_pagination_options
+          return super unless params[:url_for_action]
+
+          super.merge(params: { action: params[:url_for_action] })
+        end
       end
     end
   end

app/contracts/roles/base_contract.rb

@@ -33,10 +33,13 @@ class BaseContract < ::ModelContract
     validate :check_permission_prerequisites
 
     def assignable_permissions(keep_public: false)
-      if model.is_a?(GlobalRole)
+      case model
+      when GlobalRole
         assignable_global_permissions
-      elsif model.is_a?(WorkPackageRole)
+      when WorkPackageRole
         assignable_work_package_permissions
+      when ProjectQueryRole
+        assignable_project_query_permissions
       else
         assignable_member_permissions
       end.reject do |permission|
@@ -54,6 +57,10 @@ def assignable_work_package_permissions
       OpenProject::AccessControl.work_package_permissions
     end
 
+    def assignable_project_query_permissions
+      OpenProject::AccessControl.project_query_permissions
+    end
+
     def assignable_member_permissions
       permissions_to_remove = case model.builtin
                               when Role::BUILTIN_NON_MEMBER

app/controllers/admin/settings/project_custom_fields_controller.rb

@@ -79,7 +79,7 @@ def link
                               include_sub_projects: include_sub_projects?)
                          .call
 
-      create_service.on_success { render_project_list }
+      create_service.on_success { render_project_list(url_for_action: :project_mappings) }
 
       create_service.on_failure do
         update_flash_message_via_turbo_stream(
@@ -96,7 +96,7 @@ def unlink
                          .new(user: current_user, model: @project_custom_field_mapping)
                          .call
 
-      delete_service.on_success { render_project_list }
+      delete_service.on_success { render_project_list(url_for_action: :project_mappings) }
 
       delete_service.on_failure do
         update_flash_message_via_turbo_stream(
@@ -147,7 +147,7 @@ def destroy
 
     private
 
-    def render_project_list
+    def render_project_list(url_for_action: action_name)
       update_via_turbo_stream(
         component: Settings::ProjectCustomFields::ProjectCustomFieldMapping::NewProjectMappingComponent.new(
           project_mapping: ProjectCustomFieldProjectMapping.new(project_custom_field: @custom_field),
@@ -157,7 +157,7 @@ def render_project_list
       update_via_turbo_stream(
         component: Settings::ProjectCustomFields::ProjectCustomFieldMapping::TableComponent.new(
           query: project_custom_field_mappings_query,
-          params: { custom_field: @custom_field }
+          params: { custom_field: @custom_field, url_for_action: }
         )
       )
     end
@@ -167,7 +167,6 @@ def project_custom_field_mappings_query
         name: "project-custom-field-mappings-#{@custom_field.id}"
       ) do |query|
         query.where(:available_project_attributes, "=", [@custom_field.id])
-        query.where("active", "=", OpenProject::Database::DB_VALUE_TRUE)
         query.select(:name)
         query.order("lft" => "asc")
       end

app/helpers/application_helper.rb

@@ -278,10 +278,12 @@ def all_lang_options_for_select
   end
 
   def theme_options_for_select
-    [
+    options = [
       [t("themes.light"), "light"],
       [t("themes.light_high_contrast"), "light_high_contrast"]
     ]
+    options.push([t("themes.dark"), "dark"]) if OpenProject::FeatureDecisions.dark_mode_active?
+    options
   end
 
   def user_theme_data_attributes

app/models/concerns/has_members.rb

@@ -0,0 +1,36 @@
+# --copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2022 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module HasMembers
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :members, as: :entity, dependent: :destroy
+    has_many :member_principals, through: :members, class_name: "Principal", source: :principal
+  end
+end

app/models/member.rb

@@ -30,7 +30,8 @@ class Member < ApplicationRecord
   include ::Scopes::Scoped
 
   ALLOWED_ENTITIES = [
-    "WorkPackage"
+    "WorkPackage",
+    "Queries::Projects::ProjectQuery"
   ].freeze
 
   extend DeprecatedAlias
@@ -85,7 +86,7 @@ def some_roles_deletable?
   end
 
   def project_role?
-    entity_id.nil?
+    entity_id.nil? && project_id.present?
   end
 
   def deletable_role?(role)

app/models/project_query_role.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+#
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class ProjectQueryRole < Role
+  def self.givable
+    super
+      .where(type: "ProjectQueryRole")
+  end
+
+  def member?
+    true
+  end
+end