Merge branch 'release/14.3' into dev

Author: openprojectci

Diff for: app/components/shares/invite_user_form_component.html.erb

@@ -1,7 +1,6 @@
 <%=
   component_wrapper do
-    if strategy.manageable?
-      primer_form_with(
+    primer_form_with(
         model: new_share,
         url: url_for([entity, Member]),
         data: { controller: 'user-limit shares--user-selected',
@@ -17,7 +16,7 @@
           invite_form.with_area('permission') do
             render(Shares::PermissionButtonComponent.new(
               share: new_share,
-              available_roles: strategy.available_roles,
+              strategy: strategy,
               form_arguments: { builder: form, name: "role_id" },
               data: { 'test-selector': 'op-share-dialog-invite-role' })
             )
@@ -92,9 +91,6 @@
             end
           end
         end
-      end
-    else
-      render(Primer::Alpha::Banner.new(icon: :info)) { I18n.t('sharing.denied', entities: entity.model_name.human(count: 2)) }
     end
   end
 %>

Diff for: app/components/shares/modal_body_component.html.erb

@@ -8,8 +8,10 @@
         end
       end
 
-      modal_content.with_row do
-        render(Shares::InviteUserFormComponent.new(strategy:, errors: errors))
+      if strategy.manageable?
+        modal_content.with_row do
+          render(Shares::InviteUserFormComponent.new(strategy:, errors: errors))
+        end
       end
 
       modal_content.with_row(data: { 'test-selector': 'op-share-dialog-active-list',

Diff for: app/components/shares/modal_body_component.rb

@@ -48,7 +48,7 @@ def initialize(strategy:, shares:, errors: nil)
     end
 
     def self.wrapper_key
-      "share_list"
+      "share_modal_body"
     end
 
     private

Diff for: app/components/shares/modal_body_component.sass

@@ -4,8 +4,8 @@
 
   &--user-row
     display: grid
-    grid-template-columns: minmax(31px, auto) 1fr // 31px is the width needed to display a group avatar
-    grid-template-areas: "avatar user_details"
+    grid-template-columns: minmax(31px, auto) 1fr auto // 31px is the width needed to display a group avatar
+    grid-template-areas: "avatar user_details button"
     grid-column-gap: 10px
 
     &_manageable

Diff for: app/components/shares/modal_upsale_component.rb

@@ -33,7 +33,7 @@ class ModalUpsaleComponent < ApplicationComponent # rubocop:disable OpenProject/
     include OpPrimer::ComponentHelpers
 
     def self.wrapper_key
-      "share_list"
+      "share_modal_body"
     end
   end
 end

Diff for: app/components/shares/permission_button_component.html.erb

@@ -1,28 +1,30 @@
 <%=
   component_wrapper do
-    render(Primer::Alpha::ActionMenu.new(**{ select_variant: :single,
-                                             size: :small,
-                                             dynamic_label: true,
-                                             anchor_align: :end,
-                                             color: :subtle }.deep_merge(@system_arguments))) do |menu|
-      menu.with_show_button(data: { 'shares--bulk-selection-target': 'userRowRole',
-                                    'share-id': share.id,
-                                    'active-role-name': permission_name(active_role.id)}) do |button|
-        button.with_trailing_action_icon(icon: :"triangle-down")
-        permission_name(active_role.id)
-      end
+    content_tag(:div, class: tooltip_wrapper_classes, data: { tooltip: tooltip_message }) do
+      render(Primer::Alpha::ActionMenu.new(**{ select_variant: :single,
+                                              size: :small,
+                                              dynamic_label: true,
+                                              anchor_align: :end,
+                                              color: :subtle }.deep_merge(@system_arguments))) do |menu|
+        menu.with_show_button(disabled: !editable?, data: { 'shares--bulk-selection-target': 'userRowRole',
+                                      'share-id': share.id,
+                                      'active-role-name': permission_name(active_role.id)}) do |button|
+          button.with_trailing_action_icon(icon: :"triangle-down")
+          permission_name(active_role.id)
+        end
 
-      @available_roles.each do |role_hash|
-        menu.with_item(label: role_hash[:label],
-                       href: update_path,
-                       method: :patch,
-                       active: role_active?(role_hash),
-                       data: { value: role_hash[:value] },
-                       form_arguments: {
-                         method: :patch,
-                         inputs: form_inputs(role_hash[:value])
-                       }) do |item|
-          item.with_description.with_content(role_hash[:description])
+        strategy.available_roles.each do |role_hash|
+          menu.with_item(label: role_hash[:label],
+                        href: update_path,
+                        method: :patch,
+                        active: role_active?(role_hash),
+                        data: { value: role_hash[:value] },
+                        form_arguments: {
+                          method: :patch,
+                          inputs: form_inputs(role_hash[:value])
+                        }) do |item|
+            item.with_description.with_content(role_hash[:description])
+          end
         end
       end
     end

Diff for: app/components/shares/permission_button_component.rb

@@ -32,10 +32,10 @@ class PermissionButtonComponent < ApplicationComponent # rubocop:disable OpenPro
     include OpPrimer::ComponentHelpers
     include OpTurbo::Streamable
 
-    def initialize(share:, available_roles:, **system_arguments)
+    def initialize(share:, strategy:, **system_arguments)
       super
 
-      @available_roles = available_roles
+      @strategy = strategy
       @share = share
       @system_arguments = system_arguments
     end
@@ -58,7 +58,7 @@ def wrapper_uniq_by
 
     private
 
-    attr_reader :share, :available_roles
+    attr_reader :share, :strategy
 
     def active_role
       if share.persisted?
@@ -71,7 +71,7 @@ def active_role
     end
 
     def permission_name(value)
-      available_roles.find { |role_hash| role_hash[:value] == value }[:label]
+      strategy.available_roles.find { |role_hash| role_hash[:value] == value }[:label]
     end
 
     def form_inputs(role_id)
@@ -80,5 +80,21 @@ def form_inputs(role_id)
         inputs << { name: "filters", value: params[:filters] } if params[:filters]
       end
     end
+
+    def tooltip_message
+      return if strategy.manageable?
+
+      I18n.t("sharing.denied", entities: strategy.entity.class.model_name.human(count: 2))
+    end
+
+    def tooltip_wrapper_classes
+      return [] if strategy.manageable?
+
+      ["tooltip--left"]
+    end
+
+    def editable?
+      strategy.manageable? && share.principal != User.current
+    end
   end
 end

Diff for: app/components/shares/project_queries/empty_state_component.rb

@@ -62,7 +62,7 @@ def public_blankslate_config
 
       def unfiltered_blankslate_config
         {
-          icon: :people,
+          icon: "share-android",
           heading_text: I18n.t("sharing.project_queries.blank_state.private.header"),
           description_text: I18n.t("sharing.project_queries.blank_state.private.description")
         }

Diff for: app/components/shares/project_queries/public_flag_component.html.erb

@@ -1,14 +1,16 @@
 <%=
 container.with_row do
-  render(Primer::Forms::ToggleSwitchForm.new(
-        name: "publish_project_query",
-        label: t('sharing.project_queries.public_flag.label', instance_name: Setting.app_title),
-        caption: t('sharing.project_queries.public_flag.caption'),
-        src: toggle_public_flag_link,
-        csrf_token: form_authenticity_token,
-        status_label_position: :start,
-        checked: published?,
-        enabled: can_publish?
-      ))
+  content_tag(:div, class: tooltip_wrapper_classes, data: { tooltip: tooltip_message }) do
+    render(Primer::Forms::ToggleSwitchForm.new(
+      name: "publish_project_query",
+      label: t("sharing.project_queries.public_flag.label", instance_name: Setting.app_title),
+      caption: t("sharing.project_queries.public_flag.caption"),
+      src: toggle_public_flag_link,
+      csrf_token: form_authenticity_token,
+      status_label_position: :start,
+      checked: published?,
+      enabled: can_publish?
+    ))
+  end
 end
 %>

Diff for: app/components/shares/project_queries/public_flag_component.rb

@@ -56,6 +56,18 @@ def published?
       def can_publish?
         User.current.allowed_globally?(:manage_public_project_queries)
       end
+
+      def tooltip_message
+        return if can_publish?
+
+        I18n.t("sharing.project_queries.publishing_denied")
+      end
+
+      def tooltip_wrapper_classes
+        ["d-flex", "flex-column"].tap do |classlist|
+          classlist << "tooltip--bottom" unless can_publish?
+        end
+      end
     end
   end
 end

Diff for: app/components/shares/share_row_component.html.erb

@@ -20,13 +20,13 @@
         render(Shares::UserDetailsComponent.new(share:, manager_mode: share_editable?))
       end
 
-      if share_editable?
-        user_row_grid.with_area(:button, tag: :div, color: :subtle) do
-          render(Shares::PermissionButtonComponent.new(share:,
-                                                       available_roles: @available_roles,
-                                                       data: { 'test-selector': 'op-share-dialog-update-role' }))
-        end
+      user_row_grid.with_area(:button, tag: :div, color: :subtle) do
+        render(Shares::PermissionButtonComponent.new(share:,
+        strategy: strategy,
+                                                      data: { 'test-selector': 'op-share-dialog-update-role' }))
+      end
 
+      if share_editable?
         user_row_grid.with_area(:remove, tag: :div) do
           form_with url: url_for([entity, share]), method: :delete do
             render(Primer::Beta::IconButton.new(icon: "trash",

Diff for: app/controllers/projects/queries_controller.rb

@@ -28,6 +28,7 @@
 
 class Projects::QueriesController < ApplicationController
   include Projects::QueryLoading
+  include OpTurbo::ComponentStream
 
   # No need for a more specific authorization check. That is carried out in the contracts.
   no_authorization_required! :show, :new, :create, :rename, :update, :toggle_public, :destroy
@@ -71,15 +72,27 @@ def update
     render_result(call, success_i18n_key: "lists.update.success", error_i18n_key: "lists.update.failure")
   end
 
-  def toggle_public
-    to_be_public = !@query.public?
+  def toggle_public # rubocop:disable Metrics/AbcSize
+    to_be_public = ActiveRecord::Type::Boolean.new.cast(params["value"])
     i18n_key = to_be_public ? "lists.publish" : "lists.unpublish"
 
     call = Queries::Projects::ProjectQueries::PublishService
              .new(user: current_user, model: @query)
              .call(public: to_be_public)
 
-    render_result(call, success_i18n_key: "#{i18n_key}.success", error_i18n_key: "#{i18n_key}.failure")
+    respond_to do |format|
+      format.turbo_stream do
+        # Load shares and replace the modal
+        strategy = SharingStrategies::ProjectQueryStrategy.new(@query, user: current_user)
+        shares = strategy.shares_query({}).results
+        replace_via_turbo_stream(component: Shares::ModalBodyComponent.new(strategy:, shares:, errors: []))
+        render turbo_stream: turbo_streams, status:
+      end
+
+      format.html do
+        render_result(call, success_i18n_key: "#{i18n_key}.success", error_i18n_key: "#{i18n_key}.failure")
+      end
+    end
   end
 
   def destroy

Diff for: app/controllers/shares_controller.rb

@@ -223,7 +223,7 @@ def respond_with_update_permission_button
     replace_via_turbo_stream(
       component: Shares::PermissionButtonComponent.new(
         share: @share,
-        available_roles: sharing_strategy.available_roles,
+        strategy: sharing_strategy,
         data: { "test-selector": "op-share-dialog-update-role" }
       )
     )
@@ -265,7 +265,7 @@ def respond_with_bulk_updated_permission_buttons
       replace_via_turbo_stream(
         component: Shares::PermissionButtonComponent.new(
           share:,
-          available_roles: sharing_strategy.available_roles,
+          strategy: sharing_strategy,
           data: { "test-selector": "op-share-dialog-update-role" }
         )
       )
@@ -326,22 +326,7 @@ def current_visible_member_count
   end
 
   def load_query
-    return @query if defined?(@query)
-
-    @query = ParamsToQueryService
-               .new(Member, current_user, query_class: Queries::Members::NonInheritedMemberQuery)
-               .call(params)
-
-    # Set default filter on the entity
-    @query.where("entity_id", "=", @entity.id)
-    @query.where("entity_type", "=", @entity.class.name)
-    if @project
-      @query.where("project_id", "=", @project.id)
-    end
-
-    @query.order(name: :asc) unless params[:sortBy]
-
-    @query
+    @query = sharing_strategy.shares_query(params)
   end
 
   def load_shares

Diff for: app/models/queries/base_query.rb

@@ -51,14 +51,13 @@ def i18n_scope
       :activerecord
     end
 
-    # Use the Query class' error messages.
-    # So everything under
+    # Also use the Query class' as a lookup ancestor so that error messages, etc can be shared.
+    # So if nothing is defined for the specific query class, we fall back to the generic query class.
     #
+    # This is useful for error messages, because we can fall back to error messages, etc in
     # activerecord.errors.models.query
-    #
-    # is found.
     def lookup_ancestors
-      [Query]
+      super + [Query]
     end
   end
 

Diff for: app/models/sharing_strategies/base_strategy.rb

@@ -79,5 +79,24 @@ def custom_empty_state_component?
     def empty_state_component
       nil
     end
+
+    def shares_query(params) # rubocop:disable Metrics/AbcSize
+      return @query if defined?(@query)
+
+      @query = ParamsToQueryService
+                 .new(Member, user, query_class: Queries::Members::NonInheritedMemberQuery)
+                 .call(params)
+
+      # Set default filter on the entity
+      @query.where("entity_id", "=", entity.id)
+      @query.where("entity_type", "=", entity.class.name)
+      if entity.respond_to?(:project)
+        @query.where("project_id", "=", entity.project.id)
+      end
+
+      @query.order(name: :asc) unless params[:sortBy]
+
+      @query
+    end
   end
 end

Diff for: config/locales/crowdin/af.yml

@@ -1140,6 +1140,9 @@ af:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projek"
+      project_query:
+        one: "Project list"
+        other: "Project lists"
       query: "Pasgemaakte navraag"
       role:
         one: "Rol"
@@ -3444,6 +3447,7 @@ af:
       additional_privileges_group: "Might have additional privileges (as group member)"
       additional_privileges_project_or_group: "Might have additional privileges (as project or group member)"
     project_queries:
+      publishing_denied: "You do not have permission to make project lists public."
       access_warning: "Users will only see the projects they have access to. Sharing project lists does not impact individual project permissions."
       public_flag:
         label: "Share with everyone at %{instance_name}"