spree_admin 5.1.7 → 5.2.0.rc1

data/app/views/spree/admin/pages/{_filters.html.erb → filters.html.erb}

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], url: spree.admin_pages_path , class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], url: spree.admin_pages_path , class: "filter-wrap", data: {controller: "filters"} do |f| %>
   <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -8,27 +8,4 @@
 
 <%= render_admin_partials(:pages_header_partials) %>
 
-<div class="card-lg">
-  <%= render "spree/admin/pages/filters" %>
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr>
-            <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>
-          <% default_theme = current_store.default_theme %>
-          <%= render collection: @collection, partial: "spree/admin/pages/page", cached: ->(page) { [*spree_base_cache_scope.call(page), default_theme] } %>
-        </tbody>
-      </table>
-      <%= render "spree/admin/shared/index_table_options", collection: @collection %>
-    </div>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found' %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -1,17 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_pages_path %>
-  <%= Spree.t(:new_page) %>
-<% end %>
-<% content_for :title do %>
-  <%= Spree.t(:new_page) %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_with model: @page, url: spree.admin_pages_path, data: { controller: 'slug-form seo-form' }, scope: :page do |f| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @page } %>
-      <%= render 'form', f: f, vertical: false %>
-      <%= render 'spree/admin/shared/new_resource_links', f: f %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/new_resource', data: { controller: 'slug-form seo-form' } %>

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

@@ -15,7 +15,7 @@
   </td>
   <td class="actions w-30">
     <div class="d-flex justify-content-end">
-      <%= link_to_with_icon 'plus', Spree.t(:add), spree.new_admin_payment_method_path(payment_method: { type: payment_method.type }), class: 'btn btn-light btn-sm', data: { row_link_target: :link } %>
+      <%= link_to_with_icon 'plus', Spree.t(:add), spree.new_admin_payment_method_path(payment_method: { type: payment_method.type }), class: 'btn btn-light btn-sm', data: { row_link_target: :link, turbo_frame: '_top' } %>
     </div>
   </td>
 </tr>

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

@@ -22,15 +22,7 @@
     <h5 class="card-title"><%= Spree.t(:display_settings) %></h5>
   </div>
   <div class="card-body">
-    <div class="form-group">
-      <%= label_tag :payment_method_name, Spree.t(:name) %>
-      <%= text_field :payment_method, :name, class: 'form-control' %>
-      <span class="text-muted form-text mt-2">
-        This name will be used to identify the payment method on the storefront
-      </span>
-
-      <%= error_message_on :payment_method, :name %>
-    </div>
+    <%= f.spree_text_field :name, help: 'This name will be used to identify the payment method on the storefront' %>
 
     <% if can?(:manage, Spree::Store) && available_stores.count > 1 %>
       <div class="form-group">
@@ -44,21 +36,9 @@
       </div>
     <% end %>
 
-    <div class="form-group">
-      <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-      <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>
-    </div>
-    <div class="form-group">
-      <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-      <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], {}, {class: 'custom-select'}) %>
-    </div>
+    <%= f.spree_select :display_on, display_on_options, { label: Spree.t(:display) } %>
+    <%= f.spree_select :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], { label: Spree.t(:auto_capture) } %>
 
-    <div class="form-group">
-      <label><%= Spree.t(:active) %></label>
-      <div class="custom-control custom-switch">
-        <%= f.check_box :active, class: 'custom-control-input' %>
-        <%= f.label :active, '&nbsp;'.html_safe, class: 'custom-control-label' %>
-      </div>
-    </div>
+    <%= f.spree_check_box :active %>
   </div>
 </div>

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

@@ -6,7 +6,10 @@
     <div class="d-flex align-items-center">
       <div class="bg-light rounded" style="width: 95px; height: 60px;">
         <% if payment_method_icon_tag(payment_method.payment_icon_name).present? %>
-          <%= payment_method_icon_tag(payment_method.payment_icon_name, height: 60, class: 'with-tip', title: payment_method.name) %>
+          <span data-controller="tooltip">
+            <%= payment_method_icon_tag(payment_method.payment_icon_name, height: 60, width: 95, title: payment_method.name) %>
+            <%= tooltip(payment_method.name) %>
+          </span>
         <% end %>
       </div>
 
@@ -33,6 +36,6 @@
     <% end %>
   </td>
   <td class="actions w-5">
-    <%= link_to_edit(payment_method, data: { row_link_target: :link }) %>
+    <%= link_to_edit(payment_method, data: { row_link_target: :link, turbo_frame: '_top' }) %>
   </td>
 </tr>

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

@@ -9,22 +9,20 @@
 <%= render_admin_partials(:payment_methods_header_partials) %>
 
 <div class="card-lg">
-  <div class="table-responsive">
-    <table class="table">
-      <thead>
-        <tr>
-          <th></th>
-          <th><%= Spree.t(:payment_method) %></th>
-          <th><%= Spree.t(:visibility) %></th>
-          <th class="text-center"><%= Spree.t(:active) %></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">
-        <%= render partial: 'spree/admin/payment_methods/payment_method', collection: @payment_methods %>
-      </tbody>
-    </table>
-  </div>
+  <table class="table">
+    <thead>
+      <tr>
+        <th scope="col"></th>
+        <th scope="col"><%= Spree.t(:payment_method) %></th>
+        <th scope="col"><%= Spree.t(:visibility) %></th>
+        <th class="text-center"><%= Spree.t(:active) %></th>
+        <th scope="col"></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">
+      <%= render partial: 'spree/admin/payment_methods/payment_method', collection: @payment_methods %>
+    </tbody>
+  </table>
 </div>
 
 <% if available_payment_methods.present? && can?(:create, Spree::PaymentMethod) %>
@@ -34,9 +32,9 @@
       <table class="table">
         <thead>
         <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:description) %></th>
-          <th></th>
+          <th scope="col"><%= Spree.t(:name) %></th>
+          <th scope="col"><%= Spree.t(:description) %></th>
+          <th scope="col"></th>
         </tr>
       </thead>
       <tbody>

data/app/views/spree/admin/payments/_payment.html.erb

@@ -10,17 +10,17 @@
       <% end %>
       <%= Spree.t('payment_states.' + payment.state) %>
     </span>
-    <% if payment.payment_method.payment_icon_name.present? %>
+    <% if payment.payment_method.present? && payment.payment_method.payment_icon_name.present? %>
       <%= payment_method_icon_tag(payment.payment_method.payment_icon_name) %>
     <% end %>
     <strong><%= payment.number.upcase %></strong>
-    <%= local_time(payment.created_at, class: 'ml-auto text-muted font-size-sm') %>
+    <%= spree_time(payment.created_at, class: 'ml-auto text-muted font-size-sm') %>
 
-    <div class="dropdown">
-      <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false">
+    <%= dropdown do %>
+      <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
         <%= icon('dots-vertical', class: 'mr-0') %>
-      </button>
-      <div class="dropdown-menu">
+      <% end %>
+      <%= dropdown_menu do %>
         <% if payment.try(:gateway_dashboard_payment_url).present? %>
           <%= link_to_with_icon 'eye', Spree.t(:details), payment.gateway_dashboard_payment_url, class: 'dropdown-item', target: '_blank' %>
         <% end %>
@@ -28,13 +28,13 @@
           <%= link_to_with_icon 'eye', Spree.t(:details), spree.admin_gift_card_path(payment.source.originator), class: 'dropdown-item' %>
         <% end %>
 
-        <% if can?(:update, payment) && (payment.checkout? || payment.pending?) %>
+        <% if can?(:update, payment) && (payment.checkout? || payment.pending?) && payment.payment_method.present? %>
           <%= link_to_with_icon 'check', Spree.t(:capture), spree.capture_admin_order_payment_path(@order, payment), class: 'dropdown-item', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>
         <% end %>
-        <% if can?(:refund, @order) && payment.completed? && payment.can_credit? %>
+        <% if can?(:refund, @order) && payment.completed? && payment.can_credit? && payment.payment_method.present? %>
           <%= link_to_with_icon 'credit-card-refund', Spree.t(:refund), spree.new_admin_order_payment_refund_path(@order, payment), class: 'dropdown-item' %>
         <% end %>
-        <% if can?(:cancel, payment) && payment.pending? %>
+        <% if can?(:cancel, payment) && payment.pending? && payment.payment_method.present? %>
           <div class="dropdown-divider"></div>
           <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>
         <% end %>
@@ -42,8 +42,8 @@
           <div class="dropdown-divider"></div>
           <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %>
         <% end %>
-      </div>
-    </div>
+      <% end %>
+    <% end %>
   </div>
   <div class="card-body">
     <div class="d-flex">
@@ -52,7 +52,7 @@
         <strong><%= payment.display_amount %></strong>
 
         <p class="mb-1 mt-2"><%= Spree.t(:payment_method) %>:</p>
-        <strong><%= link_to payment.payment_method.name, spree.admin_payment_method_path(payment.payment_method) %></strong>
+        <strong><%= payment_method_name(payment) %></strong>
 
         <% if payment.transaction_id.present? %>
           <p class="mb-1 mt-2">
@@ -65,7 +65,7 @@
       <% if payment.source.present? %>
         <div class="w-50">
           <p class="mb-2"><%= Spree.t(:payment_source) %>:</p>
-          <div class="rounded-lg bg-gray-25 border shadow-xs p-3">
+          <div class="rounded-lg bg-light border shadow-xs p-3">
             <%= render 'spree/shared/payment', payment: payment %>
           </div>
         </div>
@@ -73,7 +73,7 @@
     </div>
   </div>
   <% if payment.transaction_id.present? && !payment.store_credit? %>
-    <div class="card-footer border-top border-top-dashed">
+    <div class="card-footer border-top border-top-dashed" data-controller="reveal">
       <p class="mb-0 d-flex justify-content-between align-items-center">
         <span>
           <%= Spree.t(:risk_analysis) %>
@@ -84,10 +84,10 @@
             <span class="text-success"><%= icon('shield-check-filled') %> <%= Spree.t(:not_risky) %></span>
           <% end %>
         </span>
-        <%= link_to "#risk-analysis-#{payment.id}", class: 'btn btn-light btn-sm bg-transparent', data: { toggle: 'collapse' } do %>
+        <button type="button" class="btn btn-light btn-sm bg-transparent" data-action="click->reveal#toggle">
           <%= Spree.t(:show_details) %>
           <%= icon('selector', class: 'mr-0 ml-1') %>
-        <% end %>
+        </button>
       </p>
       <%= render 'spree/admin/orders/risk_analysis', payment: payment %>
     </div>

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -6,15 +6,15 @@
         <td><%= payment.source.name %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:card_type) %>:</th>
+        <th scope="col"><%= Spree.t(:card_type) %>:</th>
         <td><%= payment.source.display_brand %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:card_number) %>:</th>
+        <th scope="col"><%= Spree.t(:card_number) %>:</th>
         <td><%= payment.source.display_number %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:expiration) %>:</th>
+        <th scope="col"><%= Spree.t(:expiration) %>:</th>
         <td><%= payment.source.month %>/<%= payment.source.year %></td>
       </tr>
     </table>

data/app/views/spree/admin/payments/source_views/_storecredit.html.erb

@@ -1,4 +1,4 @@
-<fieldset data-hook="store_credit">
+<fieldset>
   <legend><%= Spree.t(:store_credits) %></legend>
   <div class="table-responsive border rounded bg-white">
     <table class="table table-condensed border rounded">
@@ -7,24 +7,24 @@
         <td><%= payment.source.display_amount_used %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:amount) %>:</th>
+        <th scope="col"><%= Spree.t(:amount) %>:</th>
         <td><%= payment.source.display_amount %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:memo) %>:</th>
+        <th scope="col"><%= Spree.t(:memo) %>:</th>
         <td><%= payment.source.memo %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:type) %>:</th>
+        <th scope="col"><%= Spree.t(:type) %>:</th>
         <td><%= payment.source.category_name %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:created_by) %>:</th>
+        <th scope="col"><%= Spree.t(:created_by) %>:</th>
         <td><%= payment.source.created_by_email %></td>
       </tr>
       <tr>
-        <th><%= Spree.t(:issued_on) %>:</th>
-        <td><%= local_time(payment.source.created_at) %></td>
+        <th scope="col"><%= Spree.t(:issued_on) %>:</th>
+        <td><%= spree_time(payment.source.created_at) %></td>
       </tr>
     </table>
   </div>

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

@@ -0,0 +1,8 @@
+<%= search_form_for [:admin, search_collection], class: "filter-wrap", data: { controller: "filters" } do |f| %>
+  <div class="d-flex flex-column flex-lg-row gap-2">
+    <%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %>
+  </div>
+
+  <%= render "spree/admin/shared/filter_badge_template" %>
+  <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+<% end %>

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

@@ -0,0 +1,7 @@
+<div class="card mb-4">
+  <div class="card-body" data-controller="slug-form">
+    <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, data: { slug_form_target: 'name', action: 'slug-form#updateUrlFromName' } %>
+    <%= f.spree_text_field :slug, required: true, data: { slug_form_target: 'url' } %>
+    <%= f.spree_rich_text_area :body %>
+  </div>
+</div>

data/app/views/spree/admin/policies/_table_header.html.erb

@@ -0,0 +1,8 @@
+<tr>
+  <th scope="col"><%= Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:slug) %></th>
+  <th scope="col"><%= Spree.t(:filled) %></th>
+  <th scope="col"><%= Spree.t(:updated_at) %></th>
+  <th scope="col"><%= I18n.t('activerecord.attributes.spree/policy.owner') %></th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/policies/_table_row.html.erb

@@ -0,0 +1,20 @@
+<tr id="<%= spree_dom_id policy %>" data-controller="row-link">
+  <td class="w-30 cursor-pointer" data-action="click->row-link#openLink">
+    <%= link_to policy.name, spree.edit_admin_policy_path(policy.id), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %>
+  </td>
+  <td class="w-25 cursor-pointer" data-action="click->row-link#openLink">
+    <code><%= policy.slug %></code>
+  </td>
+  <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
+    <%= active_badge(policy.with_body?) %>
+  </td>
+  <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
+    <%= spree_time(policy.updated_at) %>
+  </td>
+  <td class="w-15 cursor-pointer" data-action="click->row-link#openLink">
+    <%= policy.owner.name %>
+  </td>
+  <td class="w-10 actions">
+    <%= link_to_edit(policy, url: spree.edit_admin_policy_path(policy.id), class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can?(:edit, policy) %>
+  </td>
+</tr>

data/app/views/spree/admin/policies/edit.html.erb

@@ -0,0 +1,2 @@
+
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -0,0 +1,9 @@
+<%= content_for :page_title do %>
+  <%= Spree.t(:policies) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_policy), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::Policy) %>
+<% end %>
+
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/new_resource' %>

data/app/views/spree/admin/policies/update.turbo_stream.erb

@@ -0,0 +1 @@
+<%= turbo_render_alerts %>

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

@@ -1,15 +1,6 @@
 <div class="card mb-4">
   <div class="card-body">
-    <div class="form-group">
-      <%= f.label :title, Spree.t(:title) %>
-      <%= f.text_field :title, class: "form-control", required: true, autofocus: f.object.new_record? %>
-    </div>
-
-    <div class="form-group">
-      <%= f.label :description, Spree.t(:description) %>
-      <div class="trix-container">
-        <%= f.rich_text_area :description %>
-      </div>
-    </div>
+    <%= f.spree_text_field :title, required: true, autofocus: f.object.new_record? %>
+    <%= f.spree_rich_text_area :description %>
   </div>
 </div>

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

@@ -0,0 +1,5 @@
+<tr>
+  <th scope="col"><%= Spree.t(:title) %></th>
+  <th scope="col"><%= Spree.t(:posts) %></th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/post_categories/{_post_category.html.erb → _table_row.html.erb}

@@ -1,9 +1,9 @@
 <tr data-controller="row-link" id="<%= dom_id(post_category) %>">
   <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 } %>
+    <%= 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, turbo_frame: '_top' } %>
   </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 %>
+    <%= link_to_edit(post_category, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can? :edit, post_category %>
   </td>
-</tr>
+</tr>

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_post_categories_path, @post_category %>
-  <%= @post_category.title %>
-<% end %>
-
-<%= form_for [:admin, @post_category] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post_category } %>
-      <%= render 'form', f: f %>
-      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -7,23 +7,4 @@
 
 <%= render_admin_partials(:post_categories_header_partials) %>
 
-<% if @collection.any? %>
-  <div class="card-lg">
-    <div class="table-responsive rounded-lg">
-      <table class="table">
-        <thead>
-          <tr>
-            <th><%= Spree.t(:title) %></th>
-            <th><%= Spree.t(:posts) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= render collection: @collection, partial: 'spree/admin/post_categories/post_category', cached: spree_base_cache_scope %>
-        </tbody>
-      </table>
-    </div>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_post_categories_path, @post_category %>
-  <%= Spree.t(:new_post_category) %>
-<% end %>
-
-<%= form_for [:admin, @post_category] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post_category } %>
-      <%= render 'form', f: f %>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -2,34 +2,24 @@
   <div class="col-lg-8">
     <div class="card mb-4">
       <div class="card-body">
-        <div class="form-group">
-          <%= f.label :title, Spree.t(:title) %>
-          <%= f.text_field :title,
-                class: "form-control",
-                required: true,
-                autofocus: true,
-                data: {
-                  seo_form_target: 'sourceTitleInput',
-                  slug_form_target: 'name',
-                  action: 'slug-form#updateUrlFromName'
-                } %>
-        </div>
-
-        <div class="form-group">
-          <%= f.label :content, Spree.t(:content) %>
-          <div class="trix-container mb-0">
-            <%= f.rich_text_area :content, class: 'overflow-auto', style: 'height: 300px', data: { seo_form_target: 'sourceDescriptionInput' } %>
-          </div>
-        </div>
-
-        <div class="form-group mb-0">
-          <%= f.label :excerpt, Spree.t(:excerpt) %>
-          <%= help_bubble('Add a summary of the post') %>
-
-          <div class="trix-container mb-0">
-            <%= f.rich_text_area :excerpt, class: 'overflow-auto', style: 'height: 100px', data: { seo_form_target: 'sourceExcerptInput' } %>
-          </div>
-        </div>
+        <%= f.spree_text_field :title,
+              required: true,
+              autofocus: true,
+              data: {
+                seo_form_target: 'sourceTitleInput',
+                slug_form_target: 'name',
+                action: 'slug-form#updateUrlFromName'
+              } %>
+
+        <%= f.spree_rich_text_area :content,
+              help_bubble: 'Add a summary of the post',
+              style: 'height: 300px',
+              data: { seo_form_target: 'sourceDescriptionInput' } %>
+
+        <%= f.spree_rich_text_area :excerpt,
+              help_bubble: 'Add a summary of the post',
+              style: 'height: 100px',
+              data: { seo_form_target: 'sourceExcerptInput' } %>
       </div>
     </div>
   </div>
@@ -46,21 +36,9 @@
 
     <div class="card mb-4">
       <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), {}, { 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(@post_categories.pluck(:title, :id), @post.post_category_id), { include_blank: true }, { data: { controller: 'autocomplete-select' } } %>
-        </div>
-
-        <div class="form-group">
-          <%= f.label :published_at, Spree.t(:published_at) %>
-          <%= help_bubble('Marks when the post will be published, leave it blank to hide it') %>
-          <%= f.datetime_field :published_at, class: 'form-control' %>
-        </div>
+        <%= f.spree_select :author_id, options_for_select(post_authors_select_options, @post.author_id || try_spree_current_user.id), { label: Spree.t(:author), autocomplete: true } %>
+        <%= f.spree_select :post_category_id, options_for_select(@post_categories.pluck(:title, :id), @post.post_category_id), { label: Spree.t(:category), include_blank: true, autocomplete: true } %>
+        <%= f.spree_datetime_field :published_at, help_bubble: 'Marks when the post will be published, leave it blank to hide it' %>
 
         <div class="form-group mb-0">
           <%= f.label :tag_list, Spree.t(:tags) %>

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

@@ -0,0 +1,7 @@
+<tr>
+  <th scope="col"><%= sort_link @search, :title, Spree.t(:title) %></th>
+  <th scope="col"><%= Spree.t(:category) %></th>
+  <th scope="col"><%= Spree.t(:author) %></th>
+  <th scope="col"><%= sort_link @search, :published_at, Spree.t(:published_at) %></th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/posts/{_post.html.erb → _table_row.html.erb}

@@ -14,9 +14,9 @@
 
   <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.post_category_title || '-' %></td>
   <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.author_name %></td>
-  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.published_at.present? ? local_date(post.published_at) : '-' %></td>
+  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= post.published_at.present? ? spree_date(post.published_at) : '-' %></td>
 
   <td class="actions">
     <%= link_to_edit(post, class: 'btn btn-light btn-sm', data: { 'turbo-frame': '_top' }) if can? :edit, post %>
   </td>
-</tr>
+</tr>