spree_admin 5.1.8 → 5.2.0.rc1

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

@@ -0,0 +1,41 @@
+<%= search_form_for [:admin, @promotion, @search], 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: :code_i_cont %>
+
+    <div class="d-flex align-items-center justify-content-between">
+      <%= dropdown do %>
+        <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
+          <span class="text-muted font-weight-normal mr-1">
+            <%= Spree.t(:show) %>
+          </span>
+          <%= Spree.t(:all) if (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %>
+          <%= Spree.t('admin.coupon_codes.used') if params.dig(:q, :state_eq) == 'used' %>
+          <%= Spree.t('admin.coupon_codes.unused') if params.dig(:q, :state_eq) == 'unused' %>
+        <% end %>
+        <%= dropdown_menu do %>
+          <%= active_link_to Spree.t(:all),
+            spree.admin_promotion_coupon_codes_path(@promotion),
+            class: 'dropdown-item',
+            active: (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %>
+          <%= link_to Spree.t('admin.coupon_codes.used'),
+            spree.admin_promotion_coupon_codes_path(@promotion, q: {state_eq: :used}),
+            class: "dropdown-item #{'active' if params.dig(:q, :state_eq) == 'used'}" %>
+          <%= link_to Spree.t('admin.coupon_codes.unused'),
+            spree.admin_promotion_coupon_codes_path(@promotion, q: {state_eq: :unused}),
+            class: "dropdown-item #{'active' if params.dig(:q, :state_eq) == 'unused'}" %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div data-controller="tooltip">
+      <%= link_to spree.admin_promotion_coupon_codes_path(@promotion, format: :csv), class: 'btn btn-light' do %>
+        <%= icon 'download' %>
+        <%= Spree.t(:download) %>
+      <% end %>
+      <%= tooltip(Spree.t('admin.export_coupons')) %>
+    </div>
+  </div>
+
+  <%= render "spree/admin/shared/filter_badge_template" %>
+  <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+<% end %>

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

@@ -0,0 +1,8 @@
+<tr id="<%= spree_dom_id coupon_code %>">
+  <td class="w-50">
+    <code><%= coupon_code.code.upcase %></code>
+    <%= clipboard_component(coupon_code.code.upcase) %>
+  </td>
+  <td class="w-25 font-size-sm"><%= active_badge(coupon_code.state == 'used') %></td>
+  <td class="w-25 font-size-sm"><%= spree_time(coupon_code.created_at) %></td>
+</tr>

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

@@ -8,64 +8,7 @@
 
 <div class="row">
   <div class="col-12 col-lg-8">
-    <div class="card-lg">
-      <%= search_form_for [:admin, @promotion, @search], class: "filter-wrap" do |f| %>
-        <div class="d-flex flex-column flex-lg-row gap-2">
-          <%= render 'spree/admin/shared/filters_search_bar', param: :code_eq %>
-
-          <div class="d-flex align-items-center justify-content-between">
-            <div class="dropdown">
-              <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
-                <span class="text-muted font-weight-normal mr-1">
-                  <%= Spree.t(:show) %>
-                </span>
-                <%= Spree.t(:all) if (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %>
-                <%= Spree.t('admin.coupon_codes.used') if params.dig(:q, :state_eq) == 'used' %>
-                <%= Spree.t('admin.coupon_codes.unused') if params.dig(:q, :state_eq) == 'unused' %>
-              </button>
-              <div class="dropdown-menu w-100 font-size-sm" style="min-width: 200px">
-                <%= active_link_to Spree.t(:all),
-                  spree.admin_promotion_coupon_codes_path(@promotion),
-                  class: 'dropdown-item',
-                  active: (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %>
-                <%= link_to Spree.t('admin.coupon_codes.used'),
-                  spree.admin_promotion_coupon_codes_path(@promotion, q: {state_eq: :used}),
-                  class: "dropdown-item #{'active' if params.dig(:q, :state_eq) == 'used'}" %>
-                <%= link_to Spree.t('admin.coupon_codes.unused'),
-                  spree.admin_promotion_coupon_codes_path(@promotion, q: {state_eq: :unused}),
-                  class: "dropdown-item #{'active' if params.dig(:q, :state_eq) == 'unused'}" %>
-              </div>
-            </div>
-          </div>
-
-          <%= link_to spree.admin_promotion_coupon_codes_path(@promotion, format: :csv), class: 'btn btn-light bg-transparent with-tip', title: 'Download coupons as a CSV file' do %>
-            <%= icon 'download' %>
-            <%= Spree.t(:download) %>
-          <% end %>
-        </div>
-      <% end %>
-
-      <div class="table-responsive">
-        <% if @coupon_codes.any? %>
-          <table class="table">
-            <thead>
-            <tr data-hook="rate_header">
-              <th><%= Spree.t(:code) %></th>
-              <th><%= Spree.t(:used) %></th>
-              <th><%= Spree.t(:created_at) %></th>
-            </tr>
-            </thead>
-            <tbody>
-              <%= render collection: @coupon_codes.pluck(:id, :code, :state, :created_at), partial: 'spree/admin/coupon_codes/coupon_code', cached: spree_base_cache_scope %>
-            </tbody>
-          </table>
-        <% else %>
-          <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
-        <% end %>
-      </div>
-
-      <%= render 'spree/admin/shared/index_table_options', collection: @coupon_codes if @coupon_codes.any? %>
-    </div>
+    <%= render 'spree/admin/shared/index_table', new_object_url: nil %>
   </div>
 
   <div class="col-12 col-lg-4">

data/app/views/spree/admin/custom_domains/_custom_domains.html.erb

@@ -3,10 +3,10 @@
     <table class="table">
       <thead>
         <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:active) %>?</th>
-          <th><%= Spree.t(:default) %>?</th>
-          <th></th>
+          <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+          <th scope="col"><%= Spree.t(:active) %>?</th>
+          <th scope="col"><%= Spree.t(:default) %>?</th>
+          <th scope="col"></th>
         </tr>
       </thead>
       <tbody>

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button collection_url %>
-  <%= @custom_domain.url %>
-<% end %>
-
-<%= form_for @object, url: spree.admin_custom_domain_path(@object) do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
-      <%= render partial: 'form', locals: { f: f } %>
-      <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { f: f } %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/edit_resource' %>

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

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

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

@@ -0,0 +1,11 @@
+  <%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path, class: "filter-wrap", data: {controller: "filters"} do |f| %>
+    <%= render "spree/admin/shared/filters_search_bar",
+    param: :number_cont,
+    label: Spree.t(:number) %>
+
+    <%= render_admin_partials(:customer_returns_filters_partials, f: f) %>
+
+    <%= render "spree/admin/shared/filter_badge_template" %>
+
+    <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+  <% end %>

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

@@ -0,0 +1,8 @@
+<tr>
+  <th scope="col"><%= Spree.t(:number) %></th>
+  <th scope="col"><%= Spree.t(:created_at) %></th>
+  <th scope="col"><%= Spree.t(:customer) %></th>
+  <th scope="col"><%= Spree.t(:order) %></th>
+  <th scope="col"><%= Spree.t(:reimbursement_status) %></th>
+  <th scope="col"><%= Spree.t(:pre_tax_total) %></th>
+</tr>

data/app/views/spree/admin/customer_returns/{_customer_return.html.erb → _table_row.html.erb}

@@ -15,7 +15,7 @@
         <%= customer_return.number %>
       <% end %>
     </td>
-    <td data-action="click->row-link#openLink"><%= local_time(customer_return.created_at) %></td>
+    <td data-action="click->row-link#openLink"><%= spree_time(customer_return.created_at) %></td>
     <td data-action="click->row-link#openLink"><%= render "spree/admin/orders/customer_summary", order: customer_return.order %></td>
     <td data-action="click->row-link#openLink"><%= link_to customer_return.order.number,
       spree.edit_admin_order_path(customer_return.order) %></td>

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

@@ -12,39 +12,4 @@
 
 <%= render_admin_partials(:customer_returns_header_partials) %>
 
-<div class="card-lg">
-  <%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path, class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
-    <%= render "spree/admin/shared/filters_search_bar",
-    param: :number_cont,
-    label: Spree.t(:number) %>
-
-    <%= render "spree/admin/shared/filter_badge_template" %>
-
-    <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-  <% end %>
-
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr data-hook="rate_header">
-            <th><%= Spree.t(:number) %></th>
-            <th><%= Spree.t(:created_at) %></th>
-            <th><%= Spree.t(:customer) %></th>
-            <th><%= Spree.t(:order) %></th>
-            <th><%= Spree.t(:reimbursement_status) %></th>
-            <th><%= Spree.t(:pre_tax_total) %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= render collection: @collection,
-          partial: "spree/admin/customer_returns/customer_return",
-          cached: spree_base_cache_scope %>
-        </tbody>
-      </table>
-    </div>
-    <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table', new_object_url: nil %>

data/app/views/spree/admin/dashboard/_setup_progress.html.erb

@@ -1,4 +1,4 @@
-<div class="mb-3 card rounded-lg" id="setup_progress">
+<div class="card mb-3" id="setup_progress">
   <div class="card-body">
     <div class="mb-3">
       Your overall setup progress

data/app/views/spree/admin/dashboard/_setup_tasks.html.erb

@@ -6,19 +6,17 @@
       <% task_in_progress ||= task %>
     <% end %>
 
-    <div class="collapsable-card mb-3">
-      <h5 class="card-header border-0 p-0 h-auto hover-light">
-        <a class="<% if task_in_progress != task %>collapsed<% end %> text-decoration-none d-flex align-items-center p-4 text-dark font-weight-normal w-100 card-title" data-toggle="collapse" href="#collapse<%= index %>-collapsed" aria-expanded="true" aria-controls="collapse<%= index %>-collapsed" id="heading<%= index %>-collapsed">
-          <%= onboarding_check_circle(done) %>
-          <span class="ml-3"><%= Spree.t("admin.store_setup_tasks.#{task}") %></span>
-          <%= icon('chevron-down', class: 'arrow ml-auto') %>
-        </a>
-      </h5>
-      <div id="collapse<%= index %>-collapsed" class="collapse <% if task_in_progress == task %>show<% end %>" aria-labelledby="heading<%= index %>-collapsed">
+    <details class="collapsable-card mb-3" <% if task_in_progress == task %>open<% end %> id="setup_task_<%= task %>">
+      <summary class="card-header border-0 h-auto text-decoration-none d-flex align-items-center p-3 text-dark font-weight-normal w-100 card-title bg-transparent list-style-none" role="button" tabindex="0">
+        <%= onboarding_check_circle(done) %>
+        <span class="ml-3"><%= Spree.t("admin.store_setup_tasks.#{task}") %></span>
+        <%= icon('chevron-right', class: 'arrow ml-auto') %>
+      </summary>
+      <div class="animate__animated animate__fadeIn animate__faster">
         <div class="card-body">
           <%= render "spree/admin/dashboard/setup_tasks/#{task}", done: done %>
         </div>
       </div>
-    </div>
+    </details>
   <% end %>
 </div>

data/app/views/spree/admin/dashboard/_store_preview.html.erb

@@ -1,6 +1,6 @@
 <% if current_store.default_theme %>
   <div class="card mb-4">
-    <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'd-block border rounded mx-2 mt-2 mb-0 overflow-auto bg-light position-relative store-preview-link' do %>
+    <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'd-block border rounded mx-2 mt-2 mb-0 overflow-auto bg-light position-relative store-preview-link', data: { turbo_prefetch: false } do %>
       <div class="position-absolute w-100 h-100 align-items-center justify-content-center overlay-background store-preview-actions">
         <button class="btn btn-primary">
           <%= icon('tools') %>
@@ -17,13 +17,13 @@
         <%= clipboard_component(current_store.url_or_custom_domain) %>
       </div>
 
-      <div class="d-flex">
-        <%= link_to current_store.formatted_url_or_custom_domain, class: 'btn btn-light w-50 mr-3', target: '_blank' do %>
+      <div class="d-flex gap-2">
+        <%= link_to current_store.formatted_url_or_custom_domain, class: 'btn btn-light w-50', target: '_blank' do %>
           <%= icon 'eye', class: 'mr-1' %>
           &nbsp;
           <%= Spree.t(:view_store) %>
         <% end %>
-        <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'btn btn-light w-50' do %>
+        <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'btn btn-light w-50', data: { turbo_prefetch: false } do %>
           <%= icon 'tools', class: 'mr-1' %>
           &nbsp;
           <%= Spree.t('admin.edit_theme') %>
@@ -32,7 +32,7 @@
     </div>
     <% unless current_store.default_custom_domain&.active? %>
       <div class="card-footer border-top p-2">
-        <%= link_to_with_icon 'world-www', 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-link w-100 py-2' %>
+        <%= link_to_with_icon 'world-www', 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-secondary w-100 py-2' %>
       </div>
     <% end %>
   </div>

data/app/views/spree/admin/dashboard/_top_products.html.erb

@@ -14,15 +14,15 @@
       <table class="table">
         <thead>
           <tr class="border-bottom">
-            <th>
+            <th scope="col">
               <%= Spree.t(:product) %>
             </th>
             <% if defined?(Spree::Vendor) && !@vendor %>
-              <th>
+              <th scope="col">
                 <%= Spree.t(:vendor) %>
               </th>
             <% end %>
-            <th>
+            <th scope="col">
               <%= Spree.t(:price) %>
             </th>
             <th class="text-center">

data/app/views/spree/admin/dashboard/_updater.html.erb

@@ -9,7 +9,7 @@
 
       <% if spree_updater.latest_release['url'] %>
         <div>
-          <%= external_link_to "View release notes", spree_updater.latest_release['url'], target: '_blank', class: 'btn btn-sm btn-link' %>
+          <%= external_link_to "View release notes", spree_updater.latest_release['url'], target: '_blank', class: 'btn btn-sm btn-secondary' %>
         </div>
       <% end %>
     </div>

data/app/views/spree/admin/dashboard/analytics.html.erb

@@ -5,11 +5,11 @@
 <%= turbo_frame_tag :analytics do %>
   <div class="card mb-4"
        data-controller="tabs"
-       data-tabs-active-tab-class="active">
+       data-tabs-active-tab-class-value="active">
     <div class="card-header d-block border-0 h-auto p-2">
       <div class="row">
         <div class="col-6 col-lg-4 pr-2">
-          <div class="analytics-card-tab active" data-tabs-target="tab" data-action="click->tabs#change">
+          <div class="analytics-card-tab active" data-tabs-target="tab" data-action="click->tabs#select">
             <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">
               <span class="font-size-sm text-muted">Total Sales</span>
               <span class="font-size-lg text-dark font-weight-bold mt-1">
@@ -23,7 +23,7 @@
         </div>
 
         <div class="col-6 col-lg-2 pl-0 pr-2">
-          <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#change">
+          <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
             <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">
               <span class="font-size-sm text-muted">Avg. Order Value</span>
               <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @orders_average %></span>
@@ -35,7 +35,7 @@
         </div>
 
         <div class="col-6 col-lg-2 pl-0 pr-2">
-          <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#change">
+          <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
             <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">
               <span class="font-size-sm text-muted">Total Orders</span>
               <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @orders_total  %></span>
@@ -47,7 +47,7 @@
         </div>
         <% if @visits_total && @visits_growth_rate %>
           <div class="col-6 col-lg-2 pl-0 pr-2">
-            <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#change">
+            <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
               <div class="d-flex justify-content-center flex-column">
                 <span class="font-size-sm text-muted">Visits</span>
                 <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @visits_total %></span>
@@ -61,7 +61,7 @@
 
         <% if @audience_total && @audience_growth_rate %>
           <div class="col-6 col-lg-2 pl-0">
-            <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#change">
+            <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
               <div class="d-flex justify-content-center flex-column">
                 <span class="font-size-sm text-muted">Sign-ups</span>
                 <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @audience_total %></span>
@@ -75,41 +75,39 @@
       </div>
     </div>
     <div class="card-body p-2">
-      <div class="tab-content">
-        <div data-tabs-target="panel" data-index="1" class="animate__animated animate__fadeIn">
-          <% if currency_money(current_currency).symbol_first? %>
-            <%= line_chart @grouped_orders_scope.sum(:total), prefix: currency_money(current_currency).symbol, zeros: true, points: false, library: {
-              animation: {
-                duration: 300,
-                easing: "linear"
-              }
-            } %>
-          <% else %>
-            <%= line_chart @grouped_orders_scope.sum(:total), suffix: currency_money(current_currency).symbol, zeros: true, points: false, library: {
-              animation: {
-                duration: 300,
-                easing: "linear"
-              }
-            } %>
-          <% end %>
-        </div>
-        <div data-tabs-target="panel" data-index="2" class="animate__animated animate__fadeIn">
-          <%= line_chart @grouped_orders_scope.average(:total), suffix: currency_money(current_currency).symbol, zeros: true, points: false %>
-        </div>
-        <div data-tabs-target="panel" data-index="3" class="animate__animated animate__fadeIn">
-          <%= line_chart @grouped_orders_scope.count, points: false %>
-        </div>
-        <% if @visits %>
-          <div data-tabs-target="panel" data-index="4" class="animate__animated animate__fadeIn">
-            <%= line_chart @visits.count, points: false %>
-          </div>
-        <% end %>
-        <% if @audience %>
-          <div data-tabs-target="panel" data-index="5" class="animate__animated animate__fadeIn">
-            <%= line_chart @audience.count, points: false %>
-          </div>
+      <div data-tabs-target="panel" class="animate__animated animate__fadeIn">
+        <% if currency_money(current_currency).symbol_first? %>
+          <%= line_chart @grouped_orders_scope.sum(:total), prefix: currency_money(current_currency).symbol, zeros: true, points: false, library: {
+            animation: {
+              duration: 300,
+              easing: "linear"
+            }
+          } %>
+        <% else %>
+          <%= line_chart @grouped_orders_scope.sum(:total), suffix: currency_money(current_currency).symbol, zeros: true, points: false, library: {
+            animation: {
+              duration: 300,
+              easing: "linear"
+            }
+          } %>
         <% end %>
       </div>
+      <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>
+        <%= line_chart @grouped_orders_scope.average(:total), suffix: currency_money(current_currency).symbol, zeros: true, points: false %>
+      </div>
+      <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>
+        <%= line_chart @grouped_orders_scope.count, points: false %>
+      </div>
+      <% if @visits %>
+        <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>
+          <%= line_chart @visits.count, points: false %>
+        </div>
+      <% end %>
+      <% if @audience %>
+        <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>
+          <%= line_chart @audience.count, points: false %>
+        </div>
+      <% end %>
     </div>
   </div>
 

data/app/views/spree/admin/dashboard/getting_started.html.erb

@@ -1,4 +1,4 @@
-<div class="row pt-3">
+<div class="row pt-4">
   <div class="col-lg-8 offset-lg-2 mb-4">
     <h2 class="page-header-title">
       <%= Spree.t('admin.getting_started') %>

data/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb

@@ -16,7 +16,7 @@
 
 <div class="d-flex gap-3">
   <%= link_to_with_icon 'plus', Spree.t(:add_product), spree.new_admin_product_path, class: 'btn btn-primary', data: { turbo_frame: '_top' } if can?(:create, Spree::Product) %>
-
-  <%= render 'spree/admin/products/import_button' %>
+  <%= link_to_with_icon 'table-import', Spree.t(:import), spree.new_admin_import_path(type: 'Spree::Imports::Products'), class: 'btn btn-light', data: { action: 'drawer#open',turbo_frame: :drawer } if can?(:create, Spree::Import) %>
+  
   <%= invite_vendor_button(class: 'btn btn-light') if defined?(invite_vendor_button) %>
 </div>

data/app/views/spree/admin/dashboard/show.html.erb

@@ -1,4 +1,4 @@
-<div class="row pt-3">
+<div class="row pt-4">
   <div class="col-12">
     <h2 class="page-header-title">
       <%= Spree.t('admin.dashboard.hi') %> <%= try_spree_current_user.first_name %>!

data/app/views/spree/admin/digital_assets/_digital_asset.html.erb

@@ -6,16 +6,15 @@
   <td><%= number_to_human_size(digital_asset.attachment.byte_size) %></td>
   <td class="actions">
     <% if can? :edit, digital_asset %>
-      <span data-toggle="modal" data-target="#modal">
-        <%= link_to_edit(
-          digital_asset,
-          no_text: true,
-          url: spree.edit_admin_product_digital_asset_path(digital_asset.product, digital_asset),
-          data: {
-            turbo_frame: "dialog_modal",
-          },
-        ) %>
-      </span>
+      <%= link_to_edit(
+        digital_asset,
+        no_text: true,
+        url: spree.edit_admin_product_digital_asset_path(digital_asset.product, digital_asset),
+        data: {
+          turbo_frame: "dialog",
+          action: 'dialog#open',
+        },
+      ) %>
     <% end %>
     <% if can? :destroy, digital_asset %>
       <%= link_to_delete(

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

@@ -5,14 +5,9 @@
 <%= f.error_message_on :attachment %>
 
 <% if @product.has_variants? %>
-  <div class="form-group">
-    <%= f.label :variant_id, Spree.t(:variant) %>
-    <%= f.select :variant_id,
-             @product.variants.map { |variant| [variant.options_text, variant.id] },
-             {},
-             required: true,
-             class: "custom-select" %>
-  </div>
+  <%= f.spree_select :variant_id,
+           @product.variants.map { |variant| [variant.options_text, variant.id] },
+           { required: true, label: Spree.t(:variant), autocomplete: true } %>
 <% else %>
   <%= hidden_field_tag "digital_asset[variant_id]", @product.master.id %>
 <% end %>

data/app/views/spree/admin/digital_assets/_table.html.erb

@@ -2,11 +2,11 @@
   <thead>
     <tr>
       <% if @product.has_variants? %>
-        <th><%= Spree.t(:variant) %></th>
+        <th scope="col"><%= Spree.t(:variant) %></th>
       <% end %>
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:size) %></th>
-      <th></th>
+      <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+      <th scope="col"><%= Spree.t(:size) %></th>
+      <th scope="col"></th>
     </tr>
   </thead>
   <tbody>
@@ -22,15 +22,14 @@
           >
             <%= Spree.t(:no_resource_found, resource: Spree.t(:digital_assets)) %>
             <% if can?(:create, Spree::Digital.new(variant: @product.default_variant)) %>
-              <span data-toggle="modal" data-target="#modal">
-                <%= link_to_with_icon "plus",
-                Spree.t(:add_one),
-                spree.new_admin_product_digital_asset_path(@product),
-                class: "btn btn-light ml-3",
-                data: {
-                  turbo_frame: "dialog_modal",
-                } %>
-              </span>
+              <%= link_to_with_icon "plus",
+              Spree.t(:add_one),
+              spree.new_admin_product_digital_asset_path(@product),
+              class: "btn btn-light ml-3",
+              data: {
+                turbo_frame: "dialog",
+                action: 'dialog#open',
+              } %>
             <% end %>
           </div>
         </td>

data/app/views/spree/admin/digital_assets/create.turbo_stream.erb

@@ -1,2 +1,2 @@
 <%= turbo_render_alerts %>
-<%= turbo_close_modal %>
+<%= turbo_close_dialog %>

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

@@ -1,14 +1,12 @@
-<%= turbo_frame_tag :dialog_modal do %>
+<%= turbo_frame_tag :dialog do %>
   <%= form_for :digital_asset, url: spree.admin_product_digital_asset_path(@product, @digital_asset), method: :put do |f| %>
-    <div class="modal-content">
-      <%= modal_header(@digital_asset.attachment.filename) %>
-      <div class="modal-body">
-        <%= render "spree/admin/digital_assets/form", f: f %>
-      </div>
-      <div class="modal-footer">
-        <%= modal_discard_button %>
-        <%= turbo_save_button_tag Spree.t("actions.save"), data: { turbo_frame: :_top } %>
-      </div>
+    <%= dialog_header(@digital_asset.attachment.filename) %>
+    <div class="dialog-body">
+      <%= render "spree/admin/digital_assets/form", f: f %>
+    </div>
+    <div class="dialog-footer">
+      <%= dialog_discard_button %>
+      <%= turbo_save_button_tag Spree.t("actions.save"), data: { turbo_frame: :_top } %>
     </div>
   <% end %>
 <% end %>