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
Rebuild the UI of product/variant pickers
Damian Legawiec52875b093921
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss b/admin/app/assets/stylesheets/spree/admin/components/_modals.scssindex ed1cc0919a..312b9575cb 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss@@ -13,8 +13,10 @@ body.modal-open {border-bottom: 0;.modal-title {- font-size: $font-size-lg;- font-weight: 600;+ margin-bottom: 0;+ font-size: $font-size-plus;+ font-weight: $font-weight-bold;+ font-family: $font-family-sans-serif;}.btn-close {@@ -24,28 +26,14 @@ body.modal-open {.modal-footer {display: flex;justify-content: flex-end;- padding: 1.5rem;+ padding: $modal-inner-padding;border-top: 0;.btn {- @extend .px-4;- @extend .py-2;- @extend .m-0;- }-- .btn-primary {- display: inline-flex !important;- width: auto !important;- }- .btn-light {display: inline-flex !important;width: auto !important;}}-.modal-content {- box-shadow: none;- border: 0px none;-}.bulk-panel-container {@extend .d-inline-flex;diff --git a/admin/app/assets/stylesheets/spree/admin/components/_search_picker.scss b/admin/app/assets/stylesheets/spree/admin/components/_search_picker.scssnew file mode 100644index 0000000000..1b5f95eb0c--- /dev/null+++ b/admin/app/assets/stylesheets/spree/admin/components/_search_picker.scss@@ -0,0 +1,55 @@+.search-results {+ @extend .overflow-y-auto;++ height: 250px;+ overflow-x: hidden;+ padding-left: 1.25rem;+ padding-right: 0.25rem;+ margin-right: 1rem;+ margin-top: 1rem;+ margin-bottom: 1rem;+}++.search-picker__option {+ position: relative;+ margin-bottom: 0.5rem;+ display: flex;+ cursor: pointer;+ align-items: center;+ border: 1px solid transparent;+ border-radius: $border-radius;+ padding-right: 2rem;++ label {+ margin-bottom: 0;+ width: 100%;+ height: 100%;+ padding: 0.5rem;+ display: flex;+ align-items: center;+ justify-content: start;+ }++ input[type="checkbox"], input[type="radio"] {+ display: none;+ }++ &:hover {+ background-color: $gray-25;+ }++ &:has(input:checked) {+ background-color: theme-color('action');+ border: 1px solid theme-color('action-border');++ &::after {+ content: '';+ display: inline-block;+ position: absolute;+ right: 0.5rem;+ width: 24px;+ height: 24px;+ background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-check text-primary"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l5 5l10 -10"/></svg>') no-repeat center center;+ }+ }+}diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssindex 20fa3e1719..a67bfa9763 100644--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss@@ -25,13 +25,14 @@ $theme-colors: ("black": $black,"primary": $primary,"secondary": rgba($blue, 0.1),- "active": #f1faff,+ "action": #f1faff,+ "action-border": #e2ecff,+ "active": $gray-25,"partial": #E2E8F0,"warning": #ffe17d,"danger": #ee4266,"info": #44c1ff,- "attention": #FF6900,- "accent-red": #742400,+ "blue": $blue,"gray-100": $gray-100,"gray-200": $gray-200,"gray-300": $gray-300,@@ -146,8 +147,9 @@ $dropdown-box-shadow: rgba(209, 217, 224, 0.5) 0px 0px 0px 1px, rgba(37, 41,$dropdown-padding-x: 0.25rem !default;$dropdown-padding-y: 0.25rem !default;-$modal-header-padding: 1rem 1.5rem 0.5rem 1.5rem;-$modal-inner-padding: 1rem 1.5rem 1rem 1.5rem;+$modal-content-border-color: $border-color;+$modal-header-padding: 1rem 1.25rem 0.5rem 1.25rem;+$modal-inner-padding: 1rem 1.25rem 1rem 1.25rem;$alert-padding-y: 0.5rem !default;$alert-padding-x: 1rem !default;diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scssindex e9deea599a..277a0e4c75 100644--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss@@ -660,10 +660,6 @@ turbo-frame[busy] #turbo-spinner {text-decoration: underline;}-.search-picker__option:has(input:checked) {- @extend .bg-active;-}-.overflow-auto, .overflow-y-auto, .ts-dropdown-content {&::-webkit-scrollbar {width: 0.35rem !important;diff --git a/admin/app/views/spree/admin/line_items/new.html.erb b/admin/app/views/spree/admin/line_items/new.html.erbindex 223bde34b8..e97f971acb 100644--- a/admin/app/views/spree/admin/line_items/new.html.erb+++ b/admin/app/views/spree/admin/line_items/new.html.erb@@ -4,7 +4,7 @@<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_variant) %></h5><button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" /></div>- <div class="modal-body">+ <div class="modal-body border-bottom"><%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %><%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %><%= form.hidden_field :param_name, value: 'line_item' %>@@ -13,17 +13,17 @@<% end %></div><%= form_with model: @line_item, url: spree.admin_order_line_items_path(@order), data: {turbo_frame: '_top'} do |form| %>- <div class="modal-body p-0" style="min-height: 200px">- <div id="variants_search_results" class="overflow-y-auto overflow-x-hidden" style="max-height: 300px">- <p class="text-muted text-center pb-3 pt-5">+ <div class="modal-body p-0">+ <div id="variants_search_results" class="search-results">+ <p class="text-muted text-center py-5"><%= Spree.t(:start_typing_to_search_for_variants) %></p></div></div>- <div class="modal-footer d-flex justify-content-between">+ <div class="modal-footer d-flex justify-content-between border-top"><div class="d-flex gap-2 m-0 align-items-center"><%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>- <%= form.number_field :quantity, class: "form-control" %>+ <%= form.number_field :quantity, class: "form-control", min: 1 %></div><%= turbo_save_button_tag Spree.t(:add_selected_variant), disabled: true, data: { search_picker_target: :submit } %></div>diff --git a/admin/app/views/spree/admin/orders/_line_item.html.erb b/admin/app/views/spree/admin/orders/_line_item.html.erbindex 15bfecf887..fe08149015 100644--- a/admin/app/views/spree/admin/orders/_line_item.html.erb+++ b/admin/app/views/spree/admin/orders/_line_item.html.erb@@ -1,4 +1,4 @@-<%= turbo_frame_tag dom_id(line_item), class: "border-bottom px-3 order-line-items__form hover-light" do %>+<%= turbo_frame_tag dom_id(line_item), class: "px-3 order-line-items__form hover-light" do %><%= render "spree/admin/variants/variant", variant: line_item.variant %><span class="d-flex align-items-center justify-content-center"><%= line_item.single_money.to_html %>diff --git a/admin/app/views/spree/admin/products/_search_result.html.erb b/admin/app/views/spree/admin/products/_search_result.html.erbindex bc13e042d3..14b151f4ee 100644--- a/admin/app/views/spree/admin/products/_search_result.html.erb+++ b/admin/app/views/spree/admin/products/_search_result.html.erb@@ -1,10 +1,9 @@-<div class="d-flex cursor-pointer mb-2 hover-light p-2 px-3 align-items-center search-picker__option" data-action="click->search-picker#toggle">- <div class="custom-control custom-checkbox ml-1 mr-3">- <%= check_box_tag "product_ids[]", product.id, false, class: "custom-control-input", id: "ids_#{product.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %>- <label class="custom-control-label" for="ids_<%= product.id %>"><span></span></label>- </div>- <%= render 'spree/admin/shared/product_image', object: product %>- <div class="ml-3">- <%= highlight(product.name, params.dig(:q)) %>- </div>+<div class="search-picker__option" data-action="click->search-picker#toggle">+ <%= check_box_tag "product_ids[]", product.id, false, id: "ids_#{product.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %>+ <label for="ids_<%= product.id %>">+ <%= render 'spree/admin/shared/product_image', object: product %>+ <div class="ml-3">+ <%= highlight(product.name, params.dig(:q)) %>+ </div>+ </label></div>diff --git a/admin/app/views/spree/admin/products/_search_results.html.erb b/admin/app/views/spree/admin/products/_search_results.html.erbindex d9353365d9..e21866e9a9 100644--- a/admin/app/views/spree/admin/products/_search_results.html.erb+++ b/admin/app/views/spree/admin/products/_search_results.html.erb@@ -1,8 +1,8 @@-<div id="products_search_results" class="overflow-y-auto overflow-x-hidden" style="max-height: 300px">+<div id="products_search_results" class="search-results"><% if products.any? %><%= render collection: products, partial: 'spree/admin/products/search_result', as: :product, cached: spree_base_cache_scope %><% else %>- <p class="text-muted text-center pb-3 pt-5">+ <p class="text-muted text-center py-5"><%= Spree.t('admin.products.search_results.no_products') %></p><% end %>diff --git a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erbindex 9761580311..f0d3b2b1cb 100644--- a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb+++ b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb@@ -4,21 +4,21 @@<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_products) %></h5><button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" /></div>- <div class="modal-body">+ <div class="modal-body border-bottom"><%= form_with url: spree.search_admin_products_path, method: :post, data: { controller: 'auto-submit'} do |form| %><%= form.hidden_field :omit_ids, value: parent.product_ids.join(',') %><%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %><% end %></div><%= form_with url: url do |form| %>- <div class="modal-body p-0" style="min-height: 200px">- <div id="products_search_results" class="overflow-y-auto overflow-x-hidden" style="max-height: 300px">- <p class="text-muted text-center pb-3 pt-5">+ <div class="modal-body p-0">+ <div id="products_search_results" class="search-results">+ <p class="text-muted text-center py-5"><%= Spree.t(:start_typing_to_search_for_products) %></p></div></div>- <div class="modal-footer">+ <div class="modal-footer border-top"><%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %></div><% end %>diff --git a/admin/app/views/spree/admin/shared/_no_image.html.erb b/admin/app/views/spree/admin/shared/_no_image.html.erbindex a614fe73a4..6eec28d4c3 100644--- a/admin/app/views/spree/admin/shared/_no_image.html.erb+++ b/admin/app/views/spree/admin/shared/_no_image.html.erb@@ -1,6 +1,6 @@<% width ||= 50 %><% height ||= 50 %>-<div class="rounded bg-light text-muted d-flex align-items-center justify-content-center" style="width: <%= width %>px; height: <%= height %>px">+<div class="rounded bg-light text-muted d-flex align-items-center justify-content-center border" style="width: <%= width %>px; height: <%= height %>px"><%= icon('camera-off', class: 'text-muted opacity-50') %></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erbindex 0843758849..711ba4e23e 100644--- a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb@@ -15,9 +15,9 @@<%= form.hidden_field :stock_location_id, value: params.dig(:stock_transfer, :source_location_id), data: { stock_transfer_target: :newVariantStockLocationId } %><% end %></div>- <div class="modal-body p-0" style="min-height: 200px">- <div id="variants_search_results" data-search-picker-target="results" class="overflow-y-auto overflow-x-hidden" style="max-height: 300px">- <p class="text-muted text-center pb-3 pt-5">+ <div class="modal-body p-0">+ <div id="variants_search_results" class="search-results" data-search-picker-target="results">+ <p class="text-muted text-center py-5"><%= Spree.t(:start_typing_to_search_for_variants) %></p></div>diff --git a/admin/app/views/spree/admin/variants/_search_result.html.erb b/admin/app/views/spree/admin/variants/_search_result.html.erbindex 041f1d7eb2..784c5d19ca 100644--- a/admin/app/views/spree/admin/variants/_search_result.html.erb+++ b/admin/app/views/spree/admin/variants/_search_result.html.erb@@ -1,35 +1,28 @@-<div class="d-flex mb-2 hover-light p-2 px-3 align-items-center search-picker__option <% if variant.purchasable? || params[:all] %>cursor-pointer<% else %>opacity-50 disabled<% end %>" data-action="click->search-picker#toggle">- <div class="custom-control custom-radio ml-1 mr-3">- <%= radio_button_tag "#{params[:param_name]}[variant_id]", variant.id, false, class: "custom-control-input", id: "ids_#{variant.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" }, disabled: !params[:all] && !variant.purchasable? %>- <label class="custom-control-label" for="ids_<%= variant.id %>"><span></span></label>- </div>- <div class="variant-image">- <%= render 'spree/admin/shared/product_image', object: variant %>- </div>- <div class="ml-3 d-flex gap-2 align-items-center w-100" style="pointer-events: none">- <div class="flex-grow-1 variant-info">- <span class="variant-name">- <%= highlight(variant.product.name, params.dig(:q)) %>- </span>- <% if variant.sku.present? %>- <div class="text-muted"><strong><%= Spree.t(:sku) %>: </strong><%= variant.sku %></div>- <% end %>- <% unless variant.is_master? %>- <div class="text-muted">(<%= variant.options_text %>)</div>- <% end %>+<div class="search-picker__option <% if variant.purchasable? || params[:all] %>cursor-pointer<% else %>opacity-50 disabled<% end %>" data-action="click->search-picker#toggle">+ <%= radio_button_tag "#{params[:param_name]}[variant_id]", variant.id, false, class: "custom-control-input", id: "ids_#{variant.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" }, disabled: !params[:all] && !variant.purchasable? %>+ <label for="ids_<%= variant.id %>" class="pr-2">+ <div class="w-70 d-flex align-items-center">+ <div class="variant-image">+ <%= render 'spree/admin/shared/product_image', object: variant %>+ </div>+ <div class="ml-3 variant-info">+ <strong class="variant-name"><%= highlight(variant.name, params.dig(:q)) %></strong>+ <% if variant.options_text.present? %>+ <p class="text-muted my-1 font-size-sm">+ <%= variant.options_text %>+ </p>+ <% end %>+ </div></div>- <% if params[:stock_location_id].present? %>- <% stock_item = variant.stock_items.find { |si| si.stock_location_id == params[:stock_location_id] } %>- <div class="flex-shrink-0 d-flex flex-col" style="flex-basis: 30%">+ <div class="w-20">+ <% if params[:stock_location_id].present? %>+ <% stock_item = variant.stock_items.find { |si| si.stock_location_id == params[:stock_location_id] } %><span><%= stock_item&.count_on_hand || 0 %> at location</span><% if stock_item&.backorderable? %> <span class="text-muted"><%= Spree.t(:backorderable) %></span><% end %>- </div>- <% else %>- <div class="flex-shrink-0 d-flex flex-col" style="flex-basis: 30%">- <span><%= variant.total_on_hand %> in stock</span>- <% if variant.backorderable? %> <span class="text-muted"><%= Spree.t(:backorderable) %></span><% end %>- </div>- <% end %>- <span class="flex-shrink-0" style="flex-basis: 15%"><%= variant.price_in('USD')&.display_amount %></span>- </div>+ <% else %>+ <%= display_inventory(variant) %>+ <% end %>+ </div>+ <div class="w-10"><%= display_admin_price(variant) %></div>+ </label></div>diff --git a/admin/app/views/spree/admin/variants/_search_results.html.erb b/admin/app/views/spree/admin/variants/_search_results.html.erbindex 29a6a6e797..98d1d8406c 100644--- a/admin/app/views/spree/admin/variants/_search_results.html.erb+++ b/admin/app/views/spree/admin/variants/_search_results.html.erb@@ -1,8 +1,8 @@-<div id="variants_search_results" class="overflow-y-auto overflow-x-hidden" data-search-picker-target="results" style="max-height: 300px">+<div id="variants_search_results" class="search-results" data-search-picker-target="results"><% if variants.any? %><%= render collection: variants, partial: 'spree/admin/variants/search_result', as: :variant %><% else %>- <p class="text-muted text-center pb-3 pt-5">+ <p class="text-muted text-center py-5"><%= Spree.t('admin.variants.search_results.no_variants') %></p><% end %>