spree_admin 5.0.0.rc1 → 5.0.1

data/app/helpers/spree/admin/navigation_helper.rb

@@ -1,8 +1,22 @@
 module Spree
   module Admin
     module NavigationHelper
+      # Creates a navigation item with optional icon
+      # @param [String, SafeBuffer] label The text or HTML to use as the link content
+      # @param [String] url The URL for the link
+      # @param [String, nil] icon Optional icon name to prepend to the label
+      # @param [Boolean, nil] active Whether the link should be marked as active
+      # @return [SafeBuffer] The navigation item HTML
+      def nav_item(label, url, icon: nil, active: nil)
+        content_tag :li, class: 'nav-item', role: 'presentation' do
+          label = icon(icon) + label if icon.present?
+          active_link_to label, url, class: 'nav-link', active: active
+        end
+      end
+
       # the per_page_dropdown is used on index pages like orders, products, promotions etc.
       # this method generates the select_tag
+      # @return [String]
       def per_page_dropdown
         per_page_default = if @products
                              Spree::Admin::RuntimeConfig.admin_products_per_page
@@ -35,6 +49,8 @@ module Spree
 
       # helper method to create proper url to apply per page ing
       # fixes https://github.com/spree/spree/issues/6888
+      # @param per_page [Integer] the number of items per page
+      # @return [Hash] the params to apply per page
       def per_page_dropdown_params(per_page)
         args = params.permit!.to_h.clone
         args.delete(:page)
@@ -43,6 +59,12 @@ module Spree
         args
       end
 
+      # render a button link to edit a resource
+      # if the current user doesn't have permission to update the resource, the button will not be rendered
+      # @param resource [Spree::Product, Spree::User, Spree::Order] the resource to edit
+      # @param options [Hash] the options for the link
+      # @option options [String] :url the url to edit the resource (optional)
+      # @return [String] the link to edit the resource
       def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
         options[:data] ||= {}
@@ -51,6 +73,12 @@ module Spree
         link_to_with_icon('pencil', Spree.t(:edit), url, options) if can?(:update, resource)
       end
 
+      # render a button to delete a resource with a confirmation modal
+      # if the current user doesn't have permission to destroy the resource, the button will not be rendered
+      # @param resource [Spree::Product, Spree::User, Spree::Order] the resource to delete
+      # @param options [Hash] the options for the link
+      # @option options [String] :url the url to delete the resource (optional)
+      # @return [String] the link to delete the resource
       def link_to_delete(resource, options = {})
         url = options[:url] || object_url(resource)
         name = options[:name] || Spree.t('actions.destroy')
@@ -68,6 +96,12 @@ module Spree
         end
       end
 
+      # renders a link with an icon
+      # @param icon_name [String] the name of the icon, eg: 'pencil', see: https://tabler.io/icons
+      # @param text [String] the text of the link
+      # @param url [String] the url of the link
+      # @param options [Hash] the options for the link
+      # @return [String] the link with the icon
       def link_to_with_icon(icon_name, text, url, options = {})
         options[:class] ||= (options[:class].to_s + " with-tip").strip
         options[:title] ||= text if options[:no_text]
@@ -82,6 +116,12 @@ module Spree
         link_to(text.html_safe, url, options)
       end
 
+      # renders an active link with an icon, using the active_link_to method from https://github.com/comfy/active_link_to gem
+      # @param icon_name [String] the name of the icon, eg: 'pencil', see: https://tabler.io/icons
+      # @param text [String] the text of the link
+      # @param url [String] the url of the link
+      # @param options [Hash] the options for the link
+      # @return [String] the active link with the icon
       def active_link_to_with_icon(icon_name, text, url, options = {})
         options[:class] = (options[:class].to_s + " with-tip").strip
         options[:title] = text if options[:no_text]
@@ -96,7 +136,13 @@ module Spree
         active_link_to(text.html_safe, url, options)
       end
 
+      # renders a button with an icon (optional)
       # Override: Add disable_with option to prevent multiple request on consecutive clicks
+      # @param text [String] the text of the button
+      # @param icon_name [String] the name of the icon, eg: 'pencil', see: https://tabler.io/icons
+      # @param button_type [String] the type of the button, eg: 'submit', 'button'
+      # @param options [Hash] the options for the button
+      # @return [String] the button with the icon
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name
           text = "#{icon(icon_name, class: "icon icon-#{icon_name}")} #{text}"
@@ -115,6 +161,8 @@ module Spree
       end
 
       def button_link_to(text, url, html_options = {})
+        Spree::Deprecation.warn("button_link_to is deprecated. Use standard link_to instead.")
+
         if html_options[:method] &&
             !html_options[:method].to_s.casecmp('get').zero? &&
             !html_options[:remote]
@@ -136,6 +184,10 @@ module Spree
         end
       end
 
+      # renders a badge (active/inactive)
+      # @param condition [Boolean] the condition to check
+      # @param options [Hash] the options for the badge
+      # @return [String] the badge with the icon
       def active_badge(condition, options = {})
         label = options[:label]
         label ||= condition ? Spree.t(:say_yes) : Spree.t(:say_no)
@@ -148,6 +200,11 @@ module Spree
         end
       end
 
+      # renders a back button to the previous page
+      # @param default_url [String] the default url to go back to
+      # @param object [Spree::Product, Spree::User, Spree::Order] the object list to go back to
+      # @param label [String] the label of the back button (optional)
+      # @return [String] the back button
       def page_header_back_button(default_url, object = nil, label = nil)
         url = default_url
 
@@ -162,20 +219,15 @@ module Spree
         end
       end
 
-      def nav_pill_list_item(resource, url: nil, label: Spree.t(resource), active: nil, link_class: 'nav-link')
-        url = spree.send("admin_#{resource.to_s.pluralize}_path") if url.nil?
-        active = request.url.starts_with?(url) || request.fullpath.starts_with?(url) || controller_name == resource.to_s if active.nil?
-        link_class = "#{link_class} active" if active
-
-        content_tag :li, class: 'nav-item', role: 'presentation' do
-          link_to label, url, role: 'tab', 'aria-controls': 'pills-general', class: link_class, 'aria-selected': active
-        end
-      end
-
+      # renders an external link with an icon (eg. spree documentation website)
+      # @param label [String] the label of the link
+      # @param url [String] the url of the link
+      # @param opts [Hash] the options for the link
+      # @return [String] the external link with the icon
       def external_link_to(label, url, opts = {}, &block)
         opts[:target] ||= :blank
         opts[:rel] ||= :nofollow
-        opts[:class] ||= "d-inline-flex align-items-center text-blue"
+        opts[:class] ||= "d-inline-flex align-items-center text-blue text-decoration-none"
 
         if block_given?
           link_to url, opts, &block
@@ -186,6 +238,32 @@ module Spree
         end
       end
 
+      # renders a link to preview a resource on the storefront using the spree_storefront_resource_url helper
+      # @param resource [Spree::Product, Spree::Post] the resource to preview
+      # @param options [Hash] the options for the link
+      # @return [String] the link to preview the resource
+      def external_page_preview_link(resource, options = {})
+        resource_name = options[:name] || resource.class.name.demodulize
+
+        url = if [Spree::Product, Spree::Post].include?(resource.class)
+                spree_storefront_resource_url(resource, preview_id: resource.id)
+              else
+                spree_storefront_resource_url(resource)
+              end
+
+        link_to_with_icon(
+          'eye',
+          Spree.t('admin.utilities.preview', name: resource_name),
+          url,
+          class: 'text-left dropdown-item', id: "adminPreview#{resource_name}", target: :blank, data: { turbo: false }
+        )
+      end
+
+      # renders a help bubble with an icon
+      # @param text [String] the text of the help bubble
+      # @param placement [String] the placement of the help bubble
+      # @param css [String] the css class of the help bubble
+      # @return [String] the help bubble with the icon
       def help_bubble(text = '', placement = 'bottom', css: nil)
         css ||= 'text-muted'
         content_tag :small, icon('info-square-rounded', class: css), data: { placement: placement }, class: "with-tip #{css}", title: text

data/app/helpers/spree/admin/orders_helper.rb

@@ -69,25 +69,6 @@ module Spree
         end
       end
 
-      # Renders all the extension partials that may have been specified in the extensions
-      def event_links(order, events)
-        links = []
-        events.each do |event|
-          next unless order.send("can_#{event}?")
-
-          label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
-          links << button_link_to(
-            label.capitalize,
-            [event.to_sym, :admin, order],
-            method: :put,
-            icon: event.to_s + '.svg',
-            data: { turbo_confirm: Spree.t(:order_sure_want_to, event: label) },
-            class: 'btn-light'
-          )
-        end
-        safe_join(links, ''.html_safe)
-      end
-
       def line_item_shipment_price(line_item, quantity)
         Spree::Money.new(line_item.price * quantity, currency: line_item.currency)
       end

data/app/helpers/spree/admin/stores_helper.rb

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     module StoresHelper
+      include Spree::ImagesHelper
+
       def available_stores
         @available_stores ||= Spree::Store.accessible_by(current_ability)
       end
@@ -18,31 +20,9 @@ module Spree
 
         Rails.cache.fetch(["#{store.cache_key_with_version}/admin_icon", opts.to_param]) do
           if store.logo&.attached? && store.logo&.variable?
-            image_tag(
-              main_app.cdn_image_url(
-                store.logo.variant(
-                  spree_image_variant_options(
-                    resize_to_fill: [opts[:width] * 2, opts[:height] * 2]
-                  )
-                )
-              ),
-              class: opts[:class],
-              width: opts[:width],
-              height: opts[:height]
-            )
+            spree_image_tag(store.logo, class: opts[:class], width: opts[:width], height: opts[:height])
           elsif store.favicon_image&.attached? && store.favicon_image&.variable?
-            image_tag(
-              main_app.cdn_image_url(
-                store.favicon_image.variant(
-                  spree_image_variant_options(
-                    resize_to_fill: [opts[:width] * 2, opts[:height] * 2]
-                  )
-                )
-              ),
-              class: opts[:class],
-              width: opts[:width],
-              height: opts[:height]
-            )
+            spree_image_tag(store.favicon_image, class: opts[:class], width: opts[:width], height: opts[:height])
           else
             first_letter_icon(store.name, opts)
           end
@@ -65,20 +45,12 @@ module Spree
         opts.merge!(options)
 
         if store.is_a?(Spree::Store) && store.logo&.attached? && store.logo&.variable?
-          image_tag(
-            main_app.cdn_image_url(
-              store.logo.variant(
-                spree_image_variant_options(
-                  resize_to_fill: [opts[:width] * 2, opts[:height] * 2]
-                )
-              )
-            ),
-            opts
-          )
+          spree_image_tag(store.logo, class: opts[:class], width: opts[:width], height: opts[:height])
         else
           initials = store.name.split.map(&:first).join.upcase
-          image_tag("https://eu.ui-avatars.com/api/?name=#{initials}&background=random", width: opts[:height], height: opts[:height],
-                                                                                        class: 'rounded with-tip', title: store.name)
+          content_tag(:div, initials, class: "avatar rounded with-tip bg-light",
+                     style: "width: #{opts[:height]}px; height: #{opts[:height]}px;",
+                     title: store.name)
         end
       end
     end

data/app/helpers/spree/admin/webhooks_subscribers_helper.rb

@@ -5,7 +5,7 @@ module Spree
         content_tag :div, class: 'col-xs-12 col-sm-6 col-md-4 col-lg-4 form-group' do
           content_tag :div, class: 'custom-control custom-switch' do
             (form.check_box resource_name, event_checkbox_opts(resource_name), true, nil) + ' ' +
-              form.label(resource_name, Spree.t("admin.webhooks_subscribers.#{resource_name.to_s.pluralize}"), class: 'custom-control-label')
+              form.label(resource_name, Spree.t("#{resource_name.to_s.pluralize}"), class: 'custom-control-label')
           end
         end
       end

data/app/javascript/spree/admin/controllers/variants_form_controller.js

@@ -36,7 +36,8 @@ export default class extends CheckboxSelectAll {
     variantIds: Object,
     currentStockLocationId: String,
     stockLocations: Array,
-    optionValuesSelectOptions: Array
+    optionValuesSelectOptions: Array,
+    locale: String
   }
 
   connect() {
@@ -403,7 +404,7 @@ export default class extends CheckboxSelectAll {
     pricesVariation.delete(null)
 
     if (pricesVariation.size === 0) {
-      parentPriceEl.value = this.priceForVariant(variantName, currency).amount
+      parentPriceEl.value = this.priceForVariant(variantName, currency).amount?.toLocaleString(this.localeValue) || ''
       parentPriceEl.placeholder = ''
       return
     }
@@ -586,6 +587,12 @@ export default class extends CheckboxSelectAll {
     }
 
     keys.forEach((key) => {
+      const idInput = document.createElement('input')
+      idInput.type = 'hidden'
+      idInput.name = `product[variants_attributes][${i}][options][][id]`
+      idInput.value = Object.entries(this.optionsValue).find((option) => option[1].name === key)?.[0]
+      inputs.push(idInput)
+
       const nameInput = document.createElement('input')
       nameInput.type = 'hidden'
       nameInput.name = `product[variants_attributes][${i}][options][][name]`
@@ -668,7 +675,7 @@ export default class extends CheckboxSelectAll {
       }
 
       const existingPrice = this.priceForVariant(internalName, currency)
-      priceInput.value = existingPrice.amount
+      priceInput.value = existingPrice.amount?.toLocaleString(this.localeValue) || ''
       currencyInput.value = currency
       if (existingPrice.id) {
         idInput.value = existingPrice.id

data/app/views/active_storage/_upload_form.html.erb

@@ -18,14 +18,10 @@
          data-action="click->active-storage-upload#open"
     >
       <% if form.object.send(field_name).attached? && form.object.send(field_name).variable? %>
-        <%= image_tag(
-          main_app.cdn_image_url(
-            form.object.send(field_name).variant(
-              spree_image_variant_options(
-                resize_to_fill: [width, (crop ? height : nil)]
-              )
-            )
-          ),
+        <%= spree_image_tag(
+          form.object.send(field_name),
+          width: width,
+          height: height,
           class: 'img-fluid rounded-lg',
           data: { active_storage_upload_target: 'thumb' },
           loading: :lazy

data/app/views/layouts/spree/admin.html.erb

@@ -6,6 +6,8 @@
   </head>
 
   <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>">
+    <%= render_admin_partials(:body_start_partials) %>
+
     <%= render "spree/admin/shared/header" %>
     <%= render "spree/admin/shared/sidebar" %>
     <main id="content">
@@ -17,5 +19,7 @@
     </main>
     <%= render "spree/admin/shared/modal" %>
     <%= render "spree/admin/shared/alerts" %>
+
+    <%= render_admin_partials(:body_end_partials) %>
   </body>
 </html>

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

@@ -1,11 +1,6 @@
 <%= turbo_frame_tag :dialog_modal_lg do %>
-  <div class="modal-content" >
-    <div class="modal-header">
-      <h5 class="modal-title" id="exampleModalLabel">
-        <%= Spree.t(:edit) %> <%= Spree.t(:image) %>
-      </h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+  <div class="modal-content">
+    <%= modal_header(Spree.t(:edit) + ' ' + Spree.t(:image)) %>
     <%= form_with model: @asset, url: spree.admin_asset_path(@asset), method: :put, scope: :asset do |f| %>
       <div class="modal-body pb-0" data-turbo-permanent id="asset-<%= @asset.key.parameterize %>">
         <%= render 'active_storage/upload_form', form: f, field_name: :attachment, width: 200, height: 200, can_delete: false %>
@@ -16,7 +11,7 @@
           <%= f.text_area :alt, rows: 4, class: 'form-control' %>
         </div>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
+      <div class="modal-footer">
         <%= turbo_save_button_tag %>
         <%= link_to Spree.t('actions.destroy'), object_url(@asset),
             data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: '_top' },

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

@@ -2,8 +2,8 @@
 
 <div class="row">
   <div class="col-12 col-lg-8">
-    <div class="card-lg p-0">
-      <%= search_form_for [:admin, @promotion, @search], class: "filter-wrap border-bottom" do |f| %>
+    <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 %>
 
@@ -54,13 +54,11 @@
             </tbody>
           </table>
         <% else %>
-          <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-            <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CouponCode)) %>
-          </div>
+          <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
         <% end %>
       </div>
 
-      <%= render 'spree/admin/shared/index_table_options', collection: @coupon_codes, simple: true if @coupon_codes.any? %>
+      <%= render 'spree/admin/shared/index_table_options', collection: @coupon_codes if @coupon_codes.any? %>
     </div>
   </div>
 

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

@@ -8,7 +8,7 @@
 
           <% unless entri_enabled? %>
             <th>Default</th>
-            <th class="actions"></th>
+            <th></th>
           <% end %>
         </tr>
       </thead>

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

@@ -5,7 +5,7 @@
   <%= Spree.t(:domains) %>
 <% end %>
 
-<div class="card-lg">
+<div class="card-lg p-4">
   <h5 class="mb-3">Internal URL</h5>
   <div class="row mb-4">
     <div class="col-lg-4">

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

@@ -5,9 +5,9 @@
 <% content_for :page_title do %>
   <%= Spree.t(:customer_returns) %>
 <% end %>
-<div class="card-lg p-0">
 
-  <%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<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) %>
@@ -37,21 +37,8 @@
         </tbody>
       </table>
     </div>
+    <%= 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: plural_resource_name(Spree::CustomerReturn),
-      ) %>
-    </div>
+    <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
   <% end %>
-
-  <%= render partial: "spree/admin/shared/index_table_options",
-  locals: {
-    collection: @collection,
-  } %>
 </div>

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

@@ -2,12 +2,14 @@
   <div class="card-body">
     <div class="mb-3">
       Your overall setup progress
-      <span class="float-right badge badge-<%= current_store.setup_completed? ? 'success' : 'light' %>">
+      <span class="float-right badge badge-<%= current_store.setup_completed? ? 'success' : 'info' %>">
         <% if current_store.setup_completed? %>
           <%= icon('check', class: 'text-success') %>
         <% end %>
 
-        <%= current_store.setup_tasks_done %> of <%= current_store.setup_tasks_total %> steps done
+        <span>
+          <strong><%= current_store.setup_tasks_done %></strong> of <%= current_store.setup_tasks_total %> steps done
+        </span>
       </span>
     </div>
     <div class="progress">

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

@@ -0,0 +1,2 @@
+<%= render 'updater' %>
+<%= render 'store_preview' %>

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

@@ -32,40 +32,50 @@
           </tr>
         </thead>
         <tbody>
-        <% @top_products.each do |list_item| %>
-          <% product = list_item[:product] %>
-          <tr>
-            <% cache_unless @vendor, spree_base_cache_scope.call(product) do %>
-              <td>
-                <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center font-weight-bold', data: { 'turbo-frame': '_top' } do %>
-                  <div class="mr-3">
-                    <%= render 'spree/admin/shared/product_image', object: product %>
-                  </div>
-                  <%= product.name %>
+        <% if @top_products.any? %>
+          <% @top_products.each do |list_item| %>
+            <% product = list_item[:product] %>
+            <tr>
+              <% cache_unless @vendor, spree_base_cache_scope.call(product) do %>
+                <td>
+                  <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center font-weight-bold', data: { 'turbo-frame': '_top' } do %>
+                    <div class="mr-3">
+                      <%= render 'spree/admin/shared/product_image', object: product %>
+                    </div>
+                    <%= product.name %>
+                  <% end %>
+                </td>
+                <% if enterprise_edition? && defined?(vendor_logo_link) && !@vendor %>
+                  <td>
+                    <%= vendor_logo_link(product.vendor) if product.vendor.present? %>
+                  </td>
                 <% end %>
-              </td>
-              <% if enterprise_edition? && defined?(vendor_logo_link) && !@vendor %>
                 <td>
-                  <%= vendor_logo_link(product.vendor) if product.vendor.present? %>
+                  <%= display_admin_price(product) %>
                 </td>
               <% end %>
-              <td>
-                <%= display_admin_price(product) %>
+              <td class="text-center">
+                <%= list_item[:quantity] %>
               </td>
-            <% end %>
-            <td class="text-center">
-              <%= list_item[:quantity] %>
-            </td>
-            <td class="text-right">
-              <%= list_item[:amount] %>
+              <td class="text-right">
+                <%= list_item[:amount] %>
+              </td>
+            </tr>
+          <% end %>
+        <% else %>
+          <tr>
+            <td colspan="5" class="text-center text-muted py-5">
+              <%= Spree.t(:no_resource_found, resource: Spree::Product.name.demodulize.underscore.humanize) %>
             </td>
           </tr>
         <% end %>
       </tbody>
     </table>
   </div>
-  <p class="text-center mt-0 border-top py-2 mb-0">
-    <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-50 btn btn-light mt-2', data: { turbo_frame: '_top' } %>
-  </p>
+  <% if @top_products.any? %>
+    <p class="text-center mt-0 border-top py-2 mb-0">
+      <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-50 btn btn-light mt-2', data: { turbo_frame: '_top' } %>
+    </p>
+  <% end %>
   </div>
 </div>

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

@@ -113,6 +113,8 @@
     </div>
   </div>
 
-  <%= render 'top_products' if @top_products.present? %>
+  <%= render 'top_products' if @top_products %>
   <%= render 'visits' if @visits %>
+
+  <%= render_admin_partials(:dashboard_analytics_partials) %>
 <% end %>

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

@@ -17,17 +17,13 @@
         <%= render 'spree/admin/shared/calendar_range_picker',
           date_from_value: params[:date_from] || 1.month.ago.beginning_of_month,
           date_to_value: params[:date_to] || 1.month.ago.end_of_month,
-          css_classes: "btn btn-sm border hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
+          css_classes: "btn btn-sm border rounded-lg hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
       <% end %>
     </div>
     <%= render 'analytics' %>
   </div>
   <div class="col-lg-4">
-    <% if defined?(current_vendor) && current_vendor %>
-      <%= render 'spree/admin/shared/vendor_faq' %>
-    <% else %>
-      <%= render 'updater' %>
-      <%= render 'store_preview' %>
-      <%= render 'vendors' if defined?(Spree::Vendor) %>
-    <% end %>
+    <%= render 'sidebar' %>
+    <%= render_admin_partials(:dashboard_sidebar_partials) %>
+  </div>
 </div>

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

@@ -6,7 +6,7 @@
       <% end %>
       <th><%= Spree.t(:name) %></th>
       <th><%= Spree.t(:size) %></th>
-      <th class="actions"></th>
+      <th></th>
     </tr>
   </thead>
   <tbody>

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

@@ -1,20 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for :digital_asset, url: spree.admin_product_digital_asset_path(@product, @digital_asset), method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= @digital_asset.attachment.filename %></h5>
-        <button
-          type="button"
-          class="btn-close"
-          data-dismiss="modal"
-          aria-label="<%= Spree.t(:close) %>"
-        />
-      </div>
+      <%= modal_header(@digital_asset.attachment.filename) %>
       <div class="modal-body">
         <%= render "spree/admin/digital_assets/form", f: f %>
       </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 Spree.t("actions.save"), data: { turbo_frame: :_top } %>
       </div>
     </div>