Skip to content

armgit / maybe

Public Imported from GitHub
0

The personal finance app for everyone

Preserve pagination on entry updates (#1563)

Zach Gollwitzera4d10097d579
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 24c962df..85aca138 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -166,4 +166,24 @@ module ApplicationHelper
cookies[:admin] == "true"
end
+
+ def custom_pagy_url_for(pagy, page, current_path: nil)
+ if current_path.blank?
+ pagy_url_for(pagy, page)
+ else
+ uri = URI.parse(current_path)
+ params = URI.decode_www_form(uri.query || "").to_h
+
+ # Delete existing page param if it exists
+ params.delete("page")
+ # Add new page param unless it's page 1
+ params["page"] = page unless page == 1
+
+ if params.empty?
+ uri.path
+ else
+ "#{uri.path}?#{URI.encode_www_form(params)}"
+ end
+ end
+ end
end
diff --git a/app/models/concerns/providable.rb b/app/models/concerns/providable.rb
index 4a8de8c0..996efff8 100644
--- a/app/models/concerns/providable.rb
+++ b/app/models/concerns/providable.rb
@@ -23,10 +23,8 @@ module Providable
end
def synth_provider
- @synth_provider ||= begin
- api_key = self_hosted? ? Setting.synth_api_key : ENV["SYNTH_API_KEY"]
- api_key.present? ? Provider::Synth.new(api_key) : nil
- end
+ api_key = self_hosted? ? Setting.synth_api_key : ENV["SYNTH_API_KEY"]
+ api_key.present? ? Provider::Synth.new(api_key) : nil
end
private
diff --git a/app/views/account/entries/index.html.erb b/app/views/account/entries/index.html.erb
index c659d97f..31197675 100644
--- a/app/views/account/entries/index.html.erb
+++ b/app/views/account/entries/index.html.erb
@@ -84,7 +84,7 @@
</div>
<div class="p-4 bg-white rounded-bl-lg rounded-br-lg">
- <%= render "pagination", pagy: @pagy %>
+ <%= render "pagination", pagy: @pagy, current_path: account_path(@account, page: params[:page]) %>
</div>
</div>
<% end %>
diff --git a/app/views/accounts/show/_activity.html.erb b/app/views/accounts/show/_activity.html.erb
index c041b652..290c5be5 100644
--- a/app/views/accounts/show/_activity.html.erb
+++ b/app/views/accounts/show/_activity.html.erb
@@ -1,5 +1,5 @@
<%# locals: (account:) %>
-<%= turbo_frame_tag dom_id(account, :entries), src: account_entries_path(account_id: account.id) do %>
+<%= turbo_frame_tag dom_id(account, :entries), src: account_entries_path(account_id: account.id, page: params[:page]) do %>
<%= render "account/entries/loading" %>
<% end %>
diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb
index dee086be..f4548512 100644
--- a/app/views/application/_pagination.html.erb
+++ b/app/views/application/_pagination.html.erb
@@ -1,9 +1,11 @@
-<%# locals: (pagy:) %>
+<%# locals: (pagy:, current_path: nil) %>
<nav class="flex w-full items-center justify-between">
<div class="flex items-center gap-1">
<div>
<% if pagy.prev %>
- <%= link_to pagy_url_for(pagy, pagy.prev), class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
+ <%= link_to custom_pagy_url_for(pagy, pagy.prev, current_path: current_path),
+ class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700",
+ data: (current_path ? { turbo_frame: "_top" } : {}) do %>
<%= lucide_icon("chevron-left", class: "w-5 h-5 text-gray-500") %>
<% end %>
<% else %>
@@ -15,11 +17,15 @@
<div class="rounded-xl p-1 bg-gray-25">
<% pagy.series.each do |series_item| %>
<% if series_item.is_a?(Integer) %>
- <%= link_to pagy_url_for(pagy, series_item), class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
+ <%= link_to custom_pagy_url_for(pagy, series_item, current_path: current_path),
+ class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700",
+ data: (current_path ? { turbo_frame: "_top" } : {}) do %>
<%= series_item %>
<% end %>
<% elsif series_item.is_a?(String) %>
- <%= link_to pagy_url_for(pagy, series_item), class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-gray-900" do %>
+ <%= link_to custom_pagy_url_for(pagy, series_item, current_path: current_path),
+ class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-gray-900",
+ data: (current_path ? { turbo_frame: "_top" } : {}) do %>
<%= series_item %>
<% end %>
<% elsif series_item == :gap %>
@@ -29,7 +35,9 @@
</div>
<div>
<% if pagy.next %>
- <%= link_to pagy_url_for(pagy, pagy.next), class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
+ <%= link_to custom_pagy_url_for(pagy, pagy.next, current_path: current_path),
+ class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700",
+ data: (current_path ? { turbo_frame: "_top" } : {}) do %>
<%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
<% end %>
<% else %>
@@ -40,16 +48,16 @@
</div>
</div>
<div class="flex items-center gap-4">
- <%= form_with url: url_for,
+ <%= form_with url: custom_pagy_url_for(pagy, pagy.page, current_path: current_path),
method: :get,
class: "flex items-center gap-4",
data: { controller: "auto-submit-form" } do |f| %>
- <%= f.label :per_page, t(".rows_per_page"), class: "text-sm text-gray-500" %>
- <%= f.select :per_page,
+ <%= f.label :per_page, t(".rows_per_page"), class: "text-sm text-gray-500" %>
+ <%= f.select :per_page,
options_for_select(["10", "20", "30", "50"], pagy.limit),
{},
class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900",
data: { "auto-submit-form-target": "auto" } %>
- <% end %>
+ <% end %>
</div>
</nav>