Merge pull request #1303 from basecamp/card-broadcasts

Improve page refreshes

app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
-  include Authentication, Authorization, CurrentRequest, CurrentTimezone, SetPlatform, TurboFlash, WriterAffinity
+  include Authentication, Authorization, CurrentRequest, CurrentTimezone, SetPlatform, TurboFlash, ViewTransitions, WriterAffinity
 
   stale_when_importmap_changes
   allow_browser versions: :modern, block: -> { render "errors/not_acceptable", layout: "error" }

app/controllers/concerns/view_transitions.rb

@@ -0,0 +1,16 @@
+module ViewTransitions
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :disable_view_transitions, if: :page_refresh?
+  end
+
+  private
+    def disable_view_transitions
+      @disable_view_transition = true
+    end
+
+    def page_refresh?
+      request.referrer.present? && request.referrer == request.url
+    end
+end

app/helpers/cards_helper.rb

@@ -33,8 +33,4 @@ module CardsHelper
     title << "assigned to #{card.assignees.map(&:name).to_sentence}" if card.assignees.any?
     title.join(" ")
   end
-
-  def cacheable_preview_parts_for(card, *options)
-    [ card, card.collection, card.collection.entropy_configuration, card.collection.publication, card.column&.color, *options ]
-  end
 end

app/helpers/collections_helper.rb

@@ -0,0 +1,5 @@
+module CollectionsHelper
+  def referenced_collections_from(records)
+    Current.user.collections.where id: records.pluck(:collection_id).uniq
+  end
+end

app/views/cards/_broadcasts.html.erb

@@ -0,0 +1,3 @@
+<% referenced_collections_from(records).each do |collection| %>
+  <%= turbo_stream_from collection %>
+<% end %>

app/views/cards/index.html.erb

@@ -1,7 +1,7 @@
 <% @page_title = @user_filtering.selected_collections_label %>
 <% turbo_exempts_page_from_cache %>
 
-<%= render "filters/broadcasts", filter: @filter %>
+<%= render "cards/broadcasts", records: @page.records %>
 
 <% content_for :head do %>
   <%= tag.meta property: "og:title", content: @page_title %>
@@ -28,7 +28,7 @@
 <%= turbo_frame_tag :cards_container do %>
   <section class="cards cards--grid">
     <%= with_automatic_pagination :cards_paginated_container, @page do %>
-      <%= render partial: "cards/display/preview", collection: @page.records, as: :card, locals: { draggable: true }, cached: ->(card) { cacheable_preview_parts_for(card) } %>
+      <%= render partial: "cards/display/preview", collection: @page.records, as: :card, locals: { draggable: true }, cached: ->(card) { card.cache_invalidation_parts.for_preview } %>
     <% end %>
   </section>
 <% end %>

app/views/collections/show/_filtered_cards.html.erb

@@ -1,5 +1,5 @@
 <section class="cards cards--grid">
   <%= with_automatic_pagination :filtered_cards_paginated_container, page do %>
-    <%= render partial: "cards/display/preview", collection: page.records, as: :card, locals: { draggable: true }, cached: ->(card) { cacheable_preview_parts_for(card) } %>
+    <%= render partial: "cards/display/preview", collection: page.records, as: :card, locals: { draggable: true }, cached: ->(card) { card.cache_invalidation_parts.for_preview } %>
   <% end %>
 </section>

app/views/events/index.html.erb

@@ -1,7 +1,7 @@
 <% @page_title = "Home" %>
 <% @header_class = "header--events" %>
 
-<%= render "filters/broadcasts", filter: @filter %>
+<%= render "cards/broadcasts", records: @day_timeline.events %>
 
 <% content_for :header do %>
   <%= render "filters/menu" %>

app/views/filters/_broadcasts.html.erb

@@ -1,7 +0,0 @@
-<% if filter.collections.any? %>
-  <% filter.collections.each do |collection| %>
-    <%= turbo_stream_from collection %>
-  <% end %>
-<% else %>
-  <%= turbo_stream_from :collections %>
-<% end %>

app/views/layouts/shared/_head.html.erb

@@ -2,7 +2,10 @@
   <%= page_title_tag %>
 
   <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, viewport-fit=cover">
-  <meta name="view-transition" content="same-origin">
+
+  <% unless @disable_view_transition %>
+    <meta name="view-transition" content="same-origin">
+  <% end %>
   <meta name="color-scheme" content="light dark">
   <meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
   <meta name="theme-color" content="#000000" media="(prefers-color-scheme: dark)">