Automatically update header and footer

Author: oliverguenther

modules/meeting/app/components/meetings/presentation_mode/footer_component.html.erb

@@ -1,4 +1,4 @@
-<div class="op-meeting-presentation--footer">
+<%= component_wrapper(class: "op-meeting-presentation--footer") do %>
   <div class="op-meeting-presentation--footer-left">
     <%= render(Primer::Beta::Button.new(
       tag: :a,
@@ -49,5 +49,4 @@
       <% end %>
     </div>
   </div>
-</div>
-
+<% end %>

modules/meeting/app/components/meetings/presentation_mode/footer_component.rb

@@ -40,7 +40,7 @@ def initialize(meeting:, sorted_agenda_item_ids:, current_item:, started_at:)
         @meeting = meeting
         @project = meeting.project
         @current_item = current_item
-        @started_at = started_at
+        @started_at = started_at.iso8601
         @agenda_item_ids = sorted_agenda_item_ids
         @current_index = sorted_agenda_item_ids.index(current_item.id)
       end
@@ -68,18 +68,22 @@ def has_next?
       def next_item
         return nil unless has_next?
 
-        @next_item ||= begin
+        if defined?(@next_item)
+          @next_item
+        else
           next_id = @agenda_item_ids[@current_index + 1]
-          @meeting.agenda_items.find_by(id: next_id)
+          @next_item = @meeting.agenda_items.find_by(id: next_id)
         end
       end
 
       def previous_item
         return nil unless has_previous?
 
-        @previous_item ||= begin
+        if defined?(@previous_item)
+          @previous_item
+        else
           previous_id = @agenda_item_ids[@current_index - 1]
-          @meeting.agenda_items.find_by(id: previous_id)
+          @previous_item = @meeting.agenda_items.find_by(id: previous_id)
         end
       end
 

modules/meeting/app/components/meetings/presentation_mode/header_component.html.erb

@@ -1,20 +1,21 @@
 <%=
-  render Primer::OpenProject::PageHeader.new(classes: "op-meeting-presentation-header") do |header|
-    header.with_breadcrumbs([])
-    header.with_title_content(@meeting.title)
+  component_wrapper do
+    render Primer::OpenProject::PageHeader.new(classes: "op-meeting-presentation-header") do |header|
+      header.with_breadcrumbs([])
+      header.with_title_content(@meeting.title)
 
-    header.with_action_button(
-      tag: :a,
-      scheme: :invisible,
-      mobile_icon: :x,
-      mobile_label: t(:"meeting.presentation_mode.exit"),
-      href: meeting_path(@meeting),
-      aria: { label: t(:"meeting.presentation_mode.exit") },
-      title: t(:"meeting.presentation_mode.exit"),
-    ) do |button|
-      button.with_leading_visual_icon(icon: :x)
-      t(:"meeting.presentation_mode.exit")
+      header.with_action_button(
+        tag: :a,
+        scheme: :invisible,
+        mobile_icon: :x,
+        mobile_label: t(:"meeting.presentation_mode.exit"),
+        href: meeting_path(@meeting),
+        aria: { label: t(:"meeting.presentation_mode.exit") },
+        title: t(:"meeting.presentation_mode.exit"),
+      ) do |button|
+        button.with_leading_visual_icon(icon: :x)
+        t(:"meeting.presentation_mode.exit")
+      end
     end
   end
 %>
-

modules/meeting/app/components/meetings/presentation_mode/show_component.html.erb

@@ -20,7 +20,7 @@
                   data: {
                     controller: "meetings--submit",
                     poll_for_changes_target: "reference",
-                    reference_value: current_item.updated_at.iso8601
+                    reference_value: @meeting.changed_hash
                   } do %>
     <div class="op-meeting-presentation--header">
       <div class="op-meeting-presentation--header-title">
@@ -42,7 +42,6 @@
     meeting: @meeting,
     sorted_agenda_item_ids: @agenda_item_ids,
     current_item: current_item,
-    started_at: started_at_param
+    started_at: @started_at
   ) %>
 <% end %>
-

modules/meeting/app/controllers/concerns/meetings/presentation_component_streams.rb

@@ -0,0 +1,83 @@
+# 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 Meetings
+  module PresentationComponentStreams
+    extend ActiveSupport::Concern
+
+    included do
+      def update_content_via_turbo_stream
+        update_header_via_turbo_stream
+        update_footer_via_turbo_stream
+        update_show_via_turbo_stream
+
+        respond_with_turbo_streams
+      end
+
+      def update_reference_value(new_reference)
+        turbo_streams << turbo_stream.set_dataset_attribute(
+          "#op-meeting-presentation-content",
+          "reference-value",
+          new_reference
+        )
+
+      end
+
+      def update_header_via_turbo_stream
+        update_via_turbo_stream(
+          component: Meetings::PresentationMode::HeaderComponent.new(
+            meeting: @meeting
+          )
+        )
+      end
+
+      def update_footer_via_turbo_stream
+        update_via_turbo_stream(
+          component: Meetings::PresentationMode::FooterComponent.new(
+            meeting: @meeting,
+            sorted_agenda_item_ids:,
+            current_item: @meeting_agenda_item,
+            started_at: @started_at
+          )
+        )
+      end
+
+      def update_show_via_turbo_stream
+        update_via_turbo_stream(
+          component: MeetingAgendaItems::ItemComponent::ShowComponent.new(
+            meeting_agenda_item: @meeting_agenda_item,
+            current_occurrence: @meeting,
+            presentation_mode: true
+          )
+        )
+      end
+    end
+  end
+end

modules/meeting/app/controllers/meeting_presentation_controller.rb

@@ -31,43 +31,32 @@
 class MeetingPresentationController < ApplicationController
   include OpTurbo::ComponentStream
   include Meetings::AgendaComponentStreams
+  include Meetings::PresentationComponentStreams
 
   before_action :check_feature_flag
 
   before_action :find_meeting
   before_action :check_presentable
+  before_action :set_started_at
   before_action :find_agenda_item, only: [:check_for_updates]
 
   load_and_authorize_with_permission_in_optional_project :view_meetings
 
   layout "meetings/presentation"
 
   def show
-    @started_at = params[:started_at].present? ? Time.zone.parse(params[:started_at]) : Time.current
     @current_id = determine_current_id
   end
 
   def check_for_updates
-    if params[:reference] == @meeting_agenda_item.updated_at.iso8601
+    current_reference = @meeting.changed_hash
+    if params[:reference] == current_reference
       head :no_content
       return
     end
 
-    turbo_streams << turbo_stream.set_dataset_attribute(
-      "#op-meeting-presentation-content",
-      "reference-value",
-      @meeting_agenda_item.updated_at.iso8601
-    )
-
-    update_via_turbo_stream(
-      component: MeetingAgendaItems::ItemComponent::ShowComponent.new(
-        meeting_agenda_item: @meeting_agenda_item,
-        current_occurrence: @meeting,
-        presentation_mode: true
-      )
-    )
-
-    respond_with_turbo_streams
+    update_reference_value(current_reference)
+    update_content_via_turbo_stream
   end
 
   private
@@ -87,6 +76,10 @@ def check_feature_flag
     end
   end
 
+  def set_started_at
+    @started_at = params[:started_at].present? ? Time.zone.parse(params[:started_at]) : Time.current
+  end
+
   def check_presentable
     if @meeting.agenda_items.empty?
       flash[:warning] = t("meeting.presentation_mode.no_items_flash")