Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Remove deprecated admin legacy nav (#13687)
Damian Legawiecd15c2186fcec
diff --git a/spree/admin/app/helpers/spree/admin/navigation_helper.rb b/spree/admin/app/helpers/spree/admin/navigation_helper.rbindex 776641f33f..3747b4a12a 100644--- a/spree/admin/app/helpers/spree/admin/navigation_helper.rb+++ b/spree/admin/app/helpers/spree/admin/navigation_helper.rb@@ -318,8 +318,6 @@ module Spree# @param options [Hash] additional options for rendering# @return [String] the rendered navigation HTMLdef render_navigation(context = :sidebar, **options)- return '' if Spree::Admin::RuntimeConfig.legacy_sidebar_navigation-items = navigation_items(context)return '' if items.empty?diff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erbdeleted file mode 100644index 4f7360c5c2..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb+++ /dev/null@@ -1,15 +0,0 @@-<% if can?(:manage, Spree.user_class) %>- <% customers_active = %w[users newsletter_subscribers].include?(controller_name) %>- <%= nav_item(Spree.t(:customers), spree.admin_users_path, icon: 'users', active: customers_active) %>-- <%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless customers_active %>hidden<% end %>">- <%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>- </ul>-- <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown hidden dropdown-container">- <%= nav_item(Spree.t(:customers), spree.admin_users_path) %>- <%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>- </ul>-<% end %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erbdeleted file mode 100644index a5756be0fe..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb+++ /dev/null@@ -1,3 +0,0 @@-<% if can?(:manage, Spree::Integration) %>- <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug-connected') %>-<% end %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erbdeleted file mode 100644index a53373e90e..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb+++ /dev/null@@ -1,45 +0,0 @@-<% orders_active = %[orders checkouts].include?(controller_name) || @order&.present? || @parent&.is_a?(Spree::Order) %>-<% if can?(:manage, Spree::Order) %>- <% orders_label = Spree.t(:orders) %>- <% if ready_to_ship_orders_count&.positive? %>- <% orders_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>- <% end %>-- <%= nav_item(orders_label.html_safe, spree.admin_orders_path, icon: 'inbox', active: orders_active) %>-- <%# Submenu for expanded sidebar (only shown when active) %>- <% if orders_active && (ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts)) %>- <ul class="nav-submenu">- <% if ready_to_ship_orders_count&.positive? %>- <% fulfill_label = Spree.t('admin.orders.orders_to_fulfill') %>- <% fulfill_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>- <%= nav_item(fulfill_label.html_safe, spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]}), active: params.dig(:q, :shipment_state_not_in).present?) %>- <% end %>-- <% if can?(:manage, :checkouts) %>- <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path, active: controller_name == 'checkouts' || (@order.present? && [email protected]?)) %>- <% end %>-- <%= render_admin_partials(:store_orders_nav_partials) %>- </ul>- <% end %>-- <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <% if ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts) %>- <ul class="nav-submenu-dropdown hidden dropdown-container">- <%= nav_item(Spree.t(:orders), spree.admin_orders_path) %>-- <% if ready_to_ship_orders_count&.positive? %>- <% fulfill_label = Spree.t('admin.orders.orders_to_fulfill') %>- <% fulfill_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>- <%= nav_item(fulfill_label.html_safe, spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]})) %>- <% end %>-- <% if can?(:manage, :checkouts) %>- <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path) %>- <% end %>-- <%= render_admin_partials(:store_orders_nav_partials) %>- </ul>- <% end %>-<% end %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erbdeleted file mode 100644index e150a4b137..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb+++ /dev/null@@ -1,42 +0,0 @@-<% products_active = %w[products external_categories taxons taxonomies option_types option_values properties stock_items stock_transfers].include?(controller_name) || request.path.include?('products') %>-<% if can?(:manage, Spree::Product) %>- <%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'package', active: products_active) %>-- <%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless products_active %>hidden<% end %>">- <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>- <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>- <% end %>- <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>- <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>- <% end %>- <% if can?(:manage, Spree::OptionType) %>- <%= nav_item(Spree.t(:options), spree.admin_option_types_path, active: %w[option_types option_values].include?(controller_name)) %>- <% end %>- <% if can?(:manage, Spree::Property) && Spree::Config[:product_properties_enabled] %>- <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>- <% end %>-- <%= render_admin_partials(:store_products_nav_partials) %>- </ul>-- <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown hidden dropdown-container">- <%= nav_item(Spree.t(:products), spree.admin_products_path) %>-- <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>- <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path) %>- <% end %>- <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>- <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>- <% end %>- <% if can?(:manage, Spree::OptionType) %>- <%= nav_item(Spree.t(:options), spree.admin_option_types_path) %>- <% end %>- <% if can?(:manage, Spree::Property) && Spree::Config[:product_properties_enabled] %>- <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>- <% end %>-- <%= render_admin_partials(:store_products_nav_partials) %>- </ul>-<% end %>diff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erbdeleted file mode 100644index 90922802c4..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb+++ /dev/null@@ -1,15 +0,0 @@-<% if can?(:manage, Spree::Promotion) %>- <% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) && @user.nil? %>- <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path, icon: 'discount', active: discounts_active) %>-- <%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless discounts_active %>hidden<% end %>">- <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path, active: %w[gift_cards gift_card_batches].include?(controller_name)) %>- </ul>-- <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown hidden dropdown-container">- <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path) %>- <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path) %>- </ul>-<% end %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erbdeleted file mode 100644index 78a0c1daac..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb+++ /dev/null@@ -1,26 +0,0 @@-<% returns_active = %[customer_returns return_authorizations].include?(controller_name) && !@order %>--<% if can?(:manage, Spree::CustomerReturn) || can?(:manage, Spree::ReturnAuthorization) %>- <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path, icon: 'receipt-refund', active: returns_active) %>-- <%# Submenu for expanded sidebar (only shown when active) %>- <% if returns_active %>- <ul class="nav-submenu">- <% if can?(:manage, Spree::ReturnAuthorization) %>- <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>- <% end %>- <%= render_admin_partials(:returns_nav_partials) %>- </ul>- <% end %>-- <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <% if can?(:manage, Spree::ReturnAuthorization) %>- <ul class="nav-submenu-dropdown hidden dropdown-container">- <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path) %>-- <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>-- <%= render_admin_partials(:returns_nav_partials) %>- </ul>- <% end %>-<% end %>\ No newline at end of filediff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erbindex 2b38918c7d..3e2c0e4b30 100644--- a/spree/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb+++ b/spree/admin/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 %>diff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erbdeleted file mode 100644index 7593f78d9e..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb+++ /dev/null@@ -1,38 +0,0 @@-<% if can?(:manage, Spree::Theme) %>- <% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>- <%= nav_item(Spree.t('admin.storefront'), spree.admin_themes_path, icon: 'building-store', active: storefront_active) %>-- <%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless storefront_active %>hidden<% end %>">- <% if can?(:manage, Spree::Theme) %>- <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>- <% end %>-- <% if can?(:manage, Spree::Page) %>- <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>- <% end %>-- <% if can?(:manage, current_store) %>- <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>- <% end %>-- <%= render_admin_partials(:storefront_nav_partials) %>- </ul>-- <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown hidden dropdown-container">- <% if can?(:manage, Spree::Theme) %>- <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>- <% end %>-- <% if can?(:manage, Spree::Page) %>- <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>- <% end %>-- <% if can?(:manage, current_store) %>- <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>- <% end %>-- <%= render_admin_partials(:storefront_nav_partials) %>- </ul>-<% end %>diff --git a/spree/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb b/spree/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erbdeleted file mode 100644index e0c98de894..0000000000--- a/spree/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb+++ /dev/null@@ -1,17 +0,0 @@-<% if can?(:manage, current_store) %>- <% if enterprise_edition? %>- <%= render_admin_partials(:vendors_nav_partials) %>- <% else %>- <li class="nav-item">- <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link flex items-center w-full', data: { controller: 'tooltip' } do %>- <%= icon 'heart-handshake' %>- <%= Spree.t(:vendors) %>-- <span class="badge ml-auto rounded-full">- Enterprise- </span>- <%= tooltip('This feature is part of the Enterprise Edition.') %>- <% end %>- </li>- <% end %>-<% end%>\ No newline at end of filediff --git a/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rb b/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rbindex b1c5613347..5c977ce86b 100644--- a/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rb+++ b/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rb@@ -123,13 +123,6 @@ describe Spree::Admin::NavigationHelper, type: :helper dobefore donav.clear- allow(Spree::Admin::RuntimeConfig).to receive(:legacy_sidebar_navigation).and_return(false)- end-- it 'returns empty string when legacy navigation is enabled' do- allow(Spree::Admin::RuntimeConfig).to receive(:legacy_sidebar_navigation).and_return(true)-- expect(helper.render_navigation(:sidebar)).to eq('')endit 'returns empty string when no items are visible' do