spree_admin 5.0.0 → 5.0.2

data/app/views/spree/admin/pages/index.html.erb

@@ -5,22 +5,24 @@
   <%= link_to_with_icon 'plus', Spree.t(:add_new_page), spree.new_admin_page_path, class: "btn btn-primary" if can?(:create, Spree::Page.new) %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "spree/admin/pages/filters" %>
-  <% if @pages.any? %>
+  <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:updated) %></th>
+            <th><%= sort_link @search, :name, Spree.t(:name) %></th>
+            <th><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
+            <th><%= sort_link @search, :updated_at, Spree.t(:updated_at) %></th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
-          <%= render collection: @pages, partial: "spree/admin/pages/page", cached: spree_base_cache_scope %>
+          <%= render collection: @collection, partial: "spree/admin/pages/page", cached: spree_base_cache_scope %>
         </tbody>
       </table>
-      <%= render partial: "spree/admin/shared/index_table_options", locals: { collection: @pages } %>
+      <%= render "spree/admin/shared/index_table_options", collection: @collection %>
     </div>
   <% else %>
     <%= render 'spree/admin/shared/no_resource_found' %>

data/app/views/spree/admin/payment_methods/index.html.erb

@@ -2,15 +2,16 @@
   <%= Spree.t(:payment_methods) %>
 <% end %>
 
-<div class="table-responsive card-lg p-0 mb-4">
-  <table class="table" id='listing_shipping_methods'>
-    <thead class="text-muted">
+<div class="card-lg">
+  <div class="table-responsive">
+    <table class="table">
+      <thead class="text-muted">
       <tr>
         <th></th>
         <th><%= Spree.t(:payment_method) %></th>
         <th><%= Spree.t(:visibility) %></th>
         <th class="text-center"><%= Spree.t(:active) %></th>
-        <th class="actions"></th>
+        <th></th>
       </tr>
     </thead>
     <tbody data-controller="sortable" data-sortable-handle-value=".move-handle" data-sortable-resource-name-value="payment_method" data-sortable-response-kind-value="turbo-stream">
@@ -21,13 +22,14 @@
 
 <% if available_payment_methods.present? && can?(:create, Spree::PaymentMethod) %>
   <h5 class="pb-2 pt-3">Available Payment Methods</h5>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_shipping_methods'>
-      <thead class="text-muted">
+  <div class="card-lg">
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
         <tr>
           <th><%= Spree.t(:name) %></th>
           <th><%= Spree.t(:description) %></th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>

data/app/views/spree/admin/post_categories/_post_category.html.erb

@@ -1,6 +1,9 @@
 <tr data-controller="row-link" id="<%= dom_id(post_category) %>">
-  <td><%= link_to post_category.title, spree.edit_admin_post_category_path(post_category), class: 'd-flex', data: { row_link_target: :link } %></td>
-  <td class="actions cursor-pointer" data-action="click->row-link#openLink">
+  <td class="w-60 p-0">
+    <%= link_to post_category.title, spree.edit_admin_post_category_path(post_category), class: 'd-block w-100 h-100 px-3 py-2', data: { row_link_target: :link } %>
+  </td>
+  <td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= post_category.posts.count %></td>
+  <td class="w-10 cursor-pointer text-right" data-action="click->row-link#openLink">
     <%= link_to_edit(post_category, class: 'btn btn-light btn-sm') if can? :edit, post_category %>
   </td>
 </tr>

data/app/views/spree/admin/post_categories/index.html.erb

@@ -4,24 +4,23 @@
 
 <%= render 'spree/admin/shared/posts_tabs' %>
 
-<% if @post_categories.any? %>
-  <div class="card-lg p-0">
+<% if @collection.any? %>
+  <div class="card-lg">
     <div class="table-responsive rounded-lg">
       <table class="table">
         <thead class="text-muted">
           <tr>
-            <th class="w-90"><%= Spree.t(:title) %></th>
+            <th><%= Spree.t(:title) %></th>
+            <th><%= Spree.t(:posts) %></th>
             <th></th>
           </tr>
         </thead>
         <tbody>
-          <%= render partial: 'spree/admin/post_categories/post_category', collection: @post_categories, cached: spree_base_cache_scope %>
+          <%= render collection: @collection, partial: 'spree/admin/post_categories/post_category', cached: spree_base_cache_scope %>
         </tbody>
       </table>
     </div>
   </div>
 <% else %>
-  <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-    <%= Spree.t(:no_resource_found, resource: Spree.t(:post_categories)) %>
-  </div>
+  <%= render 'spree/admin/shared/no_resource_found' %>
 <% end %>

data/app/views/spree/admin/posts/_filters.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :search_by_title, label: Spree.t(:title) %>
 
@@ -20,18 +20,13 @@
         <div class="form-group">
           <%= f.label :post_category_id_eq, Spree.t(:category) %>
           <%= f.select :post_category_id_eq,
-                   options_for_select(Spree::PostCategory.all.pluck(:title, :id), params.dig(:q, :post_category_id_eq)),
+                   options_for_select(@post_categories.pluck(:title, :id), params.dig(:q, :post_category_id_eq)),
                    { include_blank: true },
-                   { class: "custom-select", data: { filters_target: :input } } %>
+                   { data: { filters_target: :input, controller: 'autocomplete-select' } } %>
         </div>
       </div>
     </div>
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
-    </div>
+    <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

data/app/views/spree/admin/posts/_form.html.erb

@@ -48,12 +48,12 @@
       <div class="card-body">
         <div class="form-group">
           <%= f.label :author_id, Spree.t(:author) %>
-          <%= f.select :author_id, options_for_select(post_authors_select_options, @post.author_id || try_spree_current_user.id), {}, { class: 'custom-select' } %>
+          <%= f.select :author_id, options_for_select(post_authors_select_options, @post.author_id || try_spree_current_user.id), {}, { data: { controller: 'autocomplete-select' } } %>
         </div>
 
         <div class="form-group">
           <%= f.label :post_category_id, Spree.t(:category) %>
-          <%= f.select :post_category_id, options_for_select(current_store.post_categories.pluck(:title, :id), @post.post_category_id), { include_blank: true }, { class: 'custom-select' } %>
+          <%= f.select :post_category_id, options_for_select(@post_categories.pluck(:title, :id), @post.post_category_id), { include_blank: true }, { data: { controller: 'autocomplete-select' } } %>
         </div>
 
         <div class="form-group">

data/app/views/spree/admin/posts/_post.html.erb

@@ -3,17 +3,7 @@
     <%= link_to spree.edit_admin_post_path(post), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark gap-3', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>
       <% if post.image.attached? && post.image.variable? %>
         <div class="admin-product-image-container">
-          <%= image_tag(
-                main_app.cdn_image_url(
-                  post.image.variant(
-                    spree_image_variant_options(resize_to_fill: [200, 130])
-                  )
-                ),
-                class: 'img-fluid',
-                loading: :lazy,
-                width: 100,
-                height: 65
-          ) %>
+          <%= spree_image_tag(post.image, width: 100, height: 65, class: 'img-fluid', loading: :lazy) %>
         </div>
       <% else %>
         <%= render 'spree/admin/shared/no_image', width: 100, height: 65 %>

data/app/views/spree/admin/posts/index.html.erb

@@ -6,31 +6,27 @@
 
 <%= render 'spree/admin/shared/posts_tabs' %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "spree/admin/posts/filters" %>
-
-  <% if @posts.any? %>
+  <% if @collection.any? %>
     <div class="table-responsive rounded-lg">
       <table class="table">
         <thead class="text-muted">
           <tr>
-            <th><%= Spree.t(:title) %></th>
+            <th><%= sort_link @search, :title, Spree.t(:title) %></th>
             <th><%= Spree.t(:category) %></th>
             <th><%= Spree.t(:author) %></th>
-            <th><%= Spree.t(:published_at) %></th>
+            <th><%= sort_link @search, :published_at, Spree.t(:published_at) %></th>
             <th></th>
           </tr>
         </thead>
         <tbody>
-          <%= render partial: "spree/admin/posts/post", collection: @posts, cached: spree_base_cache_scope %>
+          <%= render collection: @collection, partial: "spree/admin/posts/post", cached: spree_base_cache_scope %>
         </tbody>
       </table>
     </div>
-
-    <%= render partial: "spree/admin/shared/index_table_options", locals: { collection: @posts } %>
+    <%= render "spree/admin/shared/index_table_options", collection: @collection %>
   <% else %>
-    <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-      <%= Spree.t(:no_resource_found, resource: Spree.t(:posts)) %>
-    </div>
+    <%= render 'spree/admin/shared/no_resource_found' %>
   <% end %>
 </div>

data/app/views/spree/admin/products/_bulk_operations.html.erb

@@ -1,35 +1,22 @@
 <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
-  <div
-    class="
-      bulk-panel-container animate__animated animate__bounceInUp animate__faster
-    "
-  >
-    <div data-toggle="modal" data-target="#bulk-modal">
-      <% if can?(:activate, Spree::Product) %>
-        <a
-          href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :active) %>"
-          data-turbo-frame="bulk_modal"
-          class="btn btn-light mr-2 d-vendor"
-          data-action="click->bulk-operation#setBulkAction"
-          data-url="<%= spree.bulk_status_update_admin_products_path(status: :active) %>"
-        >
-          <%= icon("circle-check") %>
-          <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :active) %>
-        </a>
-      <% end %>
-      <a
-        href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :draft) %>"
-        data-turbo-frame="bulk_modal"
-        class="btn btn-light mr-2"
-        data-action="click->bulk-operation#setBulkAction"
-        data-url="<%= spree.bulk_status_update_admin_products_path(status: :draft) %>"
-      >
-        <%= icon("circle-dotted") %>
-        <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :draft) %>
-      </a>
-    </div>
+  <div class="bulk-panel-container">
+    <% if can?(:activate, Spree::Product) %>
+      <%= bulk_action_link(
+        Spree.t("admin.bulk_ops.products.title.set_status", status: :active),
+        spree.bulk_modal_admin_products_path(kind: :set_status, status: :active),
+        icon: "circle-check",
+        url: spree.bulk_status_update_admin_products_path(status: :active)
+      ) %>
+    <% end %>
+
+    <%= bulk_action_link(
+      Spree.t("admin.bulk_ops.products.title.set_status", status: :draft),
+      spree.bulk_modal_admin_products_path(kind: :set_status, status: :draft),
+      icon: "circle-dotted",
+      url: spree.bulk_status_update_admin_products_path(status: :draft)
+    ) %>
 
-    <div class="dropdown dropup mr-3 ml-1" role="group">
+    <div class="dropdown dropup" role="group">
       <button
         type="button"
         data-display="static"
@@ -43,80 +30,58 @@
       <div
         class="dropdown-menu dropdown-menu-left"
         aria-labelledby="btnGroupDrop1"
-        data-toggle="modal"
-        data-target="#bulk-modal"
       >
-        <a
-          href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived) %>"
-          data-turbo-frame="bulk_modal"
-          class="dropdown-item"
-          data-action="click->bulk-operation#setBulkAction"
-          data-url="<%= spree.bulk_status_update_admin_products_path(status: :archived) %>"
-        >
-          <%= icon("archive") %>
-          <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :archived) %>
-        </a>
+        <%= bulk_action_link(
+          Spree.t("admin.bulk_ops.products.title.set_status", status: :archived),
+          spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived),
+          icon: "archive",
+          url: spree.bulk_status_update_admin_products_path(status: :archived),
+          class: "dropdown-item"
+        ) %>
+
         <% if can?(:manage, Spree::Classification) %>
           <div class="dropdown-divider"></div>
-          <a
-            href="<%= spree.bulk_modal_admin_products_path(kind: :add_to_taxons) %>"
-            data-turbo-frame="bulk_modal"
-            class="dropdown-item"
-            data-action="click->bulk-operation#setBulkAction"
-            data-url="<%= spree.bulk_add_to_taxons_admin_products_path %>"
-          >
-            <%= icon("category-plus") %>
-            <%= Spree.t("admin.bulk_ops.products.title.add_to_taxons") %>
-          </a>
-          <a
-            href="<%= spree.bulk_modal_admin_products_path(kind: :remove_from_taxons) %>"
-            data-turbo-frame="bulk_modal"
-            class="dropdown-item"
-            data-action="click->bulk-operation#setBulkAction"
-            data-url="<%= spree.bulk_remove_from_taxons_admin_products_path %>"
-          >
-            <%= icon("category-minus") %>
-            <%= Spree.t("admin.bulk_ops.products.title.remove_from_taxons") %>
-          </a>
+
+          <%= bulk_action_link(
+            Spree.t("admin.bulk_ops.products.title.add_to_taxons"),
+            spree.bulk_modal_admin_products_path(kind: :add_to_taxons),
+            icon: "category-plus",
+            url: spree.bulk_add_to_taxons_admin_products_path,
+            class: "dropdown-item"
+          ) %>
+
+          <%= bulk_action_link(
+            Spree.t("admin.bulk_ops.products.title.remove_from_taxons"),
+            spree.bulk_modal_admin_products_path(kind: :remove_from_taxons),
+            icon: "category-minus",
+            url: spree.bulk_remove_from_taxons_admin_products_path,
+            class: "dropdown-item"
+          ) %>
         <% end %>
 
         <% if can?(:manage_tags, Spree::Product) %>
           <div class="dropdown-divider"></div>
-          <a
-            href="<%= spree.bulk_modal_admin_products_path(kind: :add_tags) %>"
-            data-turbo-frame="bulk_modal"
-            class="dropdown-item"
-            data-action="click->bulk-operation#setBulkAction"
-            data-url="<%= spree.bulk_add_tags_admin_products_path %>"
-          >
-            <%= icon("tag-plus") %>
-            <%= Spree.t("admin.bulk_ops.products.title.add_tags") %>
-          </a>
-          <a
-            href="<%= spree.bulk_modal_admin_products_path(kind: :remove_tags) %>"
-            data-turbo-frame="bulk_modal"
-            class="dropdown-item"
-            data-action="click->bulk-operation#setBulkAction"
-            data-url="<%= spree.bulk_remove_tags_admin_products_path %>"
-          >
-            <%= icon("tag-minus") %>
-            <%= Spree.t("admin.bulk_ops.products.title.remove_tags") %>
-          </a>
+
+          <%= bulk_action_link(
+            Spree.t("admin.bulk_ops.products.title.add_tags"),
+            spree.bulk_modal_admin_products_path(kind: :add_tags),
+            icon: "tag-plus",
+            url: spree.bulk_add_tags_admin_products_path,
+            class: "dropdown-item"
+          ) %>
+
+          <%= bulk_action_link(
+            Spree.t("admin.bulk_ops.products.title.remove_tags"),
+            spree.bulk_modal_admin_products_path(kind: :remove_tags),
+            icon: "tag-minus",
+            url: spree.bulk_remove_tags_admin_products_path,
+            class: "dropdown-item"
+          ) %>
         <% end %>
       </div>
     </div>
 
-    <span>
-      <strong data-bulk-operation-target="counter"></strong>
-      <%= Spree.t("admin.products.selected") %>
-    </span>
-
-    <button
-      type="button"
-      class="btn-close ml-2"
-      data-dismiss="modal"
-      aria-label="<%= Spree.t(:close) %>"
-      data-action="bulk-operation#cancel"
-    />
+    <%= bulk_operations_counter %>
+    <%= bulk_operations_close_button %>
   </div>
 </div>

data/app/views/spree/admin/products/_filters.html.erb

@@ -1,4 +1,14 @@
-<%= search_form_for product_list_filters_search_form_path, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<% frame_name ||= nil %>
+
+<%= search_form_for product_list_filters_search_form_path,
+  class: "filter-wrap",
+  data: {
+    controller: "filters reveal",
+    reveal_hidden_class: "d-none",
+    filters_url_value: request.url
+  } do |f| %>
+  <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
 
@@ -46,12 +56,7 @@
       <%= render_admin_partials(:products_filters_partials, f: f) %>
     </div>
 
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
-    </div>
+    <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

data/app/views/spree/admin/products/_list.html.erb

@@ -9,15 +9,7 @@
             <thead class="text-muted">
               <tr>
                 <th scope="col" class="pr-0 w-5">
-                  <div class="custom-control custom-checkbox ml-1">
-                    <input
-                      type="checkbox"
-                      class="custom-control-input"
-                      id="checkAllMasterCheckbox"
-                      data-bulk-operation-target="checkboxAll"
-                    >
-                    <label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label>
-                  </div>
+                  <%= bulk_operations_select_all_checkbox %>
                 </th>
                 <th scope="col">
                   <%= sort_link @search,
@@ -46,5 +38,5 @@
     </div>
     <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
   <% else %>
-    <%= render partial: 'spree/admin/products/empty_list' %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
   <% end %>

data/app/views/spree/admin/products/_product.html.erb

@@ -1,9 +1,6 @@
 <tr id="<%= dom_id product %>" data-controller="row-link">
   <td class="pr-0 w-5">
-    <div class="custom-control custom-checkbox ml-1">
-      <%= check_box_tag "ids[]", product.id, false, class: "custom-control-input", id: "ids_#{product.id}", data: { bulk_operation_target: "checkbox" } %>
-      <label class="custom-control-label" for="ids_<%= product.id %>"><span></span></label>
-    </div>
+    <%= bulk_operations_checkbox(product) %>
   </td>
   <td scope="row" class="w-40 py-0 text-wrap" data-action="click->row-link#openLink">
     <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center w-100 text-decoration-none h-100 py-2', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>

data/app/views/spree/admin/products/bulk_modal.html.erb

@@ -1,11 +1,6 @@
 <%= turbo_frame_tag :bulk_modal do %>
   <div class="modal-content">
-    <div class="modal-header">
-      <h5 class="modal-title" id="exampleModalLabel">
-        <%= @title %>
-      </h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+    <%= modal_header(@title) %>
     <div class="modal-body">
       <p><%= @body %></p>
 
@@ -15,8 +10,8 @@
         <%= tom_select_tag 'tags', multiple: true, class: 'w-100', options: tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %>
       <% end %>
     </div>
-    <div class="modal-footer d-flex justify-content-between">
-      <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+    <div class="modal-footer">
+      <%= modal_discard_button %>
       <%= turbo_save_button_tag %>
     </div>
   </div>

data/app/views/spree/admin/products/index.html.erb

@@ -1,9 +1,9 @@
 <%= render 'index_header' %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <% if params[:frame_name].present? %>
     <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth } do %>
-      <%= render 'filters' %>
+      <%= render 'filters', frame_name: params[:frame_name] %>
       <%= render 'list' %>
     <% end %>
   <% else %>
@@ -12,7 +12,7 @@
   <% end %>
 </div>
 
-<p class="text-muted small text-center py-2 px-3 mt-4 rounded-pill mx-auto d-flex-inline">
-  Learn more about 
-  <%= external_link_to 'managing products', 'https://spreecommerce.org/docs/user/manage-products', class: 'text-decoration-none' %>
+<p class="documentation-link-container">
+  Learn more about
+  <%= external_link_to 'managing products', 'https://spreecommerce.org/docs/user/manage-products' %>
 </p>

data/app/views/spree/admin/promotion_actions/new.html.erb

@@ -1,16 +1,11 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_with model: @promotion_action, url: spree.admin_promotion_actions_path(@promotion), method: :post, scope: :promotion_action do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">
-          <% if @promotion_action.type.nil? %>
-            <%= Spree.t(:add_action_of_type) %>
-          <% else %>
-            <%= @promotion_action.human_name %>
-          <% end %>
-        </h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-      </div>
+      <% if @promotion_action.type.nil? %>
+        <%= modal_header(Spree.t(:add_action_of_type)) %>
+      <% else %>
+        <%= modal_header(@promotion_action.human_name) %>
+      <% end %>
       <div class="modal-body">
         <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %>
         <% if @promotion_action.type.nil? %>
@@ -38,8 +33,8 @@
         <% end %>
       </div>
       <% if @promotion_action.type.present? %>
-        <div class="modal-footer d-flex justify-content-between">
-          <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+        <div class="modal-footer">
+          <%= modal_discard_button %>
           <%= turbo_save_button_tag Spree.t('actions.create'), data: { turbo_frame: '_top' } %>
         </div>
       <% end %>

data/app/views/spree/admin/promotion_rules/new.html.erb

@@ -1,16 +1,11 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_with model: @promotion_rule, url: spree.admin_promotion_rules_path(@promotion), method: :post, scope: :promotion_rule do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">
-          <% if @promotion_rule.type.nil? %>
-            <%= Spree.t(:add_rule_of_type) %>
-          <% else %>
-            <%= @promotion_rule.human_name %>
-          <% end %>
-        </h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-      </div>
+      <% if @promotion_rule.type.nil? %>
+        <%= modal_header(Spree.t(:add_rule_of_type)) %>
+      <% else %>
+        <%= modal_header(@promotion_rule.human_name) %>
+      <% end %>
       <div class="modal-body">
         <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %>
         <% if @promotion_rule.type.nil? %>
@@ -38,8 +33,8 @@
         <% end %>
       </div>
       <% if @promotion_rule.type.present? %>
-        <div class="modal-footer d-flex justify-content-between">
-          <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+        <div class="modal-footer">
+          <%= modal_discard_button %>
           <%= turbo_save_button_tag Spree.t('actions.create'), data: { turbo_frame: '_top' } %>
         </div>
       <% end %>

data/app/views/spree/admin/promotions/_filters.html.erb

@@ -0,0 +1,27 @@
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+  <div class="d-flex flex-column flex-lg-row gap-2">
+    <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
+
+    <div class="d-flex align-items-center justify-content-between">
+      <%= render "spree/admin/promotions/table_filter_dropdown" %>
+
+      <%= render 'spree/admin/shared/filters_button' %>
+    </div>
+  </div>
+  <div data-reveal-target="item" class="d-none" id="table-filter">
+    <div class="row">
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
+          <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
+        </div>
+      </div>
+    </div>
+
+    <%= render 'spree/admin/shared/filter_submit' %>
+  </div>
+
+  <%= render "spree/admin/shared/filter_badge_template" %>
+
+  <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+<% end %>