l3dlp-sandbox · pull · Oct 27, 2024 · Jun 24, 2024 · Jul 1, 2024 · Jul 2, 2024
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -248,6 +248,7 @@ RSpec/DescribeMethod:
 # to match the exact file name
 RSpec/SpecFilePathFormat:
   CustomTransform:
+    OpenIDConnect: openid_connect
     OAuthClients: oauth_clients
   IgnoreMethods: true
 

diff --git a/Gemfile b/Gemfile
@@ -222,7 +222,7 @@ gem "appsignal", "~> 3.10.0", require: false
 
 gem "view_component"
 # Lookbook
-gem "lookbook", "~> 2.3.0"
+gem "lookbook", "~> 2.3.3"
 
 # Require factory_bot for usage with openproject plugins testing
 gem "factory_bot", "~> 6.5.0", require: false
@@ -397,6 +397,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.18.0"
-gem "openproject-octicons_helper", "~>19.18.0"
-gem "openproject-primer_view_components", "~>0.48.0"
+gem "openproject-octicons", "~>19.19.0"
+gem "openproject-octicons_helper", "~>19.19.0"
+gem "openproject-primer_view_components", "~>0.48.1"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -342,23 +342,23 @@ GEM
       activerecord (>= 4.0.0, < 8.0)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.991.0)
-    aws-sdk-core (3.209.1)
+    aws-partitions (1.992.0)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
+      aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.94.0)
-      aws-sdk-core (~> 3, >= 3.207.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.168.0)
-      aws-sdk-core (~> 3, >= 3.207.0)
+    aws-sdk-s3 (1.169.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sdk-sns (1.88.0)
       aws-sdk-core (~> 3, >= 3.207.0)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.0)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     axe-core-api (4.10.1)
       dumb_delegator
@@ -386,7 +386,7 @@ GEM
     bindata (2.5.0)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    brakeman (6.2.1)
+    brakeman (6.2.2)
       racc
     browser (6.0.0)
     builder (3.3.0)
@@ -703,7 +703,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.7.21)
+    lefthook (1.8.1)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -727,7 +727,7 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lookbook (2.3.2)
+    lookbook (2.3.3)
       activemodel
       css_parser
       htmlbeautifier (~> 1.3)
@@ -803,12 +803,12 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.18.0)
-    openproject-octicons_helper (19.18.0)
+    openproject-octicons (19.19.0)
+    openproject-octicons_helper (19.19.0)
       actionview
-      openproject-octicons (= 19.18.0)
+      openproject-octicons (= 19.19.0)
       railties
-    openproject-primer_view_components (0.48.0)
+    openproject-primer_view_components (0.48.1)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.17.0)
@@ -840,7 +840,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.8)
+    pg (1.5.9)
     plaintext (0.3.4)
       activesupport (> 2.2.1)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -1044,7 +1044,7 @@ GEM
       i18n
       iso8601
     ruby-ole (1.2.13.1)
-    ruby-prof (1.7.0)
+    ruby-prof (1.7.1)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby-saml (1.17.0)
@@ -1147,8 +1147,8 @@ GEM
       public_suffix
     vcr (6.3.1)
       base64
-    view_component (3.17.0)
-      activesupport (>= 5.2.0, < 8.0)
+    view_component (3.19.0)
+      activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     virtus (2.0.0)
@@ -1272,7 +1272,7 @@ DEPENDENCIES
   letter_opener_web
   listen (~> 3.9.0)
   lograge (~> 0.14.0)
-  lookbook (~> 2.3.0)
+  lookbook (~> 2.3.3)
   mail (= 2.8.1)
   markly (~> 0.10)
   matrix (~> 0.4.2)
@@ -1304,10 +1304,10 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.18.0)
-  openproject-octicons_helper (~> 19.18.0)
+  openproject-octicons (~> 19.19.0)
+  openproject-octicons_helper (~> 19.19.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.48.0)
+  openproject-primer_view_components (~> 0.48.1)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!

diff --git a/app/components/_index.sass b/app/components/_index.sass
@@ -3,6 +3,7 @@
 @import "work_packages/activities_tab/journals/index_component"
 @import "work_packages/activities_tab/journals/item_component"
 @import "work_packages/activities_tab/journals/item_component/details"
+@import "work_packages/activities_tab/journals/item_component/reactions"
 @import "shares/modal_body_component"
 @import "shares/invite_user_form_component"
 @import "work_packages/details/tab_component"

diff --git a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb
@@ -28,7 +28,9 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <%=
-  render(Primer::Alpha::Dialog.new(id: DIALOG_ID, title: "Delete item")) do |dialog|
+  render(Primer::Alpha::Dialog.new(id: DIALOG_ID,
+                                   title: "Delete item",
+                                   data: { test_selector: TEST_SELECTOR })) do |dialog|
     dialog.with_header(variant: :large)
     dialog.with_body do
       "Are you sure you want to delete this item from the current hierarchy level?"

diff --git a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb
@@ -35,6 +35,7 @@ class DeleteItemDialogComponent < ApplicationComponent
         include OpTurbo::Streamable
 
         DIALOG_ID = "op-hierarchy-item--deletion-confirmation"
+        TEST_SELECTOR = "op-custom-fields--delete-item-dialog"
 
         def initialize(custom_field:, hierarchy_item:)
           super

diff --git a/app/components/admin/custom_fields/hierarchy/item_component.html.erb b/app/components/admin/custom_fields/hierarchy/item_component.html.erb
@@ -28,7 +28,7 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <%=
-  component_wrapper do
+  component_wrapper(data: { test_selector: "op-custom-fields--hierarchy-item" }) do
     flex_layout(align_items: :center, justify_content: :space_between) do |item_container|
       item_container.with_column(flex_layout: true) do |item_information|
         item_information.with_column(mr: 2) do

diff --git a/app/components/admin/custom_fields/hierarchy/items_component.html.erb b/app/components/admin/custom_fields/hierarchy/items_component.html.erb
@@ -32,7 +32,10 @@ See COPYRIGHT and LICENSE files for more details.
     flex_layout do |container|
       if items.empty? && !show_new_item_form?
         container.with_row(mb: 3) do
-          render Primer::Beta::Blankslate.new(border: true) do |component|
+          render Primer::Beta::Blankslate.new(
+            border: true,
+            test_selector: "op-custom-fields--hierarchy-items-blankslate"
+          ) do |component|
             component.with_visual_icon(icon: "list-ordered")
             component.with_heading(tag: :h3).with_content(I18n.t("custom_fields.admin.items.blankslate.title"))
             component.with_description { I18n.t("custom_fields.admin.items.blankslate.description") }

diff --git a/app/components/admin/custom_fields/hierarchy/new_item_form_component.html.erb b/app/components/admin/custom_fields/hierarchy/new_item_form_component.html.erb
@@ -31,6 +31,7 @@ See COPYRIGHT and LICENSE files for more details.
   primer_form_with(
     url: custom_field_items_path(@custom_field),
     method: :post,
+    data: { test_selector: "op-custom-fields--new-item-form" }
   ) do |f|
     render(CustomFields::Hierarchy::NewItemForm.new(f, custom_field: @custom_field, label: @label, short: @short))
   end

diff --git a/app/components/custom_fields/details_component.html.erb b/app/components/custom_fields/details_component.html.erb
@@ -1,9 +1,14 @@
 <%=
   component_wrapper do
     flex_layout do |content|
-      content.with_row(mb: 3) do
-        render Primer::Alpha::Banner.new(scheme: :default, icon: :info, dismiss_scheme: :hide) do
-          I18n.t("custom_fields.admin.notice.remember_items_and_projects")
+      if has_no_items_or_projects?
+        content.with_row(mb: 3) do
+          render Primer::Alpha::Banner.new(scheme: :default,
+                                           icon: :info,
+                                           dismiss_scheme: :hide,
+                                           test_selector: "op-custom-fields--new-hierarchy-banner") do
+            I18n.t("custom_fields.admin.notice.remember_items_and_projects")
+          end
         end
       end
 

diff --git a/app/components/custom_fields/details_component.rb b/app/components/custom_fields/details_component.rb
@@ -32,5 +32,13 @@ module CustomFields
   class DetailsComponent < ApplicationComponent
     include OpPrimer::ComponentHelpers
     include OpTurbo::Streamable
+
+    alias_method :custom_field, :model
+
+    def has_no_items_or_projects?
+      custom_field.field_format_hierarchy? &&
+        custom_field.hierarchy_root.children.empty? &&
+        custom_field.projects.empty?
+    end
   end
 end
diff --git a/app/components/notifications/index_page_header_component.html.erb b/app/components/notifications/index_page_header_component.html.erb
@@ -1,6 +1,6 @@
 <%= render(Primer::OpenProject::PageHeader.new) do |header|
   header.with_title { page_title }
-  header.with_breadcrumbs(breadcrumb_items)
+  header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: current_breadcrumb_element == page_title ? :bold : :normal)
 
   header.with_action_button(tag: :a,
                             mobile_icon: :gear,

diff --git a/app/components/notifications/index_page_header_component.rb b/app/components/notifications/index_page_header_component.rb
@@ -38,16 +38,41 @@ def initialize(project: nil)
     end
 
     def page_title
-      I18n.t("js.notifications.title")
+      if current_item.present?
+        current_item.title
+      else
+        I18n.t("notifications.menu.inbox")
+      end
     end
 
     def breadcrumb_items
-      [parent_element,
-       page_title]
+      [{ href: home_path, text: helpers.organization_name },
+       { href: notifications_path, text: I18n.t("js.notifications.title") },
+       current_breadcrumb_element]
     end
 
-    def parent_element
-      { href: home_path, text: helpers.organization_name }
+    def current_breadcrumb_element
+      if current_section && current_section.header.present?
+        I18n.t("menus.breadcrumb.nested_element", section_header: current_section.header, title: page_title).html_safe
+      else
+        page_title
+      end
+    end
+
+    def current_section
+      return @current_section if defined?(@current_section)
+
+      @current_section = Notifications::Menu
+                           .new(params:, current_user: User.current)
+                           .selected_menu_group
+    end
+
+    def current_item
+      return @current_item if defined?(@current_item)
+
+      @current_item = Notifications::Menu
+                        .new(params:, current_user: User.current)
+                        .selected_menu_item
     end
   end
 end
diff --git a/app/components/op_primer/border_box_table_component.html.erb b/app/components/op_primer/border_box_table_component.html.erb
@@ -46,11 +46,11 @@ See COPYRIGHT and LICENSE files for more details.
 
     if rows.empty?
       component.with_row(scheme: :default) { render_blank_slate }
-    end
-
-    rows.each do |row|
-      component.with_row(scheme: :default) do
-        render(row_class.new(row:, table: self))
+    else
+      rows.each do |row|
+        component.with_row(scheme: :default) do
+          render(row_class.new(row:, table: self))
+        end
       end
     end
   end

diff --git a/app/components/work_packages/activities_tab/journals/index_component.html.erb b/app/components/work_packages/activities_tab/journals/index_component.html.erb
@@ -1,25 +1,35 @@
 <%=
   component_wrapper(class: "work-packages-activities-tab-journals-index-component") do
     flex_layout do |journals_index_wrapper_container|
-      journals_index_wrapper_container.with_row(classes: "work-packages-activities-tab-journals-index-component--journals-inner-container", mb: inner_container_margin_bottom) do
-        flex_layout(id: insert_target_modifier_id, data: { "test_selector": "op-wp-journals-container" }) do |journals_index_container|
+      journals_index_wrapper_container.with_row(
+        classes: "work-packages-activities-tab-journals-index-component--journals-inner-container",
+        mb: inner_container_margin_bottom
+      ) do
+        flex_layout(id: insert_target_modifier_id,
+                    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(
-                WorkPackages::ActivitiesTab::Journals::EmptyComponent.new()
+                WorkPackages::ActivitiesTab::Journals::EmptyComponent.new
               )
             end
           end
+
           journals.each do |journal|
             journals_index_container.with_row do
-              render(
-                WorkPackages::ActivitiesTab::Journals::ItemComponent.new(journal:, filter:)
-              )
+              render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new(
+                      journal:, filter:,
+                      grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[journal.id]
+                    ))
             end
           end
         end
       end
-      journals_index_wrapper_container.with_row(classes: "work-packages-activities-tab-journals-index-component--stem-connection") unless empty_state? || journal_sorting == "desc"
+
+      unless empty_state? || journal_sorting_desc?
+        journals_index_wrapper_container
+          .with_row(classes: "work-packages-activities-tab-journals-index-component--stem-connection")
+      end
     end
   end
 %>
diff --git a/app/components/work_packages/activities_tab/journals/index_component.rb b/app/components/work_packages/activities_tab/journals/index_component.rb
@@ -59,6 +59,10 @@ def journal_sorting
           User.current.preference&.comments_sorting || "desc"
         end
 
+        def journal_sorting_desc?
+          journal_sorting == "desc"
+        end
+
         def journals
           work_package.journals.includes(:user, :notifications).reorder(version: journal_sorting)
         end
@@ -67,12 +71,16 @@ def journal_with_notes
           journals.where.not(notes: "")
         end
 
+        def wp_journals_grouped_emoji_reactions
+          @wp_journals_grouped_emoji_reactions ||= Journal.grouped_work_package_journals_emoji_reactions(work_package)
+        end
+
         def empty_state?
           filter == :only_comments && journal_with_notes.empty?
         end
 
         def inner_container_margin_bottom
-          if journal_sorting == "desc"
+          if journal_sorting_desc?
             3
           else
             0