[pull] dev from opf:dev

Gemfile.lock

@@ -1425,4 +1425,4 @@ RUBY VERSION
    ruby 3.4.1p0
 
 BUNDLED WITH
-   2.5.13
+   2.6.3

app/components/_index.sass

@@ -2,6 +2,7 @@
 @import "work_packages/activities_tab/journals/new_component"
 @import "work_packages/activities_tab/journals/index_component"
 @import "work_packages/activities_tab/journals/item_component"
+@import "work_packages/activities_tab/journals/revision_component"
 @import "work_packages/activities_tab/journals/item_component/details"
 @import "work_packages/activities_tab/journals/item_component/add_reactions"
 @import "work_packages/activities_tab/journals/item_component/reactions"

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

@@ -7,7 +7,7 @@
           mb: inner_container_margin_bottom
         ) do
           flex_layout(id: insert_target_modifier_id,
-                      data: { test_selector: "op-wp-journals-container" }) do |journals_index_container|
+                     data: { test_selector: "op-wp-journals-container" }) do |journals_index_container|
             if empty_state?
               journals_index_container.with_row(mt: 2, mb: 3) do
                 render(
@@ -22,12 +22,16 @@
               end
             end
 
-            recent_journals.each do |journal|
+            recent_journals.each do |record|
               journals_index_container.with_row do
-                render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new(
-                        journal:, filter:,
-                        grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[journal.id]
-                      ))
+                if record.is_a?(Changeset)
+                  render(WorkPackages::ActivitiesTab::Journals::RevisionComponent.new(changeset: record, filter:))
+                else
+                  render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new(
+                          journal: record, filter:,
+                          grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[record.id]
+                        ))
+                end
               end
             end
 
@@ -48,12 +52,16 @@
   else
     helpers.turbo_frame_tag("work-package-activities-tab-content-older-journals") do
       flex_layout do |older_journals_container|
-        older_journals.each do |journal|
+        older_journals.each do |record|
           older_journals_container.with_row do
-          render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new(
-                  journal:, filter:,
-                  grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[journal.id]
-                ))
+            if record.is_a?(Changeset)
+              render(WorkPackages::ActivitiesTab::Journals::RevisionComponent.new(changeset: record, filter:))
+            else
+              render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new(
+                      journal: record, filter:,
+                      grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[record.id]
+                    ))
+            end
           end
         end
       end

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

@@ -64,47 +64,62 @@ def journal_sorting_desc?
         end
 
         def base_journals
-          work_package
-            .journals
-            .includes(
-              :user,
-              :customizable_journals,
-              :attachable_journals,
-              :storable_journals,
-              :notifications
-            )
-            .reorder(version: journal_sorting)
-            .with_sequence_version
+          combine_and_sort_records(fetch_journals, fetch_revisions)
+        end
+
+        def fetch_journals
+          API::V3::Activities::ActivityEagerLoadingWrapper.wrap(
+            work_package
+              .journals
+              .includes(:user, :customizable_journals, :attachable_journals, :storable_journals, :notifications)
+              .reorder(version: journal_sorting)
+              .with_sequence_version
+          )
+        end
+
+        def fetch_revisions
+          work_package.changesets.includes(:user, :repository)
+        end
+
+        def combine_and_sort_records(journals, revisions)
+          (journals + revisions).sort_by do |record|
+            timestamp = record_timestamp(record)
+            journal_sorting_desc? ? [-timestamp, -record.id] : [timestamp, record.id]
+          end
+        end
+
+        def record_timestamp(record)
+          if record.is_a?(API::V3::Activities::ActivityEagerLoadingWrapper)
+            record.created_at&.to_i
+          elsif record.is_a?(Changeset)
+            record.committed_on.to_i
+          end
         end
 
         def journals
-          API::V3::Activities::ActivityEagerLoadingWrapper.wrap(base_journals)
+          base_journals
         end
 
         def recent_journals
-          recent_ones = if journal_sorting_desc?
-                          base_journals.first(MAX_RECENT_JOURNALS)
-                        else
-                          base_journals.last(MAX_RECENT_JOURNALS)
-                        end
-
-          API::V3::Activities::ActivityEagerLoadingWrapper.wrap(recent_ones)
+          if journal_sorting_desc?
+            base_journals.first(MAX_RECENT_JOURNALS)
+          else
+            base_journals.last(MAX_RECENT_JOURNALS)
+          end
         end
 
         def older_journals
-          older_ones = if journal_sorting_desc?
-                         base_journals.offset(MAX_RECENT_JOURNALS)
-                       else
-                         total = base_journals.count
-                         limit = [total - MAX_RECENT_JOURNALS, 0].max
-                         base_journals.limit(limit)
-                       end
-
-          API::V3::Activities::ActivityEagerLoadingWrapper.wrap(older_ones)
+          if journal_sorting_desc?
+            base_journals.drop(MAX_RECENT_JOURNALS)
+          else
+            base_journals.take(base_journals.size - MAX_RECENT_JOURNALS)
+          end
         end
 
         def journal_with_notes
-          base_journals.where.not(notes: "")
+          work_package
+            .journals
+            .where.not(notes: "")
         end
 
         def wp_journals_grouped_emoji_reactions

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

@@ -0,0 +1,81 @@
+<%=
+  component_wrapper(class: "work-packages-activities-tab-journals-item-component") do
+    flex_layout(data: { 
+      test_selector: "op-wp-revision-entry-#{changeset.id}"
+    }) do |revision_container|
+      revision_container.with_row do
+        render(border_box_container(
+                id: "activity-anchor-r#{changeset.revision}",
+                padding: :condensed,
+                "aria-label": I18n.t("activities.work_packages.activity_tab.commented")
+              )) do |border_box_component|
+          border_box_component.with_header(px: 2, py: 1, data: { test_selector: "op-revision-header" }) do
+            flex_layout(align_items: :center, justify_content: :space_between, classes: "work-packages-activities-tab-revision-component--header") do |header_container|
+              header_container.with_column(flex_layout: true,
+                                        classes: "work-packages-activities-tab-journals-item-component--header-start-container ellipsis") do |header_start_container|
+                header_start_container.with_column(mr: 2) do
+                  if changeset.user
+                    render(Users::AvatarComponent.new(user: changeset.user, show_name: false, size: :mini))
+                  end
+                end
+                header_start_container.with_column(mr: 1, flex_layout: true,
+                                                 classes: "work-packages-activities-tab-journals-item-component--user-name-container hidden-for-desktop") do |user_name_container|
+                  user_name_container.with_row(classes: "work-packages-activities-tab-journals-item-component--user-name ellipsis") do
+                    render_user_name
+                  end
+                  user_name_container.with_row do
+                    render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mr: 1)) do
+                      committed_text = render(Primer::Beta::Link.new(
+                        href: revision_url,
+                        scheme: :secondary,
+                        underline: false,
+                        font_size: :small,
+                        target: "_blank"
+                      )) do
+                        I18n.t("js.label_committed_link", revision_identifier: short_revision)
+                      end
+                      I18n.t("js.label_committed_at",
+                            committed_revision_link: committed_text.html_safe,
+                            date: format_time(changeset.committed_on)).html_safe
+                    end
+                  end
+                end
+                header_start_container.with_column(mr: 1,
+                                                 classes: "work-packages-activities-tab-journals-item-component--user-name ellipsis hidden-for-mobile") do
+                  render_user_name
+                end
+                header_start_container.with_column(mr: 1, classes: "hidden-for-mobile") do
+                  render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mr: 1)) do
+                    committed_text = render(Primer::Beta::Link.new(
+                      href: revision_url,
+                      scheme: :secondary,
+                      underline: false,
+                      font_size: :small,
+                      target: "_blank"
+                    )) do
+                      I18n.t("js.label_committed_link", revision_identifier: short_revision)
+                    end
+                    I18n.t("js.label_committed_at",
+                          committed_revision_link: committed_text.html_safe,
+                          date: format_time(changeset.committed_on)).html_safe
+                  end
+                end
+              end
+            end
+          end
+          border_box_component.with_body(
+            classes: "work-packages-activities-tab-journals-item-component--journal-notes-body",
+            data: { test_selector: "op-revision-notes-body" }
+          ) do
+            render(Primer::Box.new(mt: 1, classes: "op-uc-container")) do
+              format_text(changeset, :comments)
+            end
+          end
+        end
+      end
+      revision_container.with_row(flex_layout: true, classes: "work-packages-activities-tab-revision-component--stem-line-container") do |stem_line_container|
+        stem_line_container.with_column(border: :left, classes: "work-packages-activities-tab-revision-component--stem-line")
+      end
+    end
+  end
+%> 

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

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2023 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.
+# ++
+
+require "sanitize"
+
+module WorkPackages
+  module ActivitiesTab
+    module Journals
+      class RevisionComponent < ApplicationComponent
+        include ApplicationHelper
+        include OpPrimer::ComponentHelpers
+        include OpTurbo::Streamable
+
+        def initialize(changeset:, filter:)
+          super
+
+          @changeset = changeset
+          @filter = filter
+        end
+
+        def render_committer_name(committer)
+          render(Primer::Beta::Text.new(font_weight: :bold, mr: 1)) do
+            remove_email_addresses(committer)
+          end
+        end
+
+        def remove_email_addresses(committer)
+          return "" if committer.blank?
+
+          ERB::Util.html_escape(
+            Sanitize.fragment(
+              committer.gsub(%r{<[^>]+@[^>]+>}, ""),
+              Sanitize::Config::RESTRICTED
+            ).strip
+          )
+        end
+
+        private
+
+        attr_reader :changeset, :filter
+
+        def render?
+          filter != :only_comments
+        end
+
+        def user_name
+          if changeset.user
+            changeset.user.name
+          else
+            # Extract name from committer string (format: "name <email>")
+            changeset.committer.split("<").first.strip
+          end
+        end
+
+        def revision_url
+          repository = changeset.repository
+          project = repository.project
+
+          show_revision_project_repository_path(project_id: project.id, rev: changeset.revision)
+        end
+
+        def short_revision
+          changeset.revision[0..7]
+        end
+
+        def copy_url_action_item(menu)
+          menu.with_item(label: t("button_copy_link_to_clipboard"),
+                         tag: :button,
+                         content_arguments: {
+                           data: {
+                             action: "click->work-packages--activities-tab--item#copyActivityUrlToClipboard"
+                           }
+                         }) do |item|
+            item.with_leading_visual_icon(icon: :copy)
+          end
+        end
+
+        def render_user_name
+          if changeset.user
+            render_user_link(changeset.user)
+          else
+            render_committer_name(changeset.committer)
+          end
+        end
+
+        def render_user_link(user)
+          render(Primer::Beta::Link.new(
+                   href: user_url(user),
+                   target: "_blank",
+                   scheme: :primary,
+                   underline: false,
+                   font_weight: :bold
+                 )) do
+            changeset.user.name
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+.work-packages-activities-tab-revision-component
+    &--header
+        min-height: 32px
+    &--stem-line-container
+        min-height: 20px
+    &--stem-line
+        margin-left: 19px

frontend/src/app/shared/components/fields/display/field-types/wp-spent-time-display-field.module.ts

@@ -82,7 +82,7 @@ export class WorkPackageSpentTimeDisplayField extends WorkDisplayField {
             ),
           )
             .search(
-              `fields[]=WorkPackageId&operators[WorkPackageId]=%3D&values[WorkPackageId]=${wpID}&set_filter=1`,
+              `fields[]=WorkPackageId&operators[WorkPackageId]=%3D_child_work_packages&values[WorkPackageId]=${wpID}&set_filter=1`,
             )
             .toString();
 

frontend/src/global_styles/content/_forms.sass

@@ -969,4 +969,5 @@ input[type=date], input[type=time]
     overflow: auto
 
 .form-autocompleter-container
-  overflow: hidden
+  display: grid
+  grid-template-columns: minmax(0, auto)