Merge pull request #1225 from basecamp/assorted-bugs-2

Fix caching issue with the filter menu

app/views/filters/_settings.html.erb

@@ -1,34 +1,31 @@
-<% cache user_filtering do %>
-  <%= tag.aside \
-        class: class_names("filters flex align-center gap-half justify-center center margin-block-end", { "filters--expanded": user_filtering.expanded? }),
-        data: {
-          controller: "toggle-class filter-settings",
-          toggle_class_toggle_class: "filters--expanded",
-          filter_settings_filters_set_class: "filters--has-filters-set",
-          filter_settings_no_filtering_url_value: no_filtering_url,
-          filter_settings_refresh_url_value: settings_refresh_path,
-          filter_settings_cards_url_value: cards_path,
-          turbo_permanent: true } do %>
-    <%= form_with url: filter_url, method: :get, class: "", data: {
-          controller: "form",
-          turbo_frame: "cards_container",
-          filter_settings_target: "form",
-          action: "turbo:submit-end->filter-settings#resetIfNoFiltering",
-          turbo_action: "advance" } do |form| %>
-      <%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element"} %>
+<%= tag.aside \
+      class: class_names("filters flex align-center gap-half justify-center center margin-block-end", { "filters--expanded": user_filtering.expanded? }),
+      data: {
+            controller: "toggle-class filter-settings",
+            toggle_class_toggle_class: "filters--expanded",
+            filter_settings_filters_set_class: "filters--has-filters-set",
+            filter_settings_no_filtering_url_value: no_filtering_url,
+            filter_settings_refresh_url_value: settings_refresh_path,
+            filter_settings_cards_url_value: cards_path,
+            turbo_permanent: true } do %>
+  <%= form_with url: filter_url, method: :get, class: "", data: {
+        controller: "form",
+        turbo_frame: "cards_container",
+        filter_settings_target: "form",
+        action: "turbo:submit-end->filter-settings#resetIfNoFiltering",
+        turbo_action: "advance" } do |form| %>
+    <%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
 
-      <%= yield form if block_given? %>
+    <%= yield form if block_given? %>
 
-      <div class="flex-inline center align-center gap-half" data-controller="toggle-enable">
-        <%= render "filters/settings/terms", filter: user_filtering.filter, form: form do%>
-          <%= yield form if block_given? %>
+    <div class="flex-inline center align-center gap-half" data-controller="toggle-enable">
+      <%= render "filters/settings/terms", filter: user_filtering.filter, form: form do %>
+        <%= yield form if block_given? %>
       <% end %>
-        <%= render "filters/settings/controls", user_filtering: user_filtering, form: form %>
+      <%= render "filters/settings/controls", user_filtering: user_filtering, form: form %>
 
-        <%= render "filters/settings/toggle", user_filtering: user_filtering %>
-      </div>
-    <% end %>
-    <%= render "filters/settings/manage", user_filtering: user_filtering, no_filtering_url: no_filtering_url %>
+      <%= render "filters/settings/toggle", user_filtering: user_filtering %>
+    </div>
   <% end %>
-
+  <%= render "filters/settings/manage", user_filtering: user_filtering, no_filtering_url: no_filtering_url %>
 <% end %>

script/fetch-prod-db.rb

@@ -9,7 +9,16 @@ if ARGV.size != 1
 end
 
 tenant_id = ARGV[0]
-CONTAINER = "fizzy-web-production-b2f4038ea1fd054e313308940d9e445428f35b23"
+
+# Automatically detect the fizzy-web-production container
+puts "→ Detecting fizzy-web-production container..."
+container_output, status = Open3.capture2(%(ssh app@fizzy-app-101 "docker ps --format '{{.Names}}' | grep fizzy-web-production"))
+abort("Failed to detect container") unless status.success?
+
+CONTAINER = container_output.strip
+abort("No fizzy-web-production container found") if CONTAINER.empty?
+puts "→ Using container: #{CONTAINER}"
+
 REMOTE_PATH = "/rails/storage/tenants/production/#{tenant_id}/db/main.sqlite3.1"
 
 Dir.mktmpdir do |tmpdir|