OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Defer loading of emoji (re)actions menu for improved performance (#20580)
Kabiru Mwenja073114526572
diff --git a/app/components/work_packages/activities_tab/journals/item_component/add_reactions.html.erb b/app/components/work_packages/activities_tab/journals/item_component/add_reactions.html.erbindex 56db19bbed5..233c6b9b2fb 100644--- a/app/components/work_packages/activities_tab/journals/item_component/add_reactions.html.erb+++ b/app/components/work_packages/activities_tab/journals/item_component/add_reactions.html.erb@@ -1,47 +1,33 @@<%=- component_wrapper do- render(- Primer::Alpha::Overlay.new(- title: I18n.t("reactions.action_title"),- padding: :condensed,- anchor_side: :outside_top,- visually_hide_title: true- )- ) do |overlay|- overlay.with_show_button(- icon: "smiley",- "aria-label": I18n.t("reactions.add_reaction"),- name: I18n.t("reactions.add_reaction"),- mr: 1,- test_selector: "add-reactions-button"- )-- overlay.with_body(pt: 2, test_selector: "emoji-reactions-overlay") do- flex_layout(flex_wrap: :wrap, classes: "op-add-reactions-overlay") do |add_reactions_container|- EmojiReaction.available_emoji_reactions.each do |emoji, reaction|- add_reactions_container.with_column(mr: 1) do- render(- Primer::Beta::Button.new(- scheme: button_scheme(reaction),- color: :default,- bg: counter_color(reaction),- id: "overlay-#{journal.id}-#{reaction}",- test_selector: "overlay-reaction-#{reaction}",- tag: :a,- href: href(reaction:),- data: {- turbo_stream: true,- turbo_method: :put,- "#{polling_stimulus_controller}-target": "reactionButton"- },- aria: { label: I18n.t("reactions.react_with", reaction: reaction.to_s.humanize(capitalize: false)) },- font_size: 4,- classes: "op-add-reactions-button"- )- ) do- emoji- end- end+ component_wrapper(menu_id:) do+ flex_layout(+ flex_wrap: :wrap,+ test_selector: "emoji-reactions-overlay",+ classes: "op-add-reactions-overlay",+ p: 2+ ) do |add_reactions_container|+ EmojiReaction.available_emoji_reactions.each do |emoji, reaction|+ add_reactions_container.with_column(mr: 1) do+ render(+ Primer::Beta::Button.new(+ scheme: button_scheme(reaction),+ color: :default,+ bg: counter_color(reaction),+ id: "overlay-#{journal.id}-#{reaction}",+ test_selector: "overlay-reaction-#{reaction}",+ tag: :a,+ href: href(reaction:),+ data: {+ turbo_stream: true,+ turbo_method: :put,+ "#{polling_stimulus_controller}-target": "reactionButton"+ },+ aria: { label: I18n.t("reactions.react_with", reaction: reaction.to_s.humanize(capitalize: false)) },+ font_size: 4,+ classes: "op-add-reactions-button"+ )+ ) do+ emojiendendenddiff --git a/app/components/work_packages/activities_tab/journals/item_component/add_reactions.rb b/app/components/work_packages/activities_tab/journals/item_component/add_reactions.rbindex a784a1bd3ff..c42a82c3c89 100644--- a/app/components/work_packages/activities_tab/journals/item_component/add_reactions.rb+++ b/app/components/work_packages/activities_tab/journals/item_component/add_reactions.rb@@ -44,6 +44,14 @@ module WorkPackages@grouped_emoji_reactions = grouped_emoji_reactions || {}end+ def self.menu_id(journal)+ "reactions-menu-#{journal.id}"+ end++ def menu_id+ self.class.menu_id(journal)+ end+def render?current_user_can_react?enddiff --git a/app/components/work_packages/activities_tab/journals/item_component/show.html.erb b/app/components/work_packages/activities_tab/journals/item_component/show.html.erbindex eae85d2671a..60e70dfff55 100644--- a/app/components/work_packages/activities_tab/journals/item_component/show.html.erb+++ b/app/components/work_packages/activities_tab/journals/item_component/show.html.erb@@ -9,7 +9,27 @@endjournal_container.with_row(flex_layout: true) do |reactions_container|reactions_container.with_column do- render(WorkPackages::ActivitiesTab::Journals::ItemComponent::AddReactions.new(journal:, grouped_emoji_reactions:))+ if reactable?+ render(+ Primer::Alpha::ActionMenu.new(+ menu_id:,+ anchor_side: :outside_top,+ overlay_arguments: {+ title: I18n.t("reactions.action_title"),+ visually_hide_title: true+ },+ src: emoji_actions_work_package_activity_path(journal.journable, journal)+ )+ ) do |action_menu|+ action_menu.with_show_button(+ icon: "smiley",+ "aria-label": I18n.t("reactions.add_reaction"),+ name: I18n.t("reactions.add_reaction"),+ mr: 1,+ test_selector: "add-reactions-button"+ )+ end+ endendreactions_container.with_column dorender(WorkPackages::ActivitiesTab::Journals::ItemComponent::Reactions.new(journal:, grouped_emoji_reactions:))diff --git a/app/components/work_packages/activities_tab/journals/item_component/show.rb b/app/components/work_packages/activities_tab/journals/item_component/show.rbindex cfacea9894f..b981eed7aed 100644--- a/app/components/work_packages/activities_tab/journals/item_component/show.rb+++ b/app/components/work_packages/activities_tab/journals/item_component/show.rb@@ -46,6 +46,14 @@ module WorkPackages@grouped_emoji_reactions = grouped_emoji_reactionsend+ def menu_id+ ItemComponent::AddReactions.menu_id(journal)+ end++ def reactable?+ ItemComponent::AddReactions.new(journal:, grouped_emoji_reactions: {}).render?+ end+privateattr_reader :journal, :filter, :grouped_emoji_reactionsdiff --git a/app/controllers/work_packages/activities_tab_controller.rb b/app/controllers/work_packages/activities_tab_controller.rbindex 64e91c545a1..011c621b88d 100644--- a/app/controllers/work_packages/activities_tab_controller.rb+++ b/app/controllers/work_packages/activities_tab_controller.rb@@ -36,7 +36,7 @@ class WorkPackages::ActivitiesTabController < ApplicationControllerbefore_action :find_work_packagebefore_action :find_project- before_action :find_journal, only: %i[item_actions edit cancel_edit update toggle_reaction]+ before_action :find_journal, only: %i[emoji_actions item_actions edit cancel_edit update toggle_reaction]before_action :set_filterbefore_action :authorizebefore_action :initialize_pagination, only: %i[page_streams]@@ -113,6 +113,12 @@ class WorkPackages::ActivitiesTabController < ApplicationControllerrespond_with_turbo_streamsend+ def emoji_actions+ render WorkPackages::ActivitiesTab::Journals::ItemComponent::AddReactions+ .new(journal: @journal, grouped_emoji_reactions: grouped_emoji_reactions_for_journal),+ layout: false+ end+def item_actionsrender WorkPackages::ActivitiesTab::Journals::ItemComponent::Actions.new(@journal),layout: falsediff --git a/config/initializers/permissions.rb b/config/initializers/permissions.rbindex 9c50b02349c..a10e7af30ff 100644--- a/config/initializers/permissions.rb+++ b/config/initializers/permissions.rb@@ -306,7 +306,7 @@ Rails.application.reloader.to_prepare do# FIXME: Although the endpoint is removed, the code checking whether a user# is eligible to add work packages through the API still seems to rely on this.journals: [:new],- "work_packages/activities_tab": %i[create toggle_reaction sanitize_internal_mentions]+ "work_packages/activities_tab": %i[emoji_actions create toggle_reaction sanitize_internal_mentions]},permissible_on: %i[work_package project],dependencies: :view_work_packagesdiff --git a/config/routes.rb b/config/routes.rbindex 9fdedf1f622..85af7079393 100644--- a/config/routes.rb+++ b/config/routes.rb@@ -735,6 +735,7 @@ Rails.application.routes.draw doresources :activities, controller: "work_packages/activities_tab", only: %i[index create edit update] domember doget :cancel_edit+ get :emoji_actionsget :item_actionsput :toggle_reactionenddiff --git a/spec/support/components/work_packages/emoji_reactions.rb b/spec/support/components/work_packages/emoji_reactions.rbindex 101db401ed1..6e19503aec2 100644--- a/spec/support/components/work_packages/emoji_reactions.rb+++ b/spec/support/components/work_packages/emoji_reactions.rb@@ -92,11 +92,11 @@ module Componentsendend- def open_emoji_reactions_overlay_for_journal(journal, &block)+ def open_emoji_reactions_overlay_for_journal(journal, &)within_journal_entry(journal) doclick_on "Add reaction"- wait_for { page }.to have_test_selector("emoji-reactions-overlay")- within_emoji_reactions_overlay(&block)+ expect(page).to have_test_selector("emoji-reactions-overlay", wait: 10)+ within_emoji_reactions_overlay(&)endend