spree_admin 5.4.0.beta → 5.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c3c1bcea62974a037285f20685e3d926e15bf03b1865b82f5a98b11f8c83a9b
-  data.tar.gz: a3c6ec7ac7ad5d4e0e3d941bc34d2b68b8a8c63122b0c4e12162f38cd3f85faa
+  metadata.gz: 6e25435ab28276f0ca9a78db5d61f4b5485be27fb668ee9c1c381db48812445e
+  data.tar.gz: cc103dc8524c6a0575e367a427e88037647cc22caa9dd5117a0091715df480d6
 SHA512:
-  metadata.gz: 564215eebe42f983fc907cf5f53fbc17e4282fe1af905580cdcefff52d053d6f258a64069196823527e6727de062f77fdf274fd98b9f9731aff86469c8e23257
-  data.tar.gz: 77f2de97d0af53f65de94783e9182ff3a97007e656ab3b19667cea55716d7928f14a39a3988993a7433d0dc61be976c1fd652251d2077084c14c5faf362dbb40
+  metadata.gz: 1b5b4a0bd4ee889940ca9826c9f6e2db5337bf1215588e543343be9fab77454ad3e9254f5b903eefcc485f6ef30673d38171fec315f3b3d5a16b463d68a42559
+  data.tar.gz: 5f67328def69057604315c1c79a3bcaae424ce369d98741b7521b1fe98f91f552aff41883534b5df81914d73d6a3d5985430551c8a6392e8caa537411778b44e

data/app/controllers/spree/admin/api_keys_controller.rb

@@ -8,6 +8,27 @@ module Spree
 
       helper 'spree/admin/api_keys'
 
+      def create
+        invoke_callbacks(:create, :before)
+        set_created_by
+        @object.attributes = permitted_resource_params
+        if @object.save
+          invoke_callbacks(:create, :after)
+          if @object.secret?
+            # Pass plaintext token via flash so the show page can display it once.
+            # Flash is stored in the encrypted session cookie and auto-cleared after one request.
+            # Skip the success flash — the token warning banner is sufficient feedback.
+            flash[:plaintext_token] = @object.plaintext_token
+          else
+            flash[:success] = message_after_create
+          end
+          redirect_to location_after_create, status: :see_other
+        else
+          invoke_callbacks(:create, :fails)
+          render action: :new, status: :unprocessable_content
+        end
+      end
+
       def revoke
         @object = scope.find_by_prefix_id!(params[:id])
         @object.revoke!(try_spree_current_user)

data/app/controllers/spree/admin/exports_controller.rb

@@ -35,7 +35,8 @@ module Spree
       end
 
       def assign_params
-        @object.type = permitted_resource_params[:type] if available_types.map(&:to_s).include?(permitted_resource_params[:type])
+        available_type =  available_types.map(&:to_s).find { |t| t == permitted_resource_params[:type] }
+        @object = @object.becomes!(available_type.constantize) if available_type.present?
         @object.search_params = permitted_resource_params[:search_params]
       end
 

data/app/controllers/spree/admin/markets_controller.rb

@@ -10,6 +10,20 @@ module Spree
 
       def load_data
         @countries = current_store.countries_with_shipping_coverage
+
+        # Exclude countries already assigned to other markets in the store
+        if @object&.persisted?
+          taken_country_ids = Spree::MarketCountry.joins(:market)
+                                .where(spree_markets: { store_id: current_store.id, deleted_at: nil })
+                                .where.not(market_id: @object.id)
+                                .pluck(:country_id)
+        else
+          taken_country_ids = Spree::MarketCountry.joins(:market)
+                                .where(spree_markets: { store_id: current_store.id, deleted_at: nil })
+                                .pluck(:country_id)
+        end
+
+        @countries = @countries.where.not(id: taken_country_ids) if taken_country_ids.any?
       end
 
       def permitted_resource_params

data/app/controllers/spree/admin/products_controller.rb

@@ -19,10 +19,8 @@ module Spree
 
       new_action.before :build_master_prices
       new_action.before :build_master_stock_items
-      new_action.before :build_product_properties
       edit_action.before :build_master_prices
       edit_action.before :build_master_stock_items
-      edit_action.before :build_product_properties
       create.after :assign_master_images
       update.before :skip_updating_status
       update.before :update_status
@@ -271,16 +269,6 @@ module Spree
         {}
       end
 
-      def build_product_properties
-        return unless Spree::Config[:product_properties_enabled]
-
-        Spree::Property.all.each do |property|
-          @product.product_properties.build(property: property) unless @product.product_properties.find do |product_property|
-            product_property.property_id == property.id
-          end
-        end
-      end
-
       def assign_master_images
         return unless @product.master.persisted?
 

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

@@ -24,8 +24,12 @@ module Spree
       end
 
       def masked_api_key(api_key)
-        token = api_key.token
-        "#{token[0..6]}#{'*' * 16}#{token[-4..]}"
+        if api_key.secret?
+          "#{api_key.token_prefix}#{'*' * 15}"
+        else
+          token = api_key.token
+          "#{token[0..6]}#{'*' * 16}#{token[-4..]}"
+        end
       end
     end
   end

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

@@ -273,13 +273,13 @@ module Spree
       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 resource [Spree::Product] 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)
+        url = if resource.instance_of?(Spree::Product)
                 spree_storefront_resource_url(resource, preview_id: resource.id)
               else
                 spree_storefront_resource_url(resource)
@@ -318,8 +318,6 @@ module Spree
       # @param options [Hash] additional options for rendering
       # @return [String] the rendered navigation HTML
       def render_navigation(context = :sidebar, **options)
-        return '' if Spree::Admin::RuntimeConfig.legacy_sidebar_navigation
-
         items = navigation_items(context)
         return '' if items.empty?
 

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

@@ -90,9 +90,9 @@ module Spree
       end
 
       def product_filter_stock_dropdown_value
-        if params.dig(:q, :in_stock_items) == '1'
+        if params.dig(:q, :in_stock) == '1'
           Spree.t('admin.products.in_stock')
-        elsif params.dig(:q, :out_of_stock_items) == '1'
+        elsif params.dig(:q, :out_of_stock) == '1'
           Spree.t('admin.products.out_of_stock')
         else
           Spree.t('admin.products.any_stock')
@@ -111,9 +111,6 @@ module Spree
         [:admin, @search]
       end
 
-      def sorted_product_properties(product)
-        product.product_properties.sort_by { |product_property| product_property.property.position }
-      end
     end
   end
 end

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

@@ -9,17 +9,6 @@ module Spree
         @tags_json_array ||= tags_scope.pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json
       end
 
-      def post_tags_scope
-        @post_tags_scope ||= ActsAsTaggableOn::Tag.
-                             joins(:taggings).
-                             where(ActsAsTaggableOn.taggings_table => { taggable_type: 'Spree::Post' }).
-                             for_context(:tags).for_tenant(current_store.id)
-      end
-
-      def post_tags_json_array
-        @post_tags_json_array ||= post_tags_scope.pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json
-      end
-
       def user_tags_scope
         @user_tags_scope ||= ActsAsTaggableOn::Tag.
                              joins(:taggings).

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

@@ -3,7 +3,7 @@ import { Controller } from "@hotwired/stimulus"
 export default class extends Controller {
   static targets = ["input", "clear"]
 
-  connect() {
+  inputTargetConnected() {
     this.toggleClearButton()
   }
 

data/app/models/action_text/video_embed.rb

@@ -0,0 +1,13 @@
+module ActionText
+  class VideoEmbed < ApplicationRecord
+    include ActionText::Attachable
+
+    validates :url, :raw_html, :thumbnail_url, presence: true
+
+    # `to_partial_path` for the storefront render is by default "action_text/video_embeds/video_embed"
+
+    def to_trix_content_attachment_partial_path
+      'action_text/video_embeds/thumbnail'
+    end
+  end
+end

data/app/presenters/spree/admin/order_summary_presenter.rb

@@ -13,6 +13,7 @@ module Spree
         [
           *metadata_rows,
           :separator,
+          locale_row,
           currency_row,
           subtotal_row,
           shipping_row,
@@ -71,6 +72,17 @@ module Spree
         rows
       end
 
+      def locale_row
+        return nil if order.locale.blank?
+
+        {
+          label: Spree.t(:locale),
+          value: order.locale,
+          id: 'locale',
+          type: :code
+        }
+      end
+
       def currency_row
         {
           label: Spree.t(:currency),

data/app/subscribers/spree/admin/import_row_subscriber.rb

@@ -21,7 +21,7 @@ module Spree
         import_row_id = event.payload['id']
         return unless import_row_id
 
-        import_row = Spree::ImportRow.find_by(id: import_row_id)
+        import_row = Spree::ImportRow.find_by_prefix_id(import_row_id)
         return unless import_row
 
         add_row_to_import_view(import_row)

data/app/subscribers/spree/admin/import_subscriber.rb

@@ -19,7 +19,7 @@ module Spree
         import_id = event.payload['id']
         return unless import_id
 
-        import = Spree::Import.find_by(id: import_id)
+        import = Spree::Import.find_by_prefix_id(import_id)
         return unless import
         return unless import.respond_to?(:broadcast_update_to)
 

data/app/views/action_text/video_embeds/_thumbnail.html.erb

@@ -0,0 +1 @@
+<%= image_tag video_embed.thumbnail_url %>

data/app/views/action_text/video_embeds/_video_embed.html.erb

@@ -0,0 +1,3 @@
+<div class="video-embed-container mt-4 mb-4">
+  <%= video_embed.raw_html.html_safe %>
+</div>

data/app/views/layouts/action_text/contents/_content.html.erb

@@ -0,0 +1,3 @@
+<div class="trix-content">
+  <%= yield -%>
+</div>

data/app/views/spree/admin/api_keys/_token_card.html.erb

@@ -3,25 +3,52 @@
     <h5 class="card-title"><%= Spree.t(:api_key) %></h5>
   </div>
   <div class="card-body">
-    <% if @api_key.active? %>
+    <% if !@api_key.active? %>
+      <div class="bg-red-50 border border-red-200 rounded-md p-4">
+        <div class="flex items-center">
+          <%= icon 'alert-triangle', class: 'text-red-500 mr-2' %>
+          <span class="text-red-700"><%= Spree.t('admin.api_keys.key_revoked_message') %></span>
+        </div>
+      </div>
+    <% elsif @api_key.secret? && flash[:plaintext_token].present? %>
+      <div class="bg-yellow-50 border border-yellow-200 rounded-md p-4 mb-4">
+        <div class="flex items-center">
+          <%= icon 'alert-triangle', class: 'text-yellow-600 mr-2' %>
+          <span class="text-yellow-800 text-sm font-medium"><%= Spree.t('admin.api_keys.token_warning') %></span>
+        </div>
+      </div>
       <div data-controller="password-visibility" class="input-group gap-0 pr-1">
-        <input type="password" class="grow text-truncate" data-password-visibility-target="input" spellcheck="false" value="<%= @api_key.token %>" readonly>
+        <input type="password" class="grow text-truncate" data-password-visibility-target="input" spellcheck="false" value="<%= flash[:plaintext_token] %>" readonly>
 
         <button type="button" class="btn hover:bg-gray-100 p-1 mr-1 rounded" data-action="password-visibility#toggle">
           <span data-password-visibility-target="icon"><%= icon 'eye', class: 'mr-0' %></span>
           <span data-password-visibility-target="icon" class="hidden"><%= icon 'eye-off', class: 'mr-0' %></span>
         </button>
 
-        <%= clipboard_component(@api_key.token, 
-              button_class: 'btn hover:bg-gray-100 p-1 rounded', 
+        <%= clipboard_component(flash[:plaintext_token],
+              button_class: 'btn hover:bg-gray-100 p-1 rounded',
               icon_class: 'mr-0') %>
       </div>
-    <% else %>
-      <div class="bg-red-50 border border-red-200 rounded-md p-4">
-        <div class="flex items-center">
-          <%= icon 'alert-triangle', class: 'text-red-500 mr-2' %>
-          <span class="text-red-700"><%= Spree.t('admin.api_keys.key_revoked_message') %></span>
+    <% elsif @api_key.secret? %>
+      <div class="bg-gray-50 border border-gray-200 rounded-md p-4">
+        <div class="flex items-center mb-2">
+          <%= icon 'lock', class: 'text-gray-500 mr-2' %>
+          <span class="text-gray-700 text-sm font-medium"><%= Spree.t('admin.api_keys.secret_key_hidden') %></span>
         </div>
+        <code class="text-sm text-gray-500"><%= @api_key.token_prefix %><%= '***************' %></code>
+      </div>
+    <% else %>
+      <div data-controller="password-visibility" class="input-group gap-0 pr-1">
+        <input type="password" class="grow text-truncate" data-password-visibility-target="input" spellcheck="false" value="<%= @api_key.token %>" readonly>
+
+        <button type="button" class="btn hover:bg-gray-100 p-1 mr-1 rounded" data-action="password-visibility#toggle">
+          <span data-password-visibility-target="icon"><%= icon 'eye', class: 'mr-0' %></span>
+          <span data-password-visibility-target="icon" class="hidden"><%= icon 'eye-off', class: 'mr-0' %></span>
+        </button>
+
+        <%= clipboard_component(@api_key.token,
+              button_class: 'btn hover:bg-gray-100 p-1 rounded',
+              icon_class: 'mr-0') %>
       </div>
     <% end %>
   </div>

data/app/views/spree/admin/api_keys/_usage_info.html.erb

@@ -8,9 +8,10 @@
     </p>
 
     <h6 class="font-medium text-sm mb-2"><%= Spree.t('admin.api_keys.example_request') %></h6>
+    <% example_token = flash[:plaintext_token] || @api_key.token || "#{@api_key.token_prefix}..." %>
     <div class="bg-gray-900 rounded-md p-4 overflow-x-auto">
-      <pre class="text-green-400 text-sm font-mono whitespace-pre-wrap"><code>curl -X GET "https://your-store.com/api/v3/store/products" \
-  -H "X-Spree-Api-Key: <%= @api_key.token %>"</code></pre>
+      <pre class="text-green-400 text-sm font-mono"><code class="bg-transparent text-green-500">curl -X GET "<%= spree.api_v3_store_products_url(host: current_store.url_or_custom_domain) %>" \
+  -H "x-spree-api-key: <strong class="text-white"><%= example_token %></strong>"</code></pre>
     </div>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
 <%= turbo_render_alerts %>
 
 <%= turbo_stream.replace 'export-dialog' do %>
-  <%= render 'spree/admin/shared/export_modal', export_type: @export.type %>
+  <%= render 'spree/admin/shared/export_modal', export_type: @object.type %>
 <% end %>

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

@@ -1,15 +1,15 @@
 <%= turbo_frame_tag :export_dialog do %>
-  <%= form_for @export, url: spree.admin_exports_path do |f| %>
+  <%= form_for @object, url: spree.admin_exports_path, as: :export do |f| %>
     <%= f.hidden_field :type %>
     <%= f.hidden_field :search_params %>
     <div class="dialog-header">
       <h5 class="dialog-title">
-        <%= Spree.t(:export) + ' ' + plural_resource_name(@export.model_class) %>
+        <%= Spree.t(:export) + ' ' + plural_resource_name(@object.model_class) %>
       </h5>
       <button type="button" class="btn-close" data-action="click->export-dialog#close" aria-label="Close"></button>
     </div>
     <div class="dialog-body">
-      <%= render 'spree/admin/shared/error_messages', target: @export %>
+      <%= render 'spree/admin/shared/error_messages', target: @object %>
       <div class="custom-control custom-radio hover:bg-gray-50 rounded-lg p-3">
         <%= f.radio_button :record_selection, 'filtered', class: 'custom-control-input' %>
         <%= f.label :record_selection, for: :export_record_selection_filtered, class: 'custom-control-label flex-col items-start' do %>

data/app/views/spree/admin/payment_methods/descriptions/_gateway.html.erb

@@ -1 +1 @@
-Classic ActiveMerchant gateway provided by community.
+Classic payment gateway provided by community.

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

@@ -31,19 +31,20 @@
     <div class="table-responsive">
       <table class="table">
         <thead>
-        <tr>
-          <th scope="col"><%= Spree.t(:name) %></th>
-          <th scope="col"><%= Spree.t(:description) %></th>
-          <th scope="col"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/payment_methods/available_payment_method', collection: available_payment_methods, as: :payment_method %>
-      </tbody>
-    </table>
+          <tr>
+            <th scope="col"><%= Spree.t(:name) %></th>
+            <th scope="col"><%= Spree.t(:description) %></th>
+            <th scope="col"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= render partial: 'spree/admin/payment_methods/available_payment_method', collection: available_payment_methods, as: :payment_method %>
+        </tbody>
+      </table>
+    </div>
   </div>
 <% end %>
 
 <p class="text-gray-600 text-center my-12">
   Find more payment methods in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank' %>
-</p>
+</p>

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

@@ -7,8 +7,6 @@
     <% end unless @product.has_variants? %>
     <%= render 'spree/admin/products/form/variants', f: f %>
     <%= render 'spree/admin/products/form/inventory', f: f unless @product.has_variants? %>
-    <%= render 'spree/admin/products/form/properties', f: f if Spree::Config[:product_properties_enabled] %>
-
     <%= render_admin_partials(:product_form_partials, f: f, product: @product) %>
   </div>
   <div class="col-span-12 md:col-span-4">

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

@@ -16,7 +16,7 @@
   <%= dropdown_menu do %>
     <h6 class="dropdown-header"><%= Spree.t('admin.products.by_status') %>:</h6>
 
-    <%= active_link_to Spree.t('admin.products.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock_items out_of_stock_items] ).all?(&:blank?) %>
+    <%= active_link_to Spree.t('admin.products.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock out_of_stock] ).all?(&:blank?) %>
     <%= link_to Spree.t('admin.products.active'),
       params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :active}}),
       class: "dropdown-item #{'active' if params[:q][:status_eq] == 'active'}" %>
@@ -31,12 +31,12 @@
 
     <h6 class="dropdown-header"><%= Spree.t('admin.products.by_stock') %>:</h6>
 
-    <%= active_link_to Spree.t('admin.products.any_stock'), params.to_unsafe_h.deep_merge({page: nil, q: {in_stock_items: nil, out_of_stock_items: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock_items out_of_stock_items] ).all?(&:blank?) %>
+    <%= active_link_to Spree.t('admin.products.any_stock'), params.to_unsafe_h.deep_merge({page: nil, q: {in_stock: nil, out_of_stock: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock out_of_stock] ).all?(&:blank?) %>
     <%= link_to Spree.t('admin.products.in_stock'),
-        params.to_unsafe_h.deep_merge({page: nil, q: {in_stock_items: '1', out_of_stock_items: nil}}),
-        class: "dropdown-item #{'active' if params[:q][:in_stock_items] == '1'}" %>
+        params.to_unsafe_h.deep_merge({page: nil, q: {in_stock: '1', out_of_stock: nil}}),
+        class: "dropdown-item #{'active' if params[:q][:in_stock] == '1'}" %>
       <%= link_to Spree.t('admin.products.out_of_stock'),
-        params.to_unsafe_h.deep_merge({page: nil, q: {out_of_stock_items: '1', in_stock_items: nil}}),
-        class: "dropdown-item #{'active' if params[:q][:out_of_stock_items] == '1'}" %>
+        params.to_unsafe_h.deep_merge({page: nil, q: {out_of_stock: '1', in_stock: nil}}),
+        class: "dropdown-item #{'active' if params[:q][:out_of_stock] == '1'}" %>
   <% end %>
 <% end %>

data/app/views/spree/admin/shared/sidebar/_store_nav.html.erb

@@ -1,131 +1,9 @@
-<% if Spree::Admin::RuntimeConfig.legacy_sidebar_navigation %>
-  <%# Legacy navigation system %>
-  <% if settings_area? %>
-  <ul class="nav flex-col">
-    <% if can?(:manage, current_store) %>
-      <%= nav_item(Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), icon: 'building-store', active: params[:section] == 'general-settings') %>
-    <% end %>
-
-    <% if can?(:manage, Spree.admin_user_class) %>
-      <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users', active: %w[admin_users invitations roles].include?(controller_name)) %>
-    <% end %>
-
-    <%= nav_item(Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), icon: 'send', active: params[:section] == 'emails') if can?(:manage, current_store) %>
-    <%= nav_item(Spree.t(:policies), spree.admin_policies_path, icon: 'list-check') if can?(:manage, Spree::Policy) %>
-    <%= nav_item(Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), icon: 'shopping-cart', active: params[:section] == 'checkout') if can?(:manage, current_store) %>
-    <%= render_admin_partials(:store_settings_nav_partials) %>
-
-    <% if defined?(Spree::CustomDomain) && can?(:manage, Spree::CustomDomain) %>
-      <%= nav_item(Spree.t(:domains), spree.admin_custom_domains_path, icon: 'world-www') %>
-    <% end %>
-
-    <% if can?(:manage, Spree::PaymentMethod) %>
-      <%= nav_item(Spree.t(:payments), spree.admin_payment_methods_path, icon: 'credit-card') %>
-    <% end %>
-
-    <% if can?(:manage, Spree::Zone) %>
-      <%= nav_item(Spree.t(:zones), spree.admin_zones_path, icon: 'world', active: %w[zones countries states].include?(controller_name)) %>
-    <% end %>
-
-    <% if can?(:manage, Spree::ShippingMethod) %>
-      <%= nav_item(Spree.t(:shipping), spree.admin_shipping_methods_path, icon: 'truck', active: %w[shipping_methods shipping_categories].include?(controller_name)) %>
-    <% end %>
-
-    <% if can?(:manage, Spree::TaxRate) %>
-      <%= nav_item(Spree.t(:tax), spree.admin_tax_rates_path, icon: 'receipt-tax', active: %w[tax_rates tax_categories stripe_tax_registrations].include?(controller_name)) %>
-    <% end %>
-
-    <% if can?(:manage, Spree::ReturnAuthorizationReason) %>
-      <%= nav_item(Spree.t(:returns), spree.admin_return_authorization_reasons_path, icon: 'receipt-refund', active: %w[refund_reasons reimbursement_types return_authorization_reasons].include?(controller_name)) %>
-    <% end %>
-
-    <% if can?(:manage, Spree::StockLocation) %>
-      <%= nav_item(Spree.t(:stock_locations), spree.admin_stock_locations_path, icon: 'map-pin') %>
-    <% end %>
-
-    <% if can?(:manage, Spree::MetafieldDefinition) %>
-      <%= nav_item(Spree.t(:metafield_definitions), spree.admin_metafield_definitions_path, icon: 'list-details') %>
-    <% end %>
-
-    <% if can?(:manage, Spree::Store) %>
-      <% if spree.respond_to?(:admin_audits_path) %>
-        <%= nav_item(Spree.t('admin.audit_log'), spree.admin_audits_path, icon: 'history', active: %w[audits exports imports].include?(controller_name)) %>
-      <% else %>
-        <li class="nav-item">
-          <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link flex items-center w-full' do %>
-            <%= icon 'history' %>
-            <%= Spree.t('admin.audit_log') %>
-
-            <span class="badge ml-auto rounded-full" data-controller="tooltip">
-              Enterprise
-              <%= tooltip("This feature is part of the Enterprise Edition.") %>
-            </span>
-          <% end %>
-        </li>
-      <% end %>
-    <% end %>
-
-    <% if defined?(Spree::OauthApplication) && can?(:manage, Spree::OauthApplication) %>
-      <%= nav_item(Spree.t(:developers), spree.admin_oauth_applications_path, icon: 'terminal', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
-    <% end %>
-
-    <%= nav_item(Spree.t('admin.edit_profile'), spree.edit_admin_profile_path, icon: 'user-scan') %>
-
-    <%= render_admin_partials(:settings_nav_partials) %>
-  </ul>
+<% if settings_area? %>
+  <%= render_navigation(:settings) %>
 <% else %>
-  <ul class="nav flex-col">
-    <% if can?(:manage, current_store) %>
-      <% unless current_store.setup_completed? %>
-        <%= nav_item(nil, spree.admin_getting_started_path, icon: 'map') do %>
-          <%= icon 'map' %>
-          <%= Spree.t('admin.getting_started') %>
-          <span class="badge ml-auto badge-info">
-            <%= current_store.setup_tasks_done %><span class="opacity-50">/<%= current_store.setup_tasks_total %></span>
-          </span>
-        <% end %>
-      <% end %>
-    <% end %>
-
-    <%= nav_item(Spree.t(:home), spree.admin_path, icon: 'home', active: controller_name == 'dashboard' && action_name == 'show') %>
-
-    <%= render 'spree/admin/shared/sidebar/orders_nav' %>
-    <%= render 'spree/admin/shared/sidebar/returns_nav' %>
-    <%= render 'spree/admin/shared/sidebar/products_nav' %>
-    <%= render 'spree/admin/shared/sidebar/vendors_nav' %>
-    <%= render 'spree/admin/shared/sidebar/customers_nav' %>
-    <%= render 'spree/admin/shared/sidebar/promotions_nav' %>
-
-    <% if can?(:manage, Spree::Report) %>
-      <%= nav_item(Spree.t(:reports), spree.admin_reports_path, icon: 'chart-bar') %>
-    <% end %>
-
-    <%= render_admin_partials(:store_nav_partials) %>
-
-    <%= render 'spree/admin/shared/sidebar/storefront_nav' %>
-    <%= render 'spree/admin/shared/sidebar/integrations_nav' %>
-  </ul>
+  <%= render_navigation(:sidebar) %>
 
   <div class="mt-auto flex flex-col">
     <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>
-
-    <ul class="nav flex-col mb-2">
-      <% if can?(:manage, current_store) %>
-        <%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>
-        <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users') %>
-      <% end %>
-    </ul>
   </div>
-  <% end %>
-<% else %>
-  <%# New navigation system %>
-  <% if settings_area? %>
-    <%= render_navigation(:settings) %>
-  <% else %>
-    <%= render_navigation(:sidebar) %>
-
-    <div class="mt-auto flex flex-col">
-      <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>
-    </div>
-  <% end %>
 <% end %>

data/config/initializers/oembed.rb

@@ -0,0 +1 @@
+OEmbed::Providers.register_all

data/config/initializers/spree_admin_navigation.rb

@@ -126,12 +126,6 @@ Rails.application.config.after_initialize do
                 active: -> { %w[option_types option_values].include?(controller_name) },
                 if: -> { can?(:manage, Spree::OptionType) }
 
-    # Properties
-    products.add :properties,
-                label: :properties,
-                url: :admin_properties_path,
-                position: 50,
-                if: -> { can?(:manage, Spree::Property) && Spree::Config.product_properties_enabled }
   end
 
   # Customers with submenu
@@ -179,15 +173,6 @@ Rails.application.config.after_initialize do
           position: 60,
           if: -> { can?(:manage, Spree::Report) }
 
-  # Posts (Blog)
-  sidebar_nav.add :posts,
-          label: :posts,
-          url: :admin_posts_path,
-          icon: 'article',
-          position: 70,
-          active: -> { %w[posts post_categories].include?(controller_name) },
-          if: -> { can?(:manage, Spree::Post) }
-
   # Integrations
   sidebar_nav.add :integrations,
           label: :integrations,