chore: Removed from turbo response as does not need to be there

phac-nml · Jan 23, 2024 · 6e569a6 · 6e569a6
1 parent 1a20b43
commit 6e569a6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -54,7 +54,7 @@
         </div>
       <% 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) %>
     </div>
   </div>
   <%= 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
@@ -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] %>