From 6e569a60ec138437029a2a343dbf9e126ce7faae Mon Sep 17 00:00:00 2001 From: Josh Adam Date: Tue, 23 Jan 2024 11:35:24 -0600 Subject: [PATCH] chore: Removed from turbo response as does not need to be there --- app/controllers/projects/samples_controller.rb | 5 ++--- app/views/projects/samples/index.html.erb | 2 +- app/views/projects/samples/index.turbo_stream.erb | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/controllers/projects/samples_controller.rb b/app/controllers/projects/samples_controller.rb index c3ee427df9..c7a7970607 100644 --- a/app/controllers/projects/samples_controller.rb +++ b/app/controllers/projects/samples_controller.rb @@ -16,13 +16,12 @@ def index @q = load_samples.ransack(params[:q]) set_default_sort + @pagy, @samples = pagy(@q.result) respond_to do |format| format.html do @has_samples = @q.result.count.positive? end - format.turbo_stream do - @pagy, @samples = pagy(@q.result) - end + format.turbo_stream end end diff --git a/app/views/projects/samples/index.html.erb b/app/views/projects/samples/index.html.erb index b97f3b611a..837eb0b333 100644 --- a/app/views/projects/samples/index.html.erb +++ b/app/views/projects/samples/index.html.erb @@ -54,7 +54,7 @@ <% end %> <%= turbo_frame_tag "project_samples_sort_dropdown" %> - <%= turbo_frame_tag "metadata_fields_toggle" %> + <%= render MetadataFieldsToggleComponent.new(pagy_url_for(@pagy, @pagy.page).gsub(".turbo_stream", ""), params[:metadata].to_i == 1) %> <%= turbo_frame_tag "project_samples_list", diff --git a/app/views/projects/samples/index.turbo_stream.erb b/app/views/projects/samples/index.turbo_stream.erb index 7a1c31ddb4..837e5514ca 100644 --- a/app/views/projects/samples/index.turbo_stream.erb +++ b/app/views/projects/samples/index.turbo_stream.erb @@ -12,10 +12,6 @@ pagy: @pagy } %> -<%= turbo_stream.update "metadata_fields_toggle" do %> - <%= render MetadataFieldsToggleComponent.new(pagy_url_for(@pagy, @pagy.page).gsub(".turbo_stream", ""), params[:metadata].to_i == 1) %> -<% end %> - <%= turbo_stream.update "project_samples_hidden_values" do %> <%= render Ransack::HiddenSortFieldComponent.new(@q) %> <%= hidden_field_tag "template", params[:template] %>