diff --git a/app/views/admin/products_v3/_content.html.haml b/app/views/admin/products_v3/_content.html.haml index 885d851ef4..dcb29e945f 100644 --- a/app/views/admin/products_v3/_content.html.haml +++ b/app/views/admin/products_v3/_content.html.haml @@ -1,4 +1,4 @@ -%turbo-frame#products-content{ refresh: "morph" } +%turbo-frame#products-content{ target: "_top", refresh: "morph" } .spinner-overlay{ "data-controller": "loading", "data-products-target": "loading", class: "hidden" } .spinner-container .spinner diff --git a/app/views/admin/products_v3/_filters.html.haml b/app/views/admin/products_v3/_filters.html.haml index 469ec1bf57..2a0aa55428 100644 --- a/app/views/admin/products_v3/_filters.html.haml +++ b/app/views/admin/products_v3/_filters.html.haml @@ -1,4 +1,4 @@ -= form_with url: admin_products_path, id: "filters", method: :get, data: { "search-target": "form" } do += form_with url: admin_products_path, id: "filters", method: :get, data: { "search-target": "form", 'turbo-frame': "_self" } do = hidden_field_tag :page, nil, class: "page" = hidden_field_tag :per_page, nil, class: "per-page" diff --git a/app/views/admin/products_v3/_sort.html.haml b/app/views/admin/products_v3/_sort.html.haml index 8bd5b249bc..f53eec4e76 100644 --- a/app/views/admin/products_v3/_sort.html.haml +++ b/app/views/admin/products_v3/_sort.html.haml @@ -4,7 +4,7 @@ = t(".pagination.total_html", total: pagy.count, from: pagy.from, to: pagy.to) - if search_term.present? || producer_id.present? || category_id.present? - %a{ href: url_for(page: 1), class: "button disruptive" } + %a{ href: url_for(page: 1), class: "button disruptive", 'data-turbo-frame': "_self" } = t(".pagination.clear_search") %form.with-dropdown diff --git a/app/views/admin/products_v3/_table.html.haml b/app/views/admin/products_v3/_table.html.haml index e14925b539..1dd4e2f259 100644 --- a/app/views/admin/products_v3/_table.html.haml +++ b/app/views/admin/products_v3/_table.html.haml @@ -1,6 +1,7 @@ = form_with url: bulk_update_admin_products_path, method: :post, id: "products-form", builder: BulkFormBuilder, - html: { data: { controller: "bulk-form", + html: { data: { 'turbo-frame': "_self", + controller: "bulk-form", 'bulk-form-disable-selector-value': "#sort,#filters", 'bulk-form-error-value': defined?(@error_counts), } } do |form|