From ecbcfb228d6f4f5f8d6713c87de8fab31e961a3a Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 15:54:44 +0200
Subject: [PATCH 01/35] Change flash on #update success

Follow common pattern for flashes everywhere else in admin.
---
 admin/app/controllers/solidus_admin/products_controller.rb | 6 +-----
 admin/config/locales/products.en.yml                       | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/admin/app/controllers/solidus_admin/products_controller.rb b/admin/app/controllers/solidus_admin/products_controller.rb
index e5f22336ed3..bb5822813f8 100644
--- a/admin/app/controllers/solidus_admin/products_controller.rb
+++ b/admin/app/controllers/solidus_admin/products_controller.rb
@@ -43,11 +43,7 @@ def update
       @product = Spree::Product.friendly.find(params[:id])
 
       if @product.update(product_params)
-        flash[:success] = t('spree.successfully_updated', resource: [
-          Spree::Product.model_name.human,
-          @product.name.inspect,
-        ].join(' '))
-
+        flash[:success] = t('.success')
         redirect_to action: :show, status: :see_other
       else
         flash.now[:error] = @product.errors.full_messages.join(", ")
diff --git a/admin/config/locales/products.en.yml b/admin/config/locales/products.en.yml
index fb075351261..c69e3991b14 100644
--- a/admin/config/locales/products.en.yml
+++ b/admin/config/locales/products.en.yml
@@ -8,3 +8,5 @@ en:
         success: "Products were successfully discontinued."
       activate:
         success: "Products were successfully activated."
+      update:
+        success: "Product was successfully updated."

From cae01967f60933e272dc5da7666e7a9bae9f4d2a Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 18:10:36 +0200
Subject: [PATCH 02/35] Create product_option_types_controller.rb

Responsible for sorting on backend
---
 .../solidus_admin/product_option_types_controller.rb         | 5 +++++
 admin/config/routes.rb                                       | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 admin/app/controllers/solidus_admin/product_option_types_controller.rb

diff --git a/admin/app/controllers/solidus_admin/product_option_types_controller.rb b/admin/app/controllers/solidus_admin/product_option_types_controller.rb
new file mode 100644
index 00000000000..640ef324d5b
--- /dev/null
+++ b/admin/app/controllers/solidus_admin/product_option_types_controller.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::ProductOptionTypesController < SolidusAdmin::BaseController
+  include SolidusAdmin::Moveable
+end
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index ec215522965..a7ea6352a21 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -87,4 +87,5 @@
   admin_resources :roles, except: [:show]
   admin_resources :adjustment_reasons, except: [:show]
   admin_resources :store_credit_reasons, except: [:show]
+  admin_resources :product_option_types, only: [], sortable: true
 end

From cf6cf649c31e6fd7cb3cf55787e566224d2ca0c1 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 18:12:28 +0200
Subject: [PATCH 03/35] Delegate methods

Delegate option type methods #name, #presentation, #option_values for
easier access in the view.
---
 core/app/models/spree/product_option_type.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/app/models/spree/product_option_type.rb b/core/app/models/spree/product_option_type.rb
index 4c0f398ea7a..294f5b5fde1 100644
--- a/core/app/models/spree/product_option_type.rb
+++ b/core/app/models/spree/product_option_type.rb
@@ -5,5 +5,7 @@ class ProductOptionType < Spree::Base
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :product_option_types, touch: true
     belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :product_option_types
     acts_as_list scope: :product
+
+    delegate :name, :presentation, :option_values, to: :option_type
   end
 end

From 4350be59e20b41064bb5a740de1f3a7f12085937 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 18:23:17 +0200
Subject: [PATCH 04/35] Reorder translations alphabetically

---
 .../solidus_admin/products/show/component.yml  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/admin/app/components/solidus_admin/products/show/component.yml b/admin/app/components/solidus_admin/products/show/component.yml
index 58a100b8332..b7d0e5096ee 100644
--- a/admin/app/components/solidus_admin/products/show/component.yml
+++ b/admin/app/components/solidus_admin/products/show/component.yml
@@ -1,10 +1,14 @@
 en:
-  save: "Save"
   back: "Back"
-  duplicate: "Duplicate"
-  view: "View online"
   delete: "Delete"
   delete_confirmation: "Are you sure you want to delete this product?"
+  duplicate: "Duplicate"
+  hints:
+    available_on_html: "Product availability starts from the set date.<br> Empty date indicates no availability."
+    discontinue_on_html: "Product availability ends from the set date.<br> Empty date indicates continuous availability."
+    promotionable_html: "Promotions can apply to this product"
+    shipping_category_html: "Manage Shipping in Settings"
+    tax_category_html: "Manage Taxes in Settings"
   manage_images: "Manage images"
   manage_properties: "Manage product specifications"
   manage_stock: "Manage stock"
@@ -14,13 +18,9 @@ en:
   pricing: "Pricing"
   product_organization: "Product organization"
   publishing: "Publishing"
+  save: "Save"
   seo: "SEO"
   stock: "Stock"
   shipping: "Shipping"
   specifications: "Specifications"
-  hints:
-    available_on_html: "Product availability starts from the set date.<br> Empty date indicates no availability."
-    discontinue_on_html: "Product availability ends from the set date.<br> Empty date indicates continuous availability."
-    promotionable_html: "Promotions can apply to this product"
-    shipping_category_html: "Manage Shipping in Settings"
-    tax_category_html: "Manage Taxes in Settings"
+  view: "View online"

From f81cc334f0ad829ee8fe1855f2582cceb9bd93e4 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 18:23:33 +0200
Subject: [PATCH 05/35] Add correct label translation

---
 core/config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index ad8164abb08..1d259f176be 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -182,6 +182,7 @@ en:
         meta_title: Meta Title
         name: Name
         on_hand: On Hand
+        option_type_ids: Option Types
         price: Master Price
         primary_taxon: Primary Taxon
         primary_taxon_id: Primary Taxon

From 0f4a15171a3ed618d9de44d334748950cd82be65 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 18:25:18 +0200
Subject: [PATCH 06/35] Display list of product option types

Add a section in Options panel to display all saved product option types
along with associated option values. Make them sortable and show
"Edit" button in front of each option that would direct to the edit page
of respective option type.
---
 .../products/show/component.html.erb          | 29 ++++++++++++++++++-
 .../solidus_admin/products/show/component.yml |  1 +
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index f8095763f04..19dbe04fa90 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -83,7 +83,34 @@
           ) %>
         <% end %>
 
-        <%= render component("ui/panel").new(title: t(".options")) do %>
+        <%= render component("ui/panel").new(title: t(".options")) do |panel| %>
+          <% if @product.product_option_types.present? %>
+            <% panel.with_section do %>
+              <div class="flex flex-col gap-4" data-controller="sortable" data-sortable-handle-value=".handle">
+                <% @product.product_option_types.includes(option_type: :option_values).order(:position).each do |product_option| %>
+                  <div class="flex gap-2 justify-between" data-sortable-url=<%= solidus_admin.move_product_option_type_path(product_option) %>>
+                    <div class="flex gap-2">
+                      <div class="flex items-center">
+                        <%= render component("ui/icon").new(name: "draggable", class: "w-6 h-6 cursor-grab handle fill-gray-500") %>
+                      </div>
+                      <div class="flex flex-col gap-2">
+                        <span class="font-semibold text-sm"><%= product_option.name %>:<%= product_option.presentation %></span>
+                        <div class="flex gap-2 flex-wrap">
+                          <% product_option.option_values.each do |value| %>
+                            <%= render component("ui/badge").new(name: "#{value.name}:#{value.presentation}") %>
+                          <% end %>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="flex items-center">
+                      <%= render component("ui/button").new(tag: :a, href: spree.edit_admin_option_type_path(product_option.option_type), scheme: :secondary, text: t(".edit")) %>
+                    </div>
+                  </div>
+                <% end %>
+              </div>
+            <% end %>
+          <% end %>
+
           <%= render component("ui/forms/field").select(
             f,
             :option_type_ids,
diff --git a/admin/app/components/solidus_admin/products/show/component.yml b/admin/app/components/solidus_admin/products/show/component.yml
index b7d0e5096ee..efafd2b7f1e 100644
--- a/admin/app/components/solidus_admin/products/show/component.yml
+++ b/admin/app/components/solidus_admin/products/show/component.yml
@@ -3,6 +3,7 @@ en:
   delete: "Delete"
   delete_confirmation: "Are you sure you want to delete this product?"
   duplicate: "Duplicate"
+  edit: "Edit"
   hints:
     available_on_html: "Product availability starts from the set date.<br> Empty date indicates no availability."
     discontinue_on_html: "Product availability ends from the set date.<br> Empty date indicates continuous availability."

From cd822f160c967e88ef75b02bad1230fbe638b5af Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 18:27:46 +0200
Subject: [PATCH 07/35] Allow saving selected option types

Adds a submit button to save selected options and a hidden field to
allow removing all saved options.
---
 .../products/show/component.html.erb           | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index 19dbe04fa90..a7c8d48f136 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -111,13 +111,17 @@
             <% end %>
           <% end %>
 
-          <%= render component("ui/forms/field").select(
-            f,
-            :option_type_ids,
-            option_type_options,
-            multiple: true,
-            "size" => option_type_options.size,
-          ) %>
+          <div class="flex gap-4 justify-between items-end">
+            <%= hidden_field_tag "#{f.object_name}[option_type_ids][]", nil %>
+            <%= render component("ui/forms/field").select(
+              f,
+              :option_type_ids,
+              option_type_options,
+              multiple: true,
+              "size" => option_type_options.size,
+            ) %>
+            <%= render component("ui/button").new(type: :submit, form: form_id, text: t(".save")) %>
+          </div>
         <% end %>
 
         <%= render component("ui/panel").new(title: t(".specifications")) do |panel| %>

From 7a5071d5f53efe509c7ac7224f2fe4cdf266ea5d Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 18:29:35 +0200
Subject: [PATCH 08/35] Change display text for option types in select field

This way it mimics how they are displayed in the list.
---
 admin/app/components/solidus_admin/products/show/component.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/products/show/component.rb b/admin/app/components/solidus_admin/products/show/component.rb
index 66ae89250fd..9bef1292513 100644
--- a/admin/app/components/solidus_admin/products/show/component.rb
+++ b/admin/app/components/solidus_admin/products/show/component.rb
@@ -22,7 +22,7 @@ def taxon_options
 
   def option_type_options
     @option_type_options ||= Spree::OptionType.order(:presentation).pluck(:presentation, :name, :id).map do
-      ["#{_1} (#{_2})", _3]
+      ["#{_2}:#{_1}", _3]
     end
   end
 

From 72378574b0362f709f43bafd69a7586b84622b01 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 20:29:52 +0200
Subject: [PATCH 09/35] Add panel action to options

Link to option types page.
---
 .../solidus_admin/products/show/component.html.erb           | 5 +++++
 .../app/components/solidus_admin/products/show/component.yml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index a7c8d48f136..2991361571a 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -122,6 +122,11 @@
             ) %>
             <%= render component("ui/button").new(type: :submit, form: form_id, text: t(".save")) %>
           </div>
+
+          <% panel.with_action(
+            name: t(".manage_options"),
+            href: solidus_admin.option_types_path
+          ) %>
         <% end %>
 
         <%= render component("ui/panel").new(title: t(".specifications")) do |panel| %>
diff --git a/admin/app/components/solidus_admin/products/show/component.yml b/admin/app/components/solidus_admin/products/show/component.yml
index efafd2b7f1e..9d9e3855b6f 100644
--- a/admin/app/components/solidus_admin/products/show/component.yml
+++ b/admin/app/components/solidus_admin/products/show/component.yml
@@ -11,6 +11,7 @@ en:
     shipping_category_html: "Manage Shipping in Settings"
     tax_category_html: "Manage Taxes in Settings"
   manage_images: "Manage images"
+  manage_options: "Manage option types"
   manage_properties: "Manage product specifications"
   manage_stock: "Manage stock"
   media: "Media"

From 176c7792afa40a812c4fc925804e784c04186523 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 21:45:59 +0200
Subject: [PATCH 10/35] Add feature helpers

---
 .../solidus_admin/testing_support/feature_helpers.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/admin/lib/solidus_admin/testing_support/feature_helpers.rb b/admin/lib/solidus_admin/testing_support/feature_helpers.rb
index 6f28ad553cb..54e242a6d08 100644
--- a/admin/lib/solidus_admin/testing_support/feature_helpers.rb
+++ b/admin/lib/solidus_admin/testing_support/feature_helpers.rb
@@ -33,6 +33,10 @@ def select_row(text)
         end
       end
 
+      def panel(title:)
+        find("section", text: title).find(:xpath, "..")
+      end
+
       # Select options from a "solidus-select" field
       #
       # @param value [String, Array<String>] which option(s) to select
@@ -52,6 +56,14 @@ def solidus_select(value, from:)
         end
       end
 
+      def solidus_unselect(value, from:)
+        input = find_field(from, visible: :all)
+        Array.wrap(value).each do |val|
+          item = input.sibling("div", text: val)
+          item.find("a").click
+        end
+      end
+
       def checkbox(locator)
         find(:checkbox, locator)
       end

From a6d9d007748817ef2b9e467066fc1e7a8bdd06a2 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 22:02:04 +0200
Subject: [PATCH 11/35] Add feature specs

---
 admin/spec/features/product_spec.rb | 65 +++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/admin/spec/features/product_spec.rb b/admin/spec/features/product_spec.rb
index 396ab30a2cf..d26e78ee62f 100644
--- a/admin/spec/features/product_spec.rb
+++ b/admin/spec/features/product_spec.rb
@@ -52,4 +52,69 @@
     expect(page).to have_content("Name can't be blank")
     expect(page).to be_axe_clean
   end
+
+  describe "option types", :js do
+    before do
+      create(:option_type, name: "clothing-size", presentation: "Size").tap do |option_type|
+        option_type.option_values << [
+          create(:option_value, name: "S", presentation: "Small"),
+          create(:option_value, name: "M", presentation: "Medium")
+        ]
+      end
+
+      create(:option_type, name: "clothing-color", presentation: "Color").tap do |option_type|
+        option_type.option_values << [
+          create(:option_value, name: "brown", presentation: "Brown"),
+          create(:option_value, name: "red", presentation: "Red")
+        ]
+      end
+    end
+
+    let!(:product) { create(:product, name: "Just a product", slug: 'just-a-prod', price: 19.99) }
+
+    it "updates option types" do
+      visit "/admin/products/just-a-prod"
+      solidus_select(%w[clothing-size:Size clothing-color:Color], from: "Option Types")
+      options_panel = panel(title: "Options")
+      within(options_panel) { click_on "Save" }
+
+      expect(options_panel).to have_content("clothing-size:Size")
+      expect(options_panel).to have_content("S:Small")
+      expect(options_panel).to have_content("M:Medium")
+      expect(options_panel).to have_content("clothing-color:Color")
+      expect(options_panel).to have_content("brown:Brown")
+      expect(options_panel).to have_content("red:Red")
+
+      solidus_unselect(%w[clothing-size:Size clothing-color:Color], from: "Option Types")
+      within(options_panel) { click_on "Save" }
+
+      expect(options_panel).not_to have_content("clothing-size:Size")
+      expect(options_panel).not_to have_content("S:Small")
+      expect(options_panel).not_to have_content("M:Medium")
+      expect(options_panel).not_to have_content("clothing-color:Color")
+      expect(options_panel).not_to have_content("brown:Brown")
+      expect(options_panel).not_to have_content("red:Red")
+    end
+
+    context "clicking on Edit" do
+      it "leads to option type edit page" do
+        option_type = create(:option_type)
+        product.option_types << option_type
+        visit "/admin/products/just-a-prod"
+
+        pending("option types new UI is in progress")
+        within(panel(title: "Options")) { click_on "Edit" }
+        expect(page).to have_current_path("/admin/option_types/#{option_type.id}/edit")
+      end
+    end
+
+    context "clicking on Manage option types" do
+      it "leads to option types index page" do
+        visit "/admin/products/just-a-prod"
+
+        within(panel(title: "Options")) { click_on "Manage option types" }
+        expect(page).to have_current_path("/admin/option_types")
+      end
+    end
+  end
 end

From 46780ee4d4aa3eef913fbad01dadb58be200e834 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 22:10:37 +0200
Subject: [PATCH 12/35] Fix bad copy/paste

---
 admin/spec/requests/solidus_admin/products_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/spec/requests/solidus_admin/products_spec.rb b/admin/spec/requests/solidus_admin/products_spec.rb
index 0addacf2c72..b2d4c1fc795 100644
--- a/admin/spec/requests/solidus_admin/products_spec.rb
+++ b/admin/spec/requests/solidus_admin/products_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe "SolidusAdmin::PropertiesController", type: :request do
+RSpec.describe "SolidusAdmin::ProductsController", type: :request do
   let(:admin_user) { create(:admin_user) }
 
   before do

From d837420f5893447ffe0a7ff348cae8ce59c09b17 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 9 Jun 2025 22:12:43 +0200
Subject: [PATCH 13/35] Add request specs

---
 .../solidus_admin/product_option_types_spec.rb        | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 admin/spec/requests/solidus_admin/product_option_types_spec.rb

diff --git a/admin/spec/requests/solidus_admin/product_option_types_spec.rb b/admin/spec/requests/solidus_admin/product_option_types_spec.rb
new file mode 100644
index 00000000000..efbe1c8d338
--- /dev/null
+++ b/admin/spec/requests/solidus_admin/product_option_types_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "solidus_admin/testing_support/shared_examples/moveable"
+
+RSpec.describe "SolidusAdmin::ProductOptionTypesController", type: :request do
+  it_behaves_like "requests: moveable" do
+    let(:factory) { :product_option_type }
+    let(:request_path) { solidus_admin.move_product_option_type_path(record, format: :js) }
+  end
+end

From fd8444b6db79f880d65314213a6dd5bffe439b84 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 10 Jun 2025 15:49:19 +0200
Subject: [PATCH 14/35] Update shared examples for sorting

If sortable elements have a handle we need to account for it, so that
drag and drop can be performed correctly.
---
 .../testing_support/shared_examples/moveable.rb             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/lib/solidus_admin/testing_support/shared_examples/moveable.rb b/admin/lib/solidus_admin/testing_support/shared_examples/moveable.rb
index a321ea5faa4..53fc48558c0 100644
--- a/admin/lib/solidus_admin/testing_support/shared_examples/moveable.rb
+++ b/admin/lib/solidus_admin/testing_support/shared_examples/moveable.rb
@@ -22,6 +22,7 @@
 RSpec.shared_examples_for "features: sortable" do
   let(:factory_attrs) { {} }
   let(:scope) { "body" }
+  let(:handle) { nil }
 
   before do
     create(factory, displayed_attribute => "First", position: 1, **factory_attrs)
@@ -35,7 +36,10 @@
       expect(find("[data-controller='sortable']").all(:xpath, "./*").last).to have_text("Second")
 
       rows = find("[data-controller='sortable']").all(:xpath, "./*")
-      rows[1].drag_to rows[0]
+      target = rows[0]
+      source = rows[1]
+      source = source.find(handle) if handle
+      source.drag_to target
 
       expect(find("[data-controller='sortable']").all(:xpath, "./*").first).to have_text("Second")
       expect(find("[data-controller='sortable']").all(:xpath, "./*").last).to have_text("First")

From 0e78e0ef4d4cc4619c66c9cd2dc007de3f69cd89 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 10 Jun 2025 15:49:46 +0200
Subject: [PATCH 15/35] Add feature tests for sorting

---
 admin/spec/features/product_spec.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/admin/spec/features/product_spec.rb b/admin/spec/features/product_spec.rb
index d26e78ee62f..53d7171d24d 100644
--- a/admin/spec/features/product_spec.rb
+++ b/admin/spec/features/product_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require "solidus_admin/testing_support/shared_examples/moveable"
 
 describe "Product", type: :feature do
   before do
@@ -116,5 +117,14 @@
         expect(page).to have_current_path("/admin/option_types")
       end
     end
+
+    it_behaves_like "features: sortable" do
+      let(:product) { create(:product) }
+      let(:factory) { :option_type }
+      let(:factory_attrs) { { products: [product] } }
+      let(:displayed_attribute) { :name }
+      let(:handle) { ".handle" }
+      let(:path) { solidus_admin.product_path(product) }
+    end
   end
 end

From 0f92f3762d951bbfd8b8baab652a7cfb6e9d5f2e Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 10 Jun 2025 18:28:04 +0200
Subject: [PATCH 16/35] Update test to pass on CI

Following many trials and errors, this should make it pass on CI. Not
sure why it does not register a form submit when clicking Save button
within options panel.
---
 .../components/solidus_admin/products/show/component.html.erb | 2 +-
 admin/spec/features/product_spec.rb                           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index 2991361571a..9fe35509cad 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -120,7 +120,7 @@
               multiple: true,
               "size" => option_type_options.size,
             ) %>
-            <%= render component("ui/button").new(type: :submit, form: form_id, text: t(".save")) %>
+            <%= render component("ui/button").new(type: :submit, text: t(".save")) %>
           </div>
 
           <% panel.with_action(
diff --git a/admin/spec/features/product_spec.rb b/admin/spec/features/product_spec.rb
index 53d7171d24d..e17a79b6dc2 100644
--- a/admin/spec/features/product_spec.rb
+++ b/admin/spec/features/product_spec.rb
@@ -77,7 +77,9 @@
       visit "/admin/products/just-a-prod"
       solidus_select(%w[clothing-size:Size clothing-color:Color], from: "Option Types")
       options_panel = panel(title: "Options")
-      within(options_panel) { click_on "Save" }
+      # for some reason capybara on circle ci does not register a form submit when clicking "Save" within options panel,
+      # so we have to resort to Save button in the header
+      within("header") { click_on "Save" }
 
       expect(options_panel).to have_content("clothing-size:Size")
       expect(options_panel).to have_content("S:Small")

From 97c13eca928059cc0c69a45bec12a5a1775cd3ff Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Wed, 11 Jun 2025 00:46:09 +0200
Subject: [PATCH 17/35] Skip pending test

Perhaps due to some difference in configuration between different CI
envs, on 2 of them this test passes, meaning we can't use `pending`, so
will just skip for now, until new option types UI is merged.
---
 admin/spec/features/product_spec.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/admin/spec/features/product_spec.rb b/admin/spec/features/product_spec.rb
index e17a79b6dc2..b6fc21abef5 100644
--- a/admin/spec/features/product_spec.rb
+++ b/admin/spec/features/product_spec.rb
@@ -100,12 +100,11 @@
     end
 
     context "clicking on Edit" do
-      it "leads to option type edit page" do
+      xit "leads to option type edit page" do
         option_type = create(:option_type)
         product.option_types << option_type
         visit "/admin/products/just-a-prod"
 
-        pending("option types new UI is in progress")
         within(panel(title: "Options")) { click_on "Edit" }
         expect(page).to have_current_path("/admin/option_types/#{option_type.id}/edit")
       end

From 513ba037effad0950316b292e59b582437c62bec Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 19:41:13 +0200
Subject: [PATCH 18/35] !dropme

once new flashes are merged this commit should be dropped
---
 .../layout/flashes/toasts/component.html.erb             | 5 +++++
 .../solidus_admin/layout/flashes/toasts/component.rb     | 9 +++++++++
 admin/app/controllers/solidus_admin/base_controller.rb   | 1 +
 admin/app/helpers/solidus_admin/flash_helper.rb          | 9 +++++++++
 .../app/views/layouts/solidus_admin/application.html.erb | 6 +-----
 5 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 admin/app/components/solidus_admin/layout/flashes/toasts/component.html.erb
 create mode 100644 admin/app/components/solidus_admin/layout/flashes/toasts/component.rb
 create mode 100644 admin/app/helpers/solidus_admin/flash_helper.rb

diff --git a/admin/app/components/solidus_admin/layout/flashes/toasts/component.html.erb b/admin/app/components/solidus_admin/layout/flashes/toasts/component.html.erb
new file mode 100644
index 00000000000..14ea6c06657
--- /dev/null
+++ b/admin/app/components/solidus_admin/layout/flashes/toasts/component.html.erb
@@ -0,0 +1,5 @@
+<div id="flash_toasts" class="fixed inset-x-0 bottom-3 flex items-center justify-center flex-col gap-3 pointer-events-none" role="alert">
+  <% toasts.each do |key, message| %>
+    <%= render component("ui/toast").new(text: message, scheme: key.to_sym == :error ? :error : :default) %>
+  <% end %>
+</div>
diff --git a/admin/app/components/solidus_admin/layout/flashes/toasts/component.rb b/admin/app/components/solidus_admin/layout/flashes/toasts/component.rb
new file mode 100644
index 00000000000..3aecd62d0a0
--- /dev/null
+++ b/admin/app/components/solidus_admin/layout/flashes/toasts/component.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Layout::Flashes::Toasts::Component < SolidusAdmin::BaseComponent
+  attr_reader :toasts
+
+  def initialize(toasts:)
+    @toasts = toasts
+  end
+end
diff --git a/admin/app/controllers/solidus_admin/base_controller.rb b/admin/app/controllers/solidus_admin/base_controller.rb
index bd7442f4eee..8854547389a 100644
--- a/admin/app/controllers/solidus_admin/base_controller.rb
+++ b/admin/app/controllers/solidus_admin/base_controller.rb
@@ -19,6 +19,7 @@ class BaseController < ApplicationController
 
     helper 'solidus_admin/components'
     helper 'solidus_admin/layout'
+    helper 'solidus_admin/flash'
 
     private
 
diff --git a/admin/app/helpers/solidus_admin/flash_helper.rb b/admin/app/helpers/solidus_admin/flash_helper.rb
new file mode 100644
index 00000000000..d25ee53023a
--- /dev/null
+++ b/admin/app/helpers/solidus_admin/flash_helper.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module SolidusAdmin
+  module FlashHelper
+    def toasts
+      flash.to_hash.with_indifferent_access.except(:alert)
+    end
+  end
+end
diff --git a/admin/app/views/layouts/solidus_admin/application.html.erb b/admin/app/views/layouts/solidus_admin/application.html.erb
index 6755eea3c1d..9de687890a4 100644
--- a/admin/app/views/layouts/solidus_admin/application.html.erb
+++ b/admin/app/views/layouts/solidus_admin/application.html.erb
@@ -31,10 +31,6 @@
       </main>
     </div>
 
-    <div class="fixed inset-x-0 bottom-3 flex items-center justify-center flex-col gap-3 pointer-events-none" role="alert">
-      <% flash.each do |key, message| %>
-        <%= render component("ui/toast").new(text: message, scheme: key.to_sym == :error ? :error : :default) %>
-      <% end %>
-    </div>
+    <%= render component("layout/flashes/toasts").new(toasts:) %>
   </body>
 </html>

From 07bff0e9cf6a33eaeb4a66fb6b168aebd1baf338 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Wed, 11 Jun 2025 22:25:03 +0200
Subject: [PATCH 19/35] Remove redundant attribute

Multi-select fields are not rendered as native list boxes, so this
attribute does not do anything anymore.
---
 .../solidus_admin/products/show/component.html.erb          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index 9fe35509cad..2abd4d6b822 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -117,8 +117,7 @@
               f,
               :option_type_ids,
               option_type_options,
-              multiple: true,
-              "size" => option_type_options.size,
+              multiple: true
             ) %>
             <%= render component("ui/button").new(type: :submit, text: t(".save")) %>
           </div>
@@ -164,8 +163,7 @@
             f,
             :taxon_ids,
             taxon_options,
-            multiple: true,
-            "size" => taxon_options.size, # use a string key to avoid setting the size of the component
+            multiple: true
           ) %>
         <% end %>
       <% end %>

From 0c2081813cbaaa46bcc2743491042c20c006679d Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Wed, 11 Jun 2025 18:28:02 +0200
Subject: [PATCH 20/35] Add correct label translation

---
 core/config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 1d259f176be..fb365ba4d03 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -191,6 +191,7 @@ en:
         sku: Master SKU
         slug: Slug
         tax_category: Tax Category
+        taxon_ids: Categories
         weight: Weight
         width: Width
       spree/product_property:

From d58c3d2b33e6c28bbf96f0d0897c50a03df31549 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 19:55:06 +0200
Subject: [PATCH 21/35] Create product_taxons resource

---
 .../product_taxons_controller.rb              | 58 +++++++++++++++++++
 admin/config/locales/product_taxons.en.yml    |  6 ++
 admin/config/routes.rb                        |  2 +
 3 files changed, 66 insertions(+)
 create mode 100644 admin/app/controllers/solidus_admin/product_taxons_controller.rb
 create mode 100644 admin/config/locales/product_taxons.en.yml

diff --git a/admin/app/controllers/solidus_admin/product_taxons_controller.rb b/admin/app/controllers/solidus_admin/product_taxons_controller.rb
new file mode 100644
index 00000000000..f33cc6b14d8
--- /dev/null
+++ b/admin/app/controllers/solidus_admin/product_taxons_controller.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module SolidusAdmin
+  class ProductTaxonsController < SolidusAdmin::BaseController
+    before_action :load_product, only: [:new, :create]
+
+    def new
+      render component("products/show/categories/new").new(product: @product)
+    end
+
+    def create
+      init_taxon
+      root_taxon! if @taxon.root?
+      @product.taxons << @taxon
+
+      respond_to do |format|
+        format.html { redirect_to @product, status: :see_other, notice: t(".success") }
+      end
+    rescue ActiveRecord::RecordInvalid
+      component = component("products/show/categories/new").new(product: @product, taxon: @taxon)
+      respond_to do |format|
+        format.html { render component, status: :unprocessable_entity }
+        format.turbo_stream do
+          render turbo_stream: turbo_stream.replace(:new_product_category, component),
+          status: :unprocessable_entity
+        end
+      end
+    end
+
+    private
+
+    def load_product
+      @product = Spree::Product.friendly.find(params[:product_id])
+    end
+
+    def init_taxon
+      @taxon = Spree::Taxon.new(category_params)
+      @taxon.taxonomy_id = @taxon.parent&.taxonomy_id
+    end
+
+    # Parent-less taxons must be associated with a taxonomy of the same name; it's guaranteed that in order to create a
+    # new parent-less taxon we need to create a new taxonomy.
+    def root_taxon!
+      # if Taxonomy.create! fails on the next step, we need validation errors on taxon object
+      # to display them on the form
+      @taxon.validate
+      Spree::Taxonomy.create!(name: @taxon.name, root: @taxon)
+    end
+
+    def authorization_subject
+      Spree::Classification
+    end
+
+    def category_params
+      params.require(:taxon).permit(:name, :parent_id, :description)
+    end
+  end
+end
diff --git a/admin/config/locales/product_taxons.en.yml b/admin/config/locales/product_taxons.en.yml
new file mode 100644
index 00000000000..46959ec0b52
--- /dev/null
+++ b/admin/config/locales/product_taxons.en.yml
@@ -0,0 +1,6 @@
+en:
+  solidus_admin:
+    product_taxons:
+      title: "Categories"
+      create:
+        success: "Product category was successfully added."
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index a7ea6352a21..b4b42671dc5 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -16,6 +16,8 @@
       put :discontinue
       put :activate
     end
+
+    resources :taxons, only: [:new, :create], controller: :product_taxons
   end
 
   # Needs a constraint to avoid interpreting "new" as a product's slug

From 80a793b9efecf09b287364c5491c09c944796163 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 20:05:37 +0200
Subject: [PATCH 22/35] Create component for new product category

---
 .../show/categories/new/component.html.erb      | 17 +++++++++++++++++
 .../products/show/categories/new/component.rb   | 17 +++++++++++++++++
 .../products/show/categories/new/component.yml  |  4 ++++
 core/config/locales/en.yml                      |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 admin/app/components/solidus_admin/products/show/categories/new/component.html.erb
 create mode 100644 admin/app/components/solidus_admin/products/show/categories/new/component.rb
 create mode 100644 admin/app/components/solidus_admin/products/show/categories/new/component.yml

diff --git a/admin/app/components/solidus_admin/products/show/categories/new/component.html.erb b/admin/app/components/solidus_admin/products/show/categories/new/component.html.erb
new file mode 100644
index 00000000000..726e1251ca9
--- /dev/null
+++ b/admin/app/components/solidus_admin/products/show/categories/new/component.html.erb
@@ -0,0 +1,17 @@
+<%= turbo_frame_tag :new_product_category, target: :product_organization_frame do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @taxon, url: solidus_admin.product_taxons_path(@product), method: :post, html: { id: dom_id(@taxon) } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+        <%= render component("ui/forms/field").select(f, :parent_id, parent_taxon_options) %>
+        <%= render component("ui/forms/field").text_area(f, :description) %>
+      </div>
+    <% end %>
+    <% modal.with_actions do %>
+      <form method="dialog">
+        <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+      </form>
+      <%= render component("ui/button").new(type: :submit, text: t('.submit'), form: dom_id(@taxon)) %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/admin/app/components/solidus_admin/products/show/categories/new/component.rb b/admin/app/components/solidus_admin/products/show/categories/new/component.rb
new file mode 100644
index 00000000000..a595710002c
--- /dev/null
+++ b/admin/app/components/solidus_admin/products/show/categories/new/component.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Products::Show::Categories::New::Component < SolidusAdmin::BaseComponent
+  def initialize(product:, taxon: nil)
+    @product = product
+    @taxon = taxon || product.taxons.build
+  end
+
+  private
+
+  def parent_taxon_options
+    @parent_taxon_options ||= Spree::Taxon.order(:lft).pluck(:name, :id, :depth).map do
+      name, id, depth = _1
+      ["#{"    " * depth} → #{name}", id]
+    end
+  end
+end
diff --git a/admin/app/components/solidus_admin/products/show/categories/new/component.yml b/admin/app/components/solidus_admin/products/show/categories/new/component.yml
new file mode 100644
index 00000000000..b9180a77b6d
--- /dev/null
+++ b/admin/app/components/solidus_admin/products/show/categories/new/component.yml
@@ -0,0 +1,4 @@
+en:
+  cancel: "Cancel"
+  submit: "Add Category"
+  title: "New Category"
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index fb365ba4d03..e623d05b476 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -409,6 +409,7 @@ en:
         meta_keywords: Meta Keywords
         meta_title: Meta Title
         name: Name
+        parent_id: Parent Category
         permalink: Permalink
         position: Position
       spree/taxonomy:

From b9f4c12c3480d805a2c91ef9888c0b11a8227ad2 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 19:59:16 +0200
Subject: [PATCH 23/35] Allow alternative item labels in solidus_select

By default, a selected option has the same text representation as in the
options list. This change allows to customize it.
---
 .../solidus_admin/ui/forms/select/component.rb         |  2 ++
 .../solidus_admin/web_components/solidus_select.js     |  5 +++++
 .../forms/select/component_preview/overview.html.erb   | 10 ++++++++++
 3 files changed, 17 insertions(+)

diff --git a/admin/app/components/solidus_admin/ui/forms/select/component.rb b/admin/app/components/solidus_admin/ui/forms/select/component.rb
index 349e2429d2a..23a7413bdb9 100644
--- a/admin/app/components/solidus_admin/ui/forms/select/component.rb
+++ b/admin/app/components/solidus_admin/ui/forms/select/component.rb
@@ -30,6 +30,8 @@ class SolidusAdmin::UI::Forms::Select::Component < SolidusAdmin::BaseComponent
   # @param choices [Array<String>, Array<Array<String>>] container with options to be rendered
   #   (see `ActionView::Helpers::FormOptionsHelper#options_for_select`).
   #   When +:src+ parameter is provided, use +:choices+ to provide the list of selected options only.
+  #   Include a dataset hash `{ data: { item_label: <alternative_label_text> } }` to change the text displayed in select
+  #   box when option is selected.
   # @param src [nil, String] URL of a JSON resource with options data to be loaded instead of rendering options in place.
   # @option attributes [String] :"data-option-value-field"
   # @option attributes [String] :"data-option-label-field" when +:src+ param is passed, value and label of loaded options
diff --git a/admin/app/javascript/solidus_admin/web_components/solidus_select.js b/admin/app/javascript/solidus_admin/web_components/solidus_select.js
index 5dc1a066927..8a360cb7815 100644
--- a/admin/app/javascript/solidus_admin/web_components/solidus_select.js
+++ b/admin/app/javascript/solidus_admin/web_components/solidus_select.js
@@ -47,6 +47,7 @@ class SolidusSelect extends HTMLSelectElement {
       allowEmptyOption: true,
       maxOptions: null,
       refreshThrottle: 0,
+      itemLabelField: "itemLabel",
       plugins: {
         no_active_items: true,
         remove_button: {
@@ -61,6 +62,10 @@ class SolidusSelect extends HTMLSelectElement {
           const message = this.input.getAttribute("data-no-results-message");
           return `<div class='no-results'>${message}</div>`;
         },
+        item: function(data, escape) {
+          const itemLabel = data[this.settings.itemLabelField] || data[this.settings.labelField];
+          return `<div>${escape(itemLabel)}</div>`;
+        }
       },
     };
 
diff --git a/admin/spec/components/previews/solidus_admin/ui/forms/select/component_preview/overview.html.erb b/admin/spec/components/previews/solidus_admin/ui/forms/select/component_preview/overview.html.erb
index 71b48288a94..82567bdbd7e 100644
--- a/admin/spec/components/previews/solidus_admin/ui/forms/select/component_preview/overview.html.erb
+++ b/admin/spec/components/previews/solidus_admin/ui/forms/select/component_preview/overview.html.erb
@@ -46,6 +46,16 @@
           value: "1"
         ) %>
       </div>
+
+      <div class="mb-8">
+        <h6 class="text-gray-500 mb-3 mt-0">Alternative item label</h6>
+        <%= render current_component.new(
+          id: "single-alt-label",
+          choices: Spree::State.limit(100).map { [_1.name, _1.id, { data: { item_label: "#{_1.name} (#{_1.country.name})" } }] },
+          label: "State",
+          name: "state"
+        ) %>
+      </div>
     </div>
 
     <div class="flex flex-col flex-grow gap-2">

From 587ebe018e089edfe70dc0c421ff4c5890830e95 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 20:06:03 +0200
Subject: [PATCH 24/35] Change selected items text in taxons select

Indentation with an arrow is only useful when showing the list of taxons
in the dropdown, we can just show the name of taxon when selected to
save space.
---
 .../solidus_admin/products/show/categories/new/component.rb     | 2 +-
 admin/app/components/solidus_admin/products/show/component.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/app/components/solidus_admin/products/show/categories/new/component.rb b/admin/app/components/solidus_admin/products/show/categories/new/component.rb
index a595710002c..4d7dee3c326 100644
--- a/admin/app/components/solidus_admin/products/show/categories/new/component.rb
+++ b/admin/app/components/solidus_admin/products/show/categories/new/component.rb
@@ -11,7 +11,7 @@ def initialize(product:, taxon: nil)
   def parent_taxon_options
     @parent_taxon_options ||= Spree::Taxon.order(:lft).pluck(:name, :id, :depth).map do
       name, id, depth = _1
-      ["#{"    " * depth} → #{name}", id]
+      ["#{"    " * depth} → #{name}", id, { data: { item_label: name } }]
     end
   end
 end
diff --git a/admin/app/components/solidus_admin/products/show/component.rb b/admin/app/components/solidus_admin/products/show/component.rb
index 9bef1292513..f07d66b9cdd 100644
--- a/admin/app/components/solidus_admin/products/show/component.rb
+++ b/admin/app/components/solidus_admin/products/show/component.rb
@@ -16,7 +16,7 @@ def form_id
   def taxon_options
     @taxon_options ||= Spree::Taxon.order(:lft).pluck(:name, :id, :lft, :depth).map do
       name, id, _lft, depth = _1
-      ["#{'    ' * depth} → #{name}", id]
+      ["#{'    ' * depth} → #{name}", id, { data: { item_label: name } }]
     end
   end
 

From 142b02f43c02e2372dbabe75a75cc4a7040b46e4 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 20:03:43 +0200
Subject: [PATCH 25/35] Update product organization panel

Include hidden field to allow emptying categories collection when none
selected. Add link and turbo frame for a new category modal.
Modal frame targets category select, so on successful request the only
part of the form that will be updated is this select field, preserving
any other inputs that user might have yet unsaved in the product form.
Turbo stream action update will empty the modal essentially closing it.
---
 .../solidus_admin/base_component.rb           |  1 +
 .../products/show/component.html.erb          | 23 ++++++++++++++-----
 .../solidus_admin/products/show/component.yml |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/admin/app/components/solidus_admin/base_component.rb b/admin/app/components/solidus_admin/base_component.rb
index e39c1707a4b..4396d42dc9c 100644
--- a/admin/app/components/solidus_admin/base_component.rb
+++ b/admin/app/components/solidus_admin/base_component.rb
@@ -10,6 +10,7 @@ class BaseComponent < ViewComponent::Base
     include SolidusAdmin::StimulusHelper
     include SolidusAdmin::VoidElementsHelper
     include Turbo::FramesHelper
+    include Turbo::StreamsHelper
 
     def icon_tag(name, **attrs)
       render component("ui/icon").new(name:, **attrs)
diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index 2abd4d6b822..78d3fc0a20e 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -158,12 +158,21 @@
           <% end %>
         <% end %>
 
-        <%= render component("ui/panel").new(title: t(".product_organization")) do %>
-          <%= render component("ui/forms/field").select(
-            f,
-            :taxon_ids,
-            taxon_options,
-            multiple: true
+        <%= render component("ui/panel").new(title: t(".product_organization")) do |panel| %>
+          <%= f.hidden_field :taxon_ids, multiple: true, value: nil %>
+          <%= turbo_frame_tag :product_organization_frame do %>
+            <%= render component("ui/forms/field").select(
+              f,
+              :taxon_ids,
+              taxon_options,
+              multiple: true
+            ) %>
+            <%= turbo_stream.update :new_product_category, nil %>
+          <% end %>
+          <% panel.with_action(
+            name: t(".add_new_category"),
+            href: solidus_admin.new_product_taxon_path(@product),
+            data: { turbo_frame: :new_product_category }
           ) %>
         <% end %>
       <% end %>
@@ -185,3 +194,5 @@
     <%= render component("ui/button").new(tag: :button, text: t(".save"), form: form_id) %>
   <% end %>
 <% end %>
+
+<%= turbo_frame_tag :new_product_category, target: :product_organization_frame %>
diff --git a/admin/app/components/solidus_admin/products/show/component.yml b/admin/app/components/solidus_admin/products/show/component.yml
index 9d9e3855b6f..1c992f78635 100644
--- a/admin/app/components/solidus_admin/products/show/component.yml
+++ b/admin/app/components/solidus_admin/products/show/component.yml
@@ -1,4 +1,5 @@
 en:
+  add_new_category: "Add new category"
   back: "Back"
   delete: "Delete"
   delete_confirmation: "Are you sure you want to delete this product?"

From 367edfeeef8e8aff0e3bc30f1a3c1a6ca5efecc9 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 19:51:31 +0200
Subject: [PATCH 26/35] Display toasts from turbo frame response

With turbo frame response only `product_organization_frame` will be
targeted for change after successful request, so in order to show flash
message we can use turbo stream replace from within the frame to refresh
the flashes.
---
 admin/app/components/solidus_admin/base_component.rb             | 1 +
 .../components/solidus_admin/products/show/component.html.erb    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/admin/app/components/solidus_admin/base_component.rb b/admin/app/components/solidus_admin/base_component.rb
index 4396d42dc9c..41339329d52 100644
--- a/admin/app/components/solidus_admin/base_component.rb
+++ b/admin/app/components/solidus_admin/base_component.rb
@@ -9,6 +9,7 @@ class BaseComponent < ViewComponent::Base
     include SolidusAdmin::ComponentsHelper
     include SolidusAdmin::StimulusHelper
     include SolidusAdmin::VoidElementsHelper
+    include SolidusAdmin::FlashHelper
     include Turbo::FramesHelper
     include Turbo::StreamsHelper
 
diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index 78d3fc0a20e..08346278ae4 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -168,6 +168,7 @@
               multiple: true
             ) %>
             <%= turbo_stream.update :new_product_category, nil %>
+            <%= turbo_stream.replace :flash_toasts, component("layout/flashes/toasts").new(toasts:) %>
           <% end %>
           <% panel.with_action(
             name: t(".add_new_category"),

From 4c1e3718501c95f34cfe71a7cb6cdef7e3436e64 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Mon, 16 Jun 2025 20:50:26 +0200
Subject: [PATCH 27/35] Extract frame with stream actions into component

Hides implementation details of the modal "close" and flashes refresh
logic, and also allows to reuse it in similar scenarios.
---
 admin/app/components/solidus_admin/base_component.rb      | 4 ++--
 .../solidus_admin/products/show/component.html.erb        | 4 +---
 .../solidus_admin/turbo/target_frame/component.html.erb   | 5 +++++
 .../solidus_admin/turbo/target_frame/component.rb         | 8 ++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 admin/app/components/solidus_admin/turbo/target_frame/component.html.erb
 create mode 100644 admin/app/components/solidus_admin/turbo/target_frame/component.rb

diff --git a/admin/app/components/solidus_admin/base_component.rb b/admin/app/components/solidus_admin/base_component.rb
index 41339329d52..de18ea8859e 100644
--- a/admin/app/components/solidus_admin/base_component.rb
+++ b/admin/app/components/solidus_admin/base_component.rb
@@ -10,8 +10,8 @@ class BaseComponent < ViewComponent::Base
     include SolidusAdmin::StimulusHelper
     include SolidusAdmin::VoidElementsHelper
     include SolidusAdmin::FlashHelper
-    include Turbo::FramesHelper
-    include Turbo::StreamsHelper
+    include ::Turbo::FramesHelper
+    include ::Turbo::StreamsHelper
 
     def icon_tag(name, **attrs)
       render component("ui/icon").new(name:, **attrs)
diff --git a/admin/app/components/solidus_admin/products/show/component.html.erb b/admin/app/components/solidus_admin/products/show/component.html.erb
index 08346278ae4..4b7d3b4b6f4 100644
--- a/admin/app/components/solidus_admin/products/show/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/component.html.erb
@@ -160,15 +160,13 @@
 
         <%= render component("ui/panel").new(title: t(".product_organization")) do |panel| %>
           <%= f.hidden_field :taxon_ids, multiple: true, value: nil %>
-          <%= turbo_frame_tag :product_organization_frame do %>
+          <%= render component("turbo/target_frame").new(:product_organization_frame, source: :new_product_category) do %>
             <%= render component("ui/forms/field").select(
               f,
               :taxon_ids,
               taxon_options,
               multiple: true
             ) %>
-            <%= turbo_stream.update :new_product_category, nil %>
-            <%= turbo_stream.replace :flash_toasts, component("layout/flashes/toasts").new(toasts:) %>
           <% end %>
           <% panel.with_action(
             name: t(".add_new_category"),
diff --git a/admin/app/components/solidus_admin/turbo/target_frame/component.html.erb b/admin/app/components/solidus_admin/turbo/target_frame/component.html.erb
new file mode 100644
index 00000000000..f73e3b094e8
--- /dev/null
+++ b/admin/app/components/solidus_admin/turbo/target_frame/component.html.erb
@@ -0,0 +1,5 @@
+<%= turbo_frame_tag @id do %>
+  <%= content %>
+  <%= turbo_stream.update(@source, nil) if @source %>
+  <%= turbo_stream.replace :flash_toasts, component("layout/flashes/toasts").new(toasts:) %>
+<% end %>
diff --git a/admin/app/components/solidus_admin/turbo/target_frame/component.rb b/admin/app/components/solidus_admin/turbo/target_frame/component.rb
new file mode 100644
index 00000000000..24fa1e43219
--- /dev/null
+++ b/admin/app/components/solidus_admin/turbo/target_frame/component.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Turbo::TargetFrame::Component < SolidusAdmin::BaseComponent
+  def initialize(id, source: nil)
+    @id = id
+    @source = source
+  end
+end

From 16304cb43a2d7aa873bac12bf56c2179c1466be0 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 17 Jun 2025 15:38:56 +0200
Subject: [PATCH 28/35] Add feature helper

---
 admin/lib/solidus_admin/testing_support/feature_helpers.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin/lib/solidus_admin/testing_support/feature_helpers.rb b/admin/lib/solidus_admin/testing_support/feature_helpers.rb
index 54e242a6d08..f9828217100 100644
--- a/admin/lib/solidus_admin/testing_support/feature_helpers.rb
+++ b/admin/lib/solidus_admin/testing_support/feature_helpers.rb
@@ -73,6 +73,10 @@ def clear_search
           find('button[aria-label="Clear"]').click
         end
       end
+
+      def solidus_select_control(field)
+        find_field(field, visible: :all).ancestor(".control")
+      end
     end
   end
 end

From 518ca2810a00d7e40e0c01783cfddcd495f9acca Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 17 Jun 2025 15:56:46 +0200
Subject: [PATCH 29/35] Move capybara feature helpers

These helpers are related to new admin so it's better to place them in
feature_helpers.rb
---
 .../solidus_admin/testing_support/feature_helpers.rb   | 10 ++++++++++
 core/lib/spree/testing_support/capybara_ext.rb         | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin/lib/solidus_admin/testing_support/feature_helpers.rb b/admin/lib/solidus_admin/testing_support/feature_helpers.rb
index f9828217100..194315f693a 100644
--- a/admin/lib/solidus_admin/testing_support/feature_helpers.rb
+++ b/admin/lib/solidus_admin/testing_support/feature_helpers.rb
@@ -77,6 +77,16 @@ def clear_search
       def solidus_select_control(field)
         find_field(field, visible: :all).ancestor(".control")
       end
+
+      def dialog(parent: 'body', **options)
+        within(parent) do
+          find('dialog', visible: :all, **options)
+        end
+      end
+
+      def turbo_frame_modal
+        dialog(parent: find('turbo-frame', visible: :all))
+      end
     end
   end
 end
diff --git a/core/lib/spree/testing_support/capybara_ext.rb b/core/lib/spree/testing_support/capybara_ext.rb
index 33dd0ffc694..2b259eb1105 100644
--- a/core/lib/spree/testing_support/capybara_ext.rb
+++ b/core/lib/spree/testing_support/capybara_ext.rb
@@ -110,16 +110,6 @@ def find_label_by_text(text)
         # find the original.
         find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
       end
-
-      def dialog(parent: 'body', **options)
-        within(parent) do
-          find('dialog', visible: :all, **options)
-        end
-      end
-
-      def turbo_frame_modal
-        dialog(parent: find('turbo-frame', visible: :all))
-      end
     end
   end
 end

From 2d19c9e30079caec4454c4f92a3fef6f8d470e37 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 17 Jun 2025 16:17:18 +0200
Subject: [PATCH 30/35] Add feature tests

---
 admin/spec/features/product_spec.rb | 79 +++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/admin/spec/features/product_spec.rb b/admin/spec/features/product_spec.rb
index b6fc21abef5..e0cbb5f88ab 100644
--- a/admin/spec/features/product_spec.rb
+++ b/admin/spec/features/product_spec.rb
@@ -128,4 +128,83 @@
       let(:path) { solidus_admin.product_path(product) }
     end
   end
+
+  describe "product organization", :js do
+    let(:taxonomy) { create(:taxonomy, name: "Apparel") }
+    let(:root_taxon) { taxonomy.root }
+    let!(:child_taxon) { create(:taxon, name: "Caps", parent: root_taxon) }
+    let!(:product) { create(:product, name: "Just a product", slug: 'just-a-prod', price: 19.99) }
+
+    describe "assigning categories" do
+      it "assigns product categories" do
+        visit "/admin/products/just-a-prod"
+        expect(solidus_select_control("Categories").text).to be_empty
+
+        solidus_select %w[Apparel Caps], from: "Categories"
+        within("header") { click_on "Save" }
+        expect(page).to have_content("Product was successfully updated.")
+
+        visit "/admin/products/just-a-prod"
+        expect(solidus_select_control("Categories")).to have_content("Apparel")
+        expect(solidus_select_control("Categories")).to have_content("Caps")
+      end
+
+      it "unassigns product categories" do
+        product.taxons << root_taxon
+
+        visit "/admin/products/just-a-prod"
+        solidus_unselect "Apparel", from: "Categories"
+        within("header") { click_on "Save" }
+        expect(page).to have_content("Product was successfully updated.")
+
+        visit "/admin/products/just-a-prod"
+        expect(solidus_select_control("Categories").text).to be_empty
+      end
+    end
+
+    context "adding new category" do
+      it "creates new category and assigns it to product" do
+        visit "/admin/products/just-a-prod"
+        click_on "Add new category"
+        expect(page).to have_content("New Category")
+
+        within(dialog) do
+          fill_in "Name", with: "Jackets"
+          solidus_select "Apparel", from: "Parent Category"
+          click_on "Add Category"
+        end
+
+        expect(page).to have_content("Product category was successfully added.")
+        expect(page).not_to have_css("dialog")
+        expect(page).not_to have_content("New Category")
+        expect(solidus_select_control("Categories")).to have_content("Jackets")
+      end
+
+      context "with invalid attributes" do
+        context "with blank name" do
+          it "shows error" do
+            visit "/admin/products/just-a-prod"
+            click_on "Add new category"
+            within(dialog) { click_on "Add Category" }
+
+            expect(dialog).to have_content("can't be blank")
+          end
+        end
+
+        context "when taxon with same name already belongs to a parent" do
+          it "shows error" do
+            visit "/admin/products/just-a-prod"
+            click_on "Add new category"
+            within(dialog) do
+              fill_in "Name", with: child_taxon.name
+              solidus_select "Apparel", from: "Parent Category"
+              click_on "Add Category"
+            end
+
+            expect(dialog).to have_content("must be unique under the same parent Taxon")
+          end
+        end
+      end
+    end
+  end
 end

From a855d22f909d605bb5057639c691bb80b38ffcc4 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 17 Jun 2025 18:14:42 +0200
Subject: [PATCH 31/35] Remove invalid_attributes declaration

This should not be in shared helper, perhaps missed it during
refactoring.
---
 .../testing_support/shared_examples/crud_resource_requests.rb   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/admin/lib/solidus_admin/testing_support/shared_examples/crud_resource_requests.rb b/admin/lib/solidus_admin/testing_support/shared_examples/crud_resource_requests.rb
index 8049a450da2..f575ea0d59d 100644
--- a/admin/lib/solidus_admin/testing_support/shared_examples/crud_resource_requests.rb
+++ b/admin/lib/solidus_admin/testing_support/shared_examples/crud_resource_requests.rb
@@ -48,8 +48,6 @@
     end
 
     context "with invalid parameters" do
-      let(:invalid_attributes) { { name: "", code: "", active: true } }
-
       it "does not create a new #{resource_name.humanize}" do
         expect {
           post url_helpers.public_send("#{resource_name.pluralize}_path"), params: { resource_name => invalid_attributes }

From ef615878df469897169ff0609c2640b3fd64099f Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Tue, 17 Jun 2025 19:14:10 +0200
Subject: [PATCH 32/35] Add request tests

---
 .../solidus_admin/product_taxons_spec.rb      | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 admin/spec/requests/solidus_admin/product_taxons_spec.rb

diff --git a/admin/spec/requests/solidus_admin/product_taxons_spec.rb b/admin/spec/requests/solidus_admin/product_taxons_spec.rb
new file mode 100644
index 00000000000..fde4e059be1
--- /dev/null
+++ b/admin/spec/requests/solidus_admin/product_taxons_spec.rb
@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "SolidusAdmin::ProductTaxonsController", type: :request do
+  let(:admin_user) { create(:admin_user) }
+  let!(:product) { create(:product) }
+
+  before do
+    allow_any_instance_of(SolidusAdmin::BaseController).to receive(:spree_current_user).and_return(admin_user)
+  end
+
+  describe "GET /new" do
+    it "renders the new template with a 200 OK status" do
+      get solidus_admin.new_product_taxon_path(product)
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe "POST /create" do
+    context "when taxon belongs to a parent" do
+      context "with valid parameters" do
+        let!(:parent_taxon) { create(:taxonomy).root }
+        let(:valid_attributes) { { name: "Accessories", parent_id: parent_taxon.id } }
+
+        it "creates new taxon and new classification" do
+          expect(Spree::Taxon.count).to eq(1)
+          expect(product.classifications.count).to eq(0)
+
+          post solidus_admin.product_taxons_path(product), params: { taxon: valid_attributes }
+
+          expect(Spree::Taxon.count).to eq(2)
+          expect(product.classifications.count).to eq(1)
+        end
+
+        it "redirects with a 303 See Other status" do
+          post solidus_admin.product_taxons_path(product), params: { taxon: valid_attributes }
+          expect(response).to redirect_to(solidus_admin.product_path(product))
+          expect(response).to have_http_status(:see_other)
+        end
+      end
+
+      context "with invalid parameters" do
+        let(:invalid_attributes) { { name: "" } }
+
+        it "does not create a new taxon" do
+          expect {
+            post solidus_admin.product_taxons_path(product), params: { taxon: invalid_attributes }
+          }.not_to change(Spree::Taxon, :count)
+        end
+
+        it "returns unprocessable_entity status" do
+          post solidus_admin.product_taxons_path(product), params: { taxon: invalid_attributes }
+          expect(response).to have_http_status(:unprocessable_entity)
+        end
+      end
+    end
+
+    context "when taxon is a root" do
+      context "with valid parameters" do
+        let(:valid_attributes) { { name: "Accessories", parent_id: nil } }
+
+        it "creates new taxonomy, new root taxon and new classification" do
+          expect(Spree::Taxonomy.count).to eq(0)
+          expect(Spree::Taxon.count).to eq(0)
+          expect(product.classifications.count).to eq(0)
+
+          post solidus_admin.product_taxons_path(product), params: { taxon: valid_attributes }
+
+          expect(Spree::Taxonomy.count).to eq(1)
+          expect(Spree::Taxon.count).to eq(1)
+          expect(product.classifications.count).to eq(1)
+        end
+
+        it "redirects with a 303 See Other status" do
+          post solidus_admin.product_taxons_path(product), params: { taxon: valid_attributes }
+          expect(response).to redirect_to(solidus_admin.product_path(product))
+          expect(response).to have_http_status(:see_other)
+        end
+      end
+
+      context "with invalid parameters" do
+        let!(:another_root_taxon) { create(:taxonomy, name: "Apparel").root }
+        let(:invalid_attributes) { { name: another_root_taxon.name, parent_id: nil } }
+
+        it "does not create new records" do
+          expect(Spree::Taxonomy.count).to eq(1)
+          expect(Spree::Taxon.count).to eq(1)
+          expect(product.classifications.count).to eq(0)
+
+          post solidus_admin.product_taxons_path(product), params: { taxon: invalid_attributes }
+
+          expect(Spree::Taxonomy.count).to eq(1)
+          expect(Spree::Taxon.count).to eq(1)
+          expect(product.classifications.count).to eq(0)
+        end
+
+        it "returns unprocessable_entity status" do
+          post solidus_admin.product_taxons_path(product), params: { taxon: invalid_attributes }
+          expect(response).to have_http_status(:unprocessable_entity)
+        end
+      end
+    end
+  end
+end

From b1e8970e64a02fade8e69c8be66709cc35a9057b Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Wed, 25 Jun 2025 13:01:53 +0200
Subject: [PATCH 33/35] Fix rubocop offence

---
 .../solidus_admin/products/show/categories/new/component.rb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/products/show/categories/new/component.rb b/admin/app/components/solidus_admin/products/show/categories/new/component.rb
index 4d7dee3c326..a60bfd51937 100644
--- a/admin/app/components/solidus_admin/products/show/categories/new/component.rb
+++ b/admin/app/components/solidus_admin/products/show/categories/new/component.rb
@@ -11,7 +11,7 @@ def initialize(product:, taxon: nil)
   def parent_taxon_options
     @parent_taxon_options ||= Spree::Taxon.order(:lft).pluck(:name, :id, :depth).map do
       name, id, depth = _1
-      ["#{"    " * depth} → #{name}", id, { data: { item_label: name } }]
+      ["#{'    ' * depth} → #{name}", id, { data: { item_label: name } }]
     end
   end
 end

From cbd793cdf0184e7b1aaf97faeccf760f2a2043f5 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Fri, 27 Jun 2025 23:00:51 +0200
Subject: [PATCH 34/35] Allow empty parent for new category

Choosing empty parent category will create a root taxon and a new
taxonomy record under the hood.
---
 .../products/show/categories/new/component.html.erb             | 2 +-
 .../solidus_admin/products/show/categories/new/component.yml    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/products/show/categories/new/component.html.erb b/admin/app/components/solidus_admin/products/show/categories/new/component.html.erb
index 726e1251ca9..835105c8def 100644
--- a/admin/app/components/solidus_admin/products/show/categories/new/component.html.erb
+++ b/admin/app/components/solidus_admin/products/show/categories/new/component.html.erb
@@ -3,7 +3,7 @@
     <%= form_for @taxon, url: solidus_admin.product_taxons_path(@product), method: :post, html: { id: dom_id(@taxon) } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
-        <%= render component("ui/forms/field").select(f, :parent_id, parent_taxon_options) %>
+        <%= render component("ui/forms/field").select(f, :parent_id, parent_taxon_options, include_blank: t(".none")) %>
         <%= render component("ui/forms/field").text_area(f, :description) %>
       </div>
     <% end %>
diff --git a/admin/app/components/solidus_admin/products/show/categories/new/component.yml b/admin/app/components/solidus_admin/products/show/categories/new/component.yml
index b9180a77b6d..6b3ae093e25 100644
--- a/admin/app/components/solidus_admin/products/show/categories/new/component.yml
+++ b/admin/app/components/solidus_admin/products/show/categories/new/component.yml
@@ -1,4 +1,5 @@
 en:
   cancel: "Cancel"
+  none: "None"
   submit: "Add Category"
   title: "New Category"

From 84b72e152bc5baabb71b702e88963a562383f786 Mon Sep 17 00:00:00 2001
From: Eugene Chaikin <nutaksho@gmail.com>
Date: Fri, 27 Jun 2025 23:27:52 +0200
Subject: [PATCH 35/35] Exclude feature_helpers from coverage report

---
 admin/spec/spec_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/spec/spec_helper.rb b/admin/spec/spec_helper.rb
index 38bed2afc8f..bec19ed0b0d 100644
--- a/admin/spec/spec_helper.rb
+++ b/admin/spec/spec_helper.rb
@@ -10,6 +10,7 @@
   SimpleCov.merge_timeout(3600)
   SimpleCov.start('rails') do
     add_filter '/shared_examples/'
+    add_filter '/testing_support/feature_helpers'
   end
 end