From 7dce386322c45b7f2971ff186d3c8630d98b1548 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Fri, 3 Oct 2025 15:28:32 +0200 Subject: [PATCH 1/2] Detect container dynamically Containers are taken down of course! --- script/fetch-prod-db.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/script/fetch-prod-db.rb b/script/fetch-prod-db.rb index ececda4ee..59b420d3c 100755 --- a/script/fetch-prod-db.rb +++ b/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| From 711609bd51f7911c68b53680dd07a6dcd56244bf Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Fri, 3 Oct 2025 15:54:40 +0200 Subject: [PATCH 2/2] Remove cache for the settings form It is sensitive to the screen, it is causing trouble and it is not really justified https://fizzy.37signals.com/5986089/cards/2159 --- app/views/filters/_settings.html.erb | 53 +++++++++++++--------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb index b8f907c45..9364fef04 100644 --- a/app/views/filters/_settings.html.erb +++ b/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? %> -
- <%= render "filters/settings/terms", filter: user_filtering.filter, form: form do%> - <%= yield form if block_given? %> +
+ <%= 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 %> -
- <% end %> - <%= render "filters/settings/manage", user_filtering: user_filtering, no_filtering_url: no_filtering_url %> + <%= render "filters/settings/toggle", user_filtering: user_filtering %> +
<% end %> - + <%= render "filters/settings/manage", user_filtering: user_filtering, no_filtering_url: no_filtering_url %> <% end %>