[pull] dev from opf:dev

.github/workflows/pullpreview.yml

@@ -34,6 +34,8 @@ jobs:
         echo "OPENPROJECT_LOOKBOOK__ENABLED=true" >> .env.pullpreview
         echo "OPENPROJECT_HSTS=false" >> .env.pullpreview
         echo "OPENPROJECT_NOTIFICATIONS_POLLING_INTERVAL=10000" >> .env.pullpreview
+        echo "OPENPROJECT_FEATURE_WORK_PACKAGE_COMMENT_ID_URL_ACTIVE=true" >> .env.pullpreview
+        echo "OPENPROJECT_FEATURE_COMMENTS_WITH_RESTRICTED_VISIBILITY_ACTIVE=true" >> .env.pullpreview
     - name: Boot as BIM edition
       if: contains(github.ref, 'bim/') || contains(github.head_ref, 'bim/')
       run: |

Gemfile.lock

@@ -81,7 +81,7 @@ PATH
   remote: modules/auth_saml
   specs:
     openproject-auth_saml (1.0.0)
-      omniauth-saml (~> 1.10.5)
+      omniauth-saml (~> 1.10.6)
 
 PATH
   remote: modules/avatars
@@ -353,8 +353,8 @@ GEM
     awesome_nested_set (3.8.0)
       activerecord (>= 4.0.0, < 8.1)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1062.0)
-    aws-sdk-core (3.220.1)
+    aws-partitions (1.1071.0)
+    aws-sdk-core (3.220.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -1369,7 +1369,6 @@ DEPENDENCIES
   omniauth!
   omniauth-openid-connect!
   omniauth-openid_connect-providers!
-  omniauth-saml (~> 1.10.1)
   op-clamav-client (~> 3.4)
   openproject-auth_plugins!
   openproject-auth_saml!
@@ -1516,8 +1515,8 @@ CHECKSUMS
   auto_strip_attributes (2.6.0) sha256=a7e2e0cf744de2bcd947fd68014220702bcc88c81274c1cd9ce6f7316aae39b0
   awesome_nested_set (3.8.0) sha256=469daff411d80291dbb80d1973133e498048a7afc2519c545f62d2cdebc60eda
   aws-eventstream (1.3.2) sha256=7e2c3a55ca70d7861d5d3c98e47daa463ed539c349caba22b48305b8919572d7
-  aws-partitions (1.1062.0) sha256=b7095f9a71d209da2c33396a339771039ed1c31e45f2b0c01c4eff4be496576a
-  aws-sdk-core (3.220.1) sha256=9e10ccfd63c8061fb70a0f1e26cf7dd81cb5070931301501fb6f49587cc54d32
+  aws-partitions (1.1071.0) sha256=e7417a3fbdb81fd9baaa096c04e7eea46f2e0184e8f9cb4a860681b7847b9ee2
+  aws-sdk-core (3.220.2) sha256=b6b2cd7fbe9310fed3ba9c89cb1de820d882dd448ffc797b0621c4046694cd63
   aws-sdk-kms (1.99.0) sha256=ba292fc3ffd672532aae2601fe55ff424eee78da8e23c23ba6ce4037138275a8
   aws-sdk-s3 (1.182.0) sha256=d0fc3579395cb6cb69bf6e975240ce031fc673190e74c8dddbdd6c18572b450d
   aws-sdk-sns (1.97.0) sha256=e0489eb11cc107496738c2b39628842df970f4534bdc81a2254d2b49f7d0b7f6

Gemfile.modules

@@ -1,9 +1,3 @@
-##
-# Defines OpenProject (CE) modules and their dependencies
-# the dependencies from the gemspec from a git repo are ignored
-# see also https://github.com/bundler/bundler/issues/1041
-gem 'omniauth-saml', '~> 1.10.1'
-
 group :development, :test do
   gem 'ladle'
 end

app/components/concerns/work_packages/activities_tab/stimulus_controllers.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 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 WorkPackages
+  module ActivitiesTab
+    module StimulusControllers
+      def index_stimulus_controller(suffix = nil) = "work-packages--activities-tab--index#{suffix}"
+      def restricted_comment_stimulus_controller(suffix = nil) = "work-packages--activities-tab--restricted-comment#{suffix}"
+      def quote_comments_stimulus_controller(suffix = nil) = "work-packages--activities-tab--quote-comment#{suffix}"
+
+      def items_index_selector = "##{WorkPackages::ActivitiesTab::IndexComponent.wrapper_key}"
+
+      def add_comment_selector
+        "##{WorkPackages::ActivitiesTab::IndexComponent.add_comment_wrapper_key}"
+      end
+    end
+  end
+end

app/components/work_packages/activities_tab/index_component.html.erb

@@ -33,10 +33,12 @@
                 end
                 if adding_comment_allowed?
                   journals_wrapper_container.with_row(
+                    id: add_comment_wrapper_key,
                     classes: "work-packages-activities-tab-index-component--input-container work-packages-activities-tab-index-component--input-container_sort-#{journal_sorting}",
                     px: 2,
                     py: 3,
-                    bg: :subtle
+                    bg: :subtle,
+                    data: add_comment_wrapper_data_attributes
                   ) do
                     render(
                       WorkPackages::ActivitiesTab::Journals::NewComponent.new(work_package:)

app/components/work_packages/activities_tab/index_component.rb

@@ -35,6 +35,7 @@ class IndexComponent < ApplicationComponent
       include OpPrimer::ComponentHelpers
       include OpTurbo::Streamable
       include WorkPackages::ActivitiesTab::SharedHelpers
+      include WorkPackages::ActivitiesTab::StimulusControllers
 
       def initialize(work_package:, last_server_timestamp:, filter: :all, deferred: false)
         super
@@ -45,26 +46,41 @@ def initialize(work_package:, last_server_timestamp:, filter: :all, deferred: fa
         @deferred = deferred
       end
 
+      def self.add_comment_wrapper_key = "work-packages-activities-tab-add-comment-component"
+      delegate :add_comment_wrapper_key, to: :class
+
       private
 
       attr_reader :work_package, :filter, :last_server_timestamp, :deferred
 
-      def wrapper_data_attributes
-        stimulus_controller = "work-packages--activities-tab--index"
-
+      def wrapper_data_attributes # rubocop:disable Metrics/AbcSize
         {
           test_selector: "op-wp-activity-tab",
-          controller: stimulus_controller,
+          controller: index_stimulus_controller,
           "application-target": "dynamic",
-          "#{stimulus_controller}-update-streams-path-value": update_streams_work_package_activities_path(work_package),
-          "#{stimulus_controller}-sorting-value": journal_sorting,
-          "#{stimulus_controller}-filter-value": filter,
-          "#{stimulus_controller}-user-id-value": User.current.id,
-          "#{stimulus_controller}-work-package-id-value": work_package.id,
-          "#{stimulus_controller}-polling-interval-in-ms-value": polling_interval,
-          "#{stimulus_controller}-notification-center-path-name-value": notifications_path,
-          "#{stimulus_controller}-show-conflict-flash-message-url-value": show_conflict_flash_message_work_packages_path,
-          "#{stimulus_controller}-last-server-timestamp-value": last_server_timestamp
+          index_stimulus_controller("-notification-center-path-name-value") => notifications_path,
+          index_stimulus_controller("-update-streams-path-value") => update_streams_work_package_activities_path(work_package),
+          index_stimulus_controller("-sorting-value") => journal_sorting,
+          index_stimulus_controller("-filter-value") => filter,
+          index_stimulus_controller("-user-id-value") => User.current.id,
+          index_stimulus_controller("-work-package-id-value") => work_package.id,
+          index_stimulus_controller("-polling-interval-in-ms-value") => polling_interval,
+          index_stimulus_controller("-show-conflict-flash-message-url-value") => show_conflict_flash_message_work_packages_path,
+          index_stimulus_controller("-last-server-timestamp-value") => last_server_timestamp,
+          index_stimulus_controller("-unsaved-changes-confirmation-message-value") => unsaved_changes_confirmation_message
+        }
+      end
+
+      def add_comment_wrapper_data_attributes
+        {
+          test_selector: "op-work-package-journal--new-comment-component",
+          controller: restricted_comment_stimulus_controller,
+          "application-target": "dynamic",
+          restricted_comment_stimulus_controller("-target") => "formContainer",
+          action: index_stimulus_controller(":onSubmit-end@window->#{restricted_comment_stimulus_controller}#onSubmitEnd"),
+          restricted_comment_stimulus_controller("-highlight-class") => "work-packages-activities-tab-journals-new-component--journal-notes-body__restricted-comment", # rubocop:disable Layout/LineLength
+          restricted_comment_stimulus_controller("-hidden-class") => "d-none",
+          restricted_comment_stimulus_controller("-#{index_stimulus_controller}-outlet") => "##{wrapper_key}"
         }
       end
 
@@ -80,6 +96,10 @@ def polling_interval
       def adding_comment_allowed?
         User.current.allowed_in_work_package?(:add_work_package_notes, @work_package)
       end
+
+      def unsaved_changes_confirmation_message
+        I18n.t("activities.work_packages.activity_tab.unsaved_changes_confirmation_message")
+      end
     end
   end
 end

app/components/work_packages/activities_tab/journals/index_component.rb

@@ -71,6 +71,7 @@ def fetch_journals
           API::V3::Activities::ActivityEagerLoadingWrapper.wrap(
             work_package
               .journals
+              .restricted_visible
               .includes(:user, :customizable_journals, :attachable_journals, :storable_journals, :notifications)
               .reorder(version: journal_sorting)
               .with_sequence_version

app/components/work_packages/activities_tab/journals/item_component.html.erb

@@ -14,10 +14,15 @@
               data: {
                 "anchor-activity-id": journal.sequence_version,
                 "anchor-comment-id": journal.id
-              }
+              },
+              classes: container_classes
             )
           ) do |border_box_component|
-            border_box_component.with_header(px: 2, py: 1, data: { test_selector: "op-journal-notes-header" }) do
+            border_box_component.with_header(
+              px: 2, py: 1,
+              data: { test_selector: "op-journal-notes-header" },
+              classes: comment_header_classes
+            ) do
               flex_layout(align_items: :center, justify_content: :space_between) do |header_container|
                 header_container.with_column(
                   flex_layout: true,
@@ -63,18 +68,33 @@
                 end
                 header_container.with_column(flex_layout: true, align_items: :center) do |header_end_container|
                   if has_unread_notifications?
-                    header_end_container.with_column(mr: 2, pt: 1) do
+                    header_end_container.with_column(mr: 2) do
                       render(
                         Primer::Beta::Octicon.new(
                           :"dot-fill", # color is set via CSS as requested by UI/UX Team
                           classes: "work-packages-activities-tab-journals-item-component--notification-dot-icon",
-                          size: :medium,
+                          size: (OpenProject::FeatureDecisions.comments_with_restricted_visibility_active? ? :small : :medium),
                           data: { test_selector: "op-journal-unread-notification", "op-ian-center-update-immediate": true }
                         )
                       )
                     end
                   end
 
+                  if journal.restricted?
+                    header_end_container.with_column(mr: 2) do
+                      render(
+                        Primer::Beta::Octicon.new(
+                          :lock,
+                          classes: "work-packages-activities-tab-journals-item-component--restricted-icon",
+                          size: :small,
+                          aria: { label: I18n.t("activities.work_packages.activity_tab.restricted_journal") },
+                          data: { test_selector: "op-journal-restricted-icon" },
+                          color: (journal.restricted? ? :attention : :default)
+                        )
+                      )
+                    end
+                  end
+
                   unless OpenProject::FeatureDecisions.work_package_comment_id_url_active?
                     header_end_container.with_column do
                       activity_anchor_link(journal)
@@ -100,7 +120,7 @@
               end
             end
             border_box_component.with_body(
-              classes: "work-packages-activities-tab-journals-item-component--journal-notes-body",
+              classes: comment_body_classes,
               data: { test_selector: "op-journal-notes-body" }
             ) do
               if noop?

app/components/work_packages/activities_tab/journals/item_component.rb

@@ -31,9 +31,10 @@ module ActivitiesTab
     module Journals
       class ItemComponent < ApplicationComponent
         include ApplicationHelper
-        include WorkPackages::ActivitiesTab::SharedHelpers
         include OpPrimer::ComponentHelpers
         include OpTurbo::Streamable
+        include WorkPackages::ActivitiesTab::SharedHelpers
+        include WorkPackages::ActivitiesTab::StimulusControllers
 
         def initialize(journal:, filter:, grouped_emoji_reactions:, state: :show)
           super
@@ -60,6 +61,30 @@ def wrapper_data_attributes
           }
         end
 
+        def container_classes
+          [].tap do |classes|
+            if journal.restricted?
+              classes << "work-packages-activities-tab-journals-item-component--container__restricted-comment"
+            end
+          end
+        end
+
+        def comment_header_classes
+          [].tap do |classes|
+            if journal.restricted?
+              classes << "work-packages-activities-tab-journals-item-component--header__restricted-comment"
+            end
+          end
+        end
+
+        def comment_body_classes
+          ["work-packages-activities-tab-journals-item-component--journal-notes-body"].tap do |classes|
+            if journal.restricted?
+              classes << "work-packages-activities-tab-journals-item-component--journal-notes-body__restricted-comment"
+            end
+          end
+        end
+
         def show_comment_container?
           (journal.notes.present? || noop?) && filter != :only_changes
         end
@@ -116,18 +141,27 @@ def quote_action_item(menu)
           menu.with_item(label: t("js.label_quote_comment"),
                          tag: :button,
                          content_arguments: {
-                           data: {
-                             action: "click->work-packages--activities-tab--index#quote",
-                             "content-param": journal.notes,
-                             "user-id-param": journal.user_id,
-                             "user-name-param": journal.user.name,
-                             "text-wrote-param": t(:text_wrote),
-                             test_selector: "op-wp-journal-#{journal.id}-quote"
-                           }
+                           data: quote_action_data_attributes
                          }) do |item|
             item.with_leading_visual_icon(icon: :quote)
           end
         end
+
+        def quote_action_data_attributes # rubocop:disable Metrics/AbcSize
+          {
+            controller: quote_comments_stimulus_controller,
+            "application-target": "dynamic",
+            action: "click->#{quote_comments_stimulus_controller}#quote:prevent",
+            quote_comments_stimulus_controller("-content-param") => journal.notes,
+            quote_comments_stimulus_controller("-user-id-param") => journal.user_id,
+            quote_comments_stimulus_controller("-user-name-param") => journal.user.name,
+            quote_comments_stimulus_controller("-is-restricted-param") => journal.restricted?,
+            quote_comments_stimulus_controller("-text-wrote-param") => I18n.t(:text_wrote),
+            quote_comments_stimulus_controller("-#{index_stimulus_controller}-outlet") => items_index_selector,
+            quote_comments_stimulus_controller("-#{restricted_comment_stimulus_controller}-outlet") => add_comment_selector,
+            test_selector: "op-wp-journal-#{journal.id}-quote"
+          }
+        end
       end
     end
   end

app/components/work_packages/activities_tab/journals/item_component.sass

@@ -11,5 +11,11 @@
         color: var(--bgColor-accent-emphasis)
     &--header-start-container
         flex-grow: 1
-
+    &--container__restricted-comment
+        border-color: var(--display-brown-borderColor-emphasis)
+    &--header__restricted-comment
+        border-color: var(--display-brown-borderColor-emphasis)
+        background-color: var(--display-brown-bgColor-muted)
+    &--journal-notes-body__restricted-comment
+        border-color: var(--display-brown-borderColor-emphasis)
 

app/components/work_packages/activities_tab/journals/item_component/details.rb

@@ -193,7 +193,7 @@ def render_notification_bubble(container)
             render(Primer::Beta::Octicon.new(
                      :"dot-fill", # color is set via CSS as requested by UI/UX Team
                      classes: "work-packages-activities-tab-journals-item-component-details--notification-dot-icon",
-                     size: :medium,
+                     size: (OpenProject::FeatureDecisions.comments_with_restricted_visibility_active? ? :small : :medium),
                      data: { test_selector: "op-journal-unread-notification", "op-ian-center-update-immediate": true }
                    ))
           end