feat[Op#50985] Add Primer Flash

https://community.openproject.org/work_packages/50985
opf · Nov 22, 2023 · b60360a · b60360a
1 parent dee79b6
commit b60360a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -115,11 +115,23 @@ def due_date_distance_in_words(date)
     end
   end
 
+  def render_primer_flash_message?
+    flash[:primer_flash].present?
+  end
+
+  def render_primer_flash_message
+    return unless render_primer_flash_message?
+
+    render(FlashMessageComponent.new(**flash[:primer_flash].to_hash))
+  end
+
   # Renders flash messages
-  def render_flash_messages
+  def render_legacy_flash_messages
+    return if render_primer_flash_message?
+
     messages = flash
       .reject { |k, _| k.start_with? '_' }
-      .map { |k, v| render_flash_message(k, v) }
+      .map { |k, v| render_legacy_flash_message(k, v) }
 
     safe_join messages, "\n"
   end
@@ -132,20 +144,24 @@ def join_flash_messages(messages)
     end
   end
 
-  def render_flash_message(type, message, html_options = {})
+  def render_legacy_flash_message(type, message, html_options = {}) # rubocop:disable Metrics/AbcSize
     if type.to_s == 'notice'
       type = 'success'
     end
+
     toast_css_classes = ["op-toast -#{type}", html_options.delete(:class)]
+
     # Add autohide class to notice flashes if configured
     if type.to_s == 'success' && User.current.pref.auto_hide_popups?
       toast_css_classes << 'autohide-toaster'
     end
+
     html_options = { class: toast_css_classes.join(' '), role: 'alert' }.merge(html_options)
     close_button = content_tag :a, '', class: 'op-toast--close icon-context icon-close',
                                        title: I18n.t('js.close_popup_title'),
                                        tabindex: '0'
     toast = content_tag(:div, join_flash_messages(message), class: 'op-toast--content')
+
     content_tag :div, '', class: 'op-toast--wrapper' do
       content_tag :div, '', class: 'op-toast--casing' do
         content_tag :div, html_options do

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
@@ -115,14 +115,15 @@ See COPYRIGHT and LICENSE files for more details.
     <% end %>
     <div class="content-overlay"></div>
     <main id="content-wrapper" class="<%= initial_classes %>">
+      <%= render_primer_flash_message %>
       <% if show_decoration %>
         <div id="breadcrumb" class="<%= initial_classes %><%= show_breadcrumb ? ' -show' : '' %>">
           <%= you_are_here_info %>
           <%= full_breadcrumb %>
           <%= call_hook :view_layouts_base_breadcrumb %>
         </div>
       <% end %>
-      <%= render_flash_messages %>
+      <%= render_legacy_flash_messages %>
       <% if show_onboarding_modal? %>
         <section data-augmented-model-wrapper
                  data-modal-initialize-now="true"