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
Admin: Replace bootstrap collapsable with standard details/summary el… (#13232)
Damian Legawiecd69c81d79f72
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scssindex ab078dda02..7162cc5914 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss@@ -70,7 +70,7 @@ button[disabled] .show-when-enabled { display: none; }.hover-light {&:hover, &:focus {- background-color: rgba($light, 0.5);+ background-color: rgba($light, 0.75);text-decoration: none;}}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss b/admin/app/assets/stylesheets/spree/admin/components/_cards.scssindex 2580f9303e..9235a0a851 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_cards.scss@@ -98,33 +98,49 @@@extend .overflow-hidden;.card-header {- @extend .p-0;+ &:hover {+ background-color: $light !important;+ }+ }+ .card-body {+ border-top: 1px solid $gray-50;}- .card-header a {- padding: 0.75rem !important;- .ti-chevron-down {- color: $gray-400;- }+ // Arrow rotation when details is open+ &[open] .arrow {+ transform: rotate(90deg) !important;+ }- &:hover {- text-decoration: none !important;+ &:not([open]) .arrow {+ transform: rotate(0deg) !important;+ }+}- .ti-chevron-down {- color: $gray-900 !important;+.collapsable-card, .card {+ // Details/Summary styling for cards+ details {+ summary {+ cursor: pointer;+ list-style: none;+ user-select: none;++ &::-webkit-details-marker {+ display: none;+ }++ &::marker {+ display: none;}- }- }- &:hover {- .card-header a {- text-decoration: none !important;- .ti-chevron-down {- color: $gray-500;+ // Ensure summary is clickable and accessible+ &[role="button"] {+ outline: none;++ &:focus {+ outline: 2px solid $primary;+ outline-offset: -2px;+ }}}}- .card-body {- border-top: 1px solid $gray-50;- }}\ No newline at end of filediff --git a/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb b/admin/app/views/spree/admin/dashboard/_setup_progress.html.erbindex 0e88abd99c..9c93f3926d 100644--- a/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb+++ b/admin/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 progressdiff --git a/admin/app/views/spree/admin/dashboard/_setup_tasks.html.erb b/admin/app/views/spree/admin/dashboard/_setup_tasks.html.erbindex 5663a703ff..3838fd0db3 100644--- a/admin/app/views/spree/admin/dashboard/_setup_tasks.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/_line_items.html.erb b/admin/app/views/spree/admin/orders/_line_items.html.erbindex 59b5a87f90..4ca9f46d74 100644--- a/admin/app/views/spree/admin/orders/_line_items.html.erb+++ b/admin/app/views/spree/admin/orders/_line_items.html.erb@@ -1,7 +1,6 @@--<%= turbo_frame_tag dom_id(@order, :line_items), class: "card mb-4" do %>- <% if @line_items.any? %>- <div class="card-header d-flex justify-content-between align-items-center">+<% if @line_items.any? %>+ <details class="card mb-4" <% if [email protected]? || params[:line_item_updated].present? %>open<% end %>>+ <summary class="card-header d-flex justify-content-between align-items-center list-style-none cursor-pointer border-0 bg-transparent"><h5 class="card-title d-flex align-items-center"><%= icon('shopping-cart', class: 'mr-2') %><%= Spree.t(:line_items) %>@@ -11,45 +10,43 @@<% if can?(:create, Spree::LineItem.new(order: @order)) %><%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary btn-sm" %><% end %>- <% if @order.completed? %>- <button class="btn btn-light btn-sm" type="button" data-toggle="collapse" data-target="#line-items" aria-expanded="false" aria-controls="collapseExample">- <%= Spree.t(:show_details) %>- <%= icon('selector', class: 'mr-0 ml-1') %>- </button>- <% end %>+ <span class="btn btn-light btn-sm d-inline-flex align-items-center">+ <%= Spree.t(:show_details) %>+ <%= icon('selector', class: 'mr-0 ml-1 arrow') %>+ </span></div>- </div>- <div class="card-body mb-0 p-0 <% if @order.completed? && params[:line_item_updated].blank? %>collapse<% else %>show<% end %>" id="line-items">- <div class="order-line-items">- <div class="d-flex align-items-center text-muted border-bottom py-2 px-3 font-size-sm order-line-items__row">- <div class="w-35">- <%= Spree.t(:item_description) %>- </div>- <div class="w-10">- <%= Spree.t(:price) %>- </div>- <div class="w-10">- <%= Spree.t(:quantity) %>- </div>- <div class="w-10">- <%= Spree.t(:subtotal) %>- </div>- <div class="w-10">- <%= Spree.t(:tax) %>- </div>- <div class="w-10">- <%= Spree.t(:discount) %>- </div>- <div class="w-10">- <%= Spree.t(:total) %>- </div>- <div class="w-5">- </div>+ </summary>+ <div class="card-body mb-0 p-0" id="line-items">+ <div class="d-flex align-items-center text-muted border-bottom py-2 px-3 font-size-sm order-line-items__row bg-light border-top">+ <div class="w-35">+ <%= Spree.t(:item_description) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:price) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:quantity) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:subtotal) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:tax) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:discount) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:total) %>+ </div>+ <div class="w-5"></div>- <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %></div>+ <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %></div>- <% elsif can?(:create, Spree::LineItem.new(order: @order)) %>+ </details>+<% elsif can?(:create, Spree::LineItem.new(order: @order)) %>+ <div class="card mb-4"><div class="card-header"><h5 class="card-title"><%= icon('shopping-cart', class: 'mr-2') %>@@ -59,6 +56,5 @@<div class="card-body"><%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary w-100 py-3" %></div>- <% end %>+ </div><% end %>-diff --git a/admin/spec/features/spree/admin/getting_started_spec.rb b/admin/spec/features/spree/admin/getting_started_spec.rbindex b41724cfca..c30c4242e6 100644--- a/admin/spec/features/spree/admin/getting_started_spec.rb+++ b/admin/spec/features/spree/admin/getting_started_spec.rb@@ -6,12 +6,12 @@ RSpec.feature 'Getting Started' dolet(:us_country) { Spree::Country.find_by(iso: 'US') }let!(:ny_state) { create(:state, name: 'New York', abbr: 'NY', country: us_country) }- describe 'Getting started tasks', js: true do+ describe 'Getting started tasks' dodescribe 'setup taxes collection' docontext 'when there are no tax rates' doit 'asks to setup taxes' dovisit spree.admin_getting_started_path- click_on Spree.t('admin.store_setup_tasks.setup_taxes_collection')+ find('#setup_task_setup_taxes_collection summary').clickexpect(page).to have_text Spree.t('admin.store_setup_tasks.taxes.copy', link: spree.admin_tax_rates_path)end@@ -24,7 +24,9 @@ RSpec.feature 'Getting Started' doendit 'confirms the setup' do- expect(page.find('span', text: Spree.t('admin.store_setup_tasks.setup_taxes_collection')).ancestor('a')).to have_css('i.bg-success')+ find('#setup_task_setup_taxes_collection summary').click++ expect(page).to have_text("You're all set! You can always manage your taxes")endendend@@ -34,8 +36,8 @@ RSpec.feature 'Getting Started' dovisit spree.admin_getting_started_pathend- scenario 'Retailer adds and updates the customer support email' do- click_on 'Set customer support email'+ scenario 'adds and updates the customer support email' do+ find('#setup_task_set_customer_support_email summary').clickwithin '#set_customer_support_email' doclick_on 'Edit'