spree_admin 5.4.3 → 5.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a5af2b78a13b13f570093bfe92c6d6c6b3ade67ec72e294fbf0f1ffd9c121d6
-  data.tar.gz: 6dfa405d89717625d66b270fe16f7343bb8ec532f8ba673ee856361eb3682e92
+  metadata.gz: 2f4bbbb1dd33ca70b641c0c4c687f4a8a36731ec816c3324930b44139d911bd6
+  data.tar.gz: d402abe10df4c9fe520db4f9b97fb17e33172238ff7e58b14f71b2754a9c09a5
 SHA512:
-  metadata.gz: 9172a34304882f931b1bf56502ffd09121ca3497d8e3b24b5520dc03cf6cebf5a70c6e284615098dc4c70462f153aa204899911f152902e75317b5130760222d
-  data.tar.gz: 91f7065af97ecddea447d6add3cd60ab8d36ceb6590ced8ca3e74bbe65a26eeded78625209b38e5b5ad9f26e43605bdc05fb594664f0d1aad1fbe51af22f17b9
+  metadata.gz: 9931e85d7ade12bc71fd556f9014cb410ad03e205eedc6ba4c1bc03d3e5d38a32ddabd7a5b34114fe0cb1b58059d7b6ce36907c3515a866812609c9911989517
+  data.tar.gz: 8f9090d2f5d25c761f4f3ce74701fabd179b9947c21ce23ab64362ac67363ce77b63c624136a35bb02b2897d60fe72e716ac4e8539fdc032f5bc7c7cdbcab12c

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

@@ -38,8 +38,14 @@ module Spree
 
       private
 
+      # Includes :variant_ids so the variant-assignment checkboxes mass-assign
+      # straight into Spree::Asset#variant_ids= — the model resolves prefixed
+      # ids and rejects cross-product variants.
       def permitted_resource_params
-        params.require(:asset).permit(Spree::PermittedAttributes.asset_attributes)
+        params.require(:asset).permit(
+          *Spree::PermittedAttributes.asset_attributes,
+          variant_ids: []
+        )
       end
 
       def create_turbo_stream_enabled?

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

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    class ChannelsController < ResourceController
+      include Spree::Admin::SettingsConcern
+
+      private
+
+      def permitted_resource_params
+        params.require(:channel).permit(permitted_channel_attributes)
+      end
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ module Spree
       new_action.before :build_master_stock_items
       edit_action.before :build_master_prices
       edit_action.before :build_master_stock_items
-      create.after :assign_master_images
+      create.after :assign_session_uploaded_assets
       update.before :skip_updating_status
       update.before :update_status
       update.before :remove_empty_params
@@ -185,7 +185,7 @@ module Spree
           @product_variant_ids[variant.human_name] = variant.id.to_s
           @product_variant_prefix_ids[variant.human_name] = variant.to_param
 
-          image = variant.primary_media
+          image = variant.primary_media || @product.primary_media
           if image.present? && image.attached? && image.variable?
             @product_variant_images[variant.human_name] = helpers.spree_image_url(image, variant: :mini)
           end
@@ -287,15 +287,15 @@ module Spree
         {}
       end
 
-      def assign_master_images
-        return unless @product.master.persisted?
-
-        uploaded_assets = session_uploaded_assets('Spree::Variant')
+      def assign_session_uploaded_assets
+        uploaded_assets = session_uploaded_assets('Spree::Product')
 
         return if uploaded_assets.empty?
 
-        uploaded_assets.update_all(viewable_id: @product.master.id, viewable_type: 'Spree::Variant', updated_at: Time.current)
-        clear_session_for_uploaded_assets('Spree::Variant')
+        uploaded_assets.update_all(viewable_id: @product.id, viewable_type: 'Spree::Product', updated_at: Time.current)
+        @product.update_thumbnail!
+
+        clear_session_for_uploaded_assets('Spree::Product')
       end
 
       def check_slug_availability

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

@@ -3,7 +3,11 @@ module Spree
     module AssetsHelper
       def media_form_assets(viewable, viewable_type)
         if viewable&.persisted?
-          viewable.images
+          # Product#images delegates to the master variant (legacy alias), so
+          # 5.5+ product-level uploads wouldn't show. gallery_media returns
+          # product-level media when present and falls back to legacy
+          # variant-pinned images during the transition.
+          viewable.respond_to?(:gallery_media) ? viewable.gallery_media : viewable.images
         elsif session_uploaded_assets(viewable_type).any?
           Spree::Asset.accessible_by(current_ability, :manage).where(id: session_uploaded_assets(viewable_type))
         else

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

@@ -36,14 +36,6 @@ module Spree
         @settings_area.present?
       end
 
-      def settings_active?
-        Spree::Deprecation.warn('settings_active? is deprecated and will be removed in Spree 5.5. Please use settings_area? instead')
-        @settings_active || %w[admin_users audits custom_domains exports invitations oauth_applications
-                               payment_methods refund_reasons reimbursement_types return_authorization_reasons roles
-                               shipping_categories shipping_methods stock_locations store_credit_categories
-                               stores tax_categories tax_rates webhooks webhooks_subscribers zones policies metafield_definitions].include?(controller_name) || settings_area?
-      end
-
       # @return [Array<String>] the available countries for checkout
       def available_countries_iso
         @available_countries_iso ||= current_store.countries_available_for_checkout.pluck(:iso)

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

@@ -0,0 +1,14 @@
+module Spree
+  module Admin
+    module ChannelsHelper
+      # Registered +Spree::OrderRouting::Strategy::Base+ subclasses presented in
+      # the channel edit form, sourced from +Spree.order_routing.strategies+ so the
+      # picker can never drift from what the model accepts. A blank value clears the
+      # channel-level override and falls back to
+      # +Store#preferred_order_routing_strategy+.
+      def channel_order_routing_strategy_options
+        Spree.order_routing.strategies.map { |strategy| [strategy.display_name, strategy.to_s] }
+      end
+    end
+  end
+end

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

@@ -69,6 +69,11 @@ module Spree
           return Spree.api.public_send(method_name)
         end
 
+        if namespace == 'Spree::Api::V3::Admin'
+          method_name = "admin_#{class_name.underscore}_serializer"
+          return Spree.api.public_send(method_name) if Spree.api.respond_to?(method_name)
+        end
+
         # Fall back to direct constant lookup
         serializer_class_name = "#{namespace}::#{class_name}Serializer"
         serializer_class_name.safe_constantize

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

@@ -1,24 +1,6 @@
 module Spree
   module Admin
     module OrdersHelper
-      TaxLine = Struct.new(:label, :display_amount, :item, :for_shipment, keyword_init: true) do
-        def name
-          Spree::Deprecation.warn("TaxLine is deprecated and will be removed in Spree 5.5")
-          item_name = item.name
-          item_name += " #{Spree.t(:shipment).downcase}" if for_shipment
-
-          "#{label} (#{item_name})"
-        end
-      end
-
-      def order_summary_tax_lines_additional(order)
-        Spree::Deprecation.warn("order_summary_tax_lines_additional is deprecated and will be removed in Spree 5.5")
-        line_item_taxes = order.line_item_adjustments.tax.map { |tax_adjustment| map_to_tax_line(tax_adjustment) }
-        shipment_taxes = order.shipment_adjustments.tax.map { |tax_adjustment| map_to_tax_line(tax_adjustment, for_shipment: true) }
-
-        line_item_taxes + shipment_taxes
-      end
-
       def order_payment_state(order, options = {})
         return if order.payment_state.blank?
 
@@ -140,17 +122,6 @@ module Spree
           '' => 'Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered'
         }
       end
-
-      private
-
-      def map_to_tax_line(tax_adjustment, for_shipment: false)
-        TaxLine.new(
-          label: tax_adjustment.label,
-          display_amount: tax_adjustment.display_amount,
-          item: tax_adjustment.adjustable,
-          for_shipment: for_shipment
-        )
-      end
     end
   end
 end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    # Helpers for the product Publishing card in the Rails admin. Mirrors the
+    # SPA's publishing card (see packages/dashboard/src/components/spree/products/publishing-card.tsx):
+    # per-channel status is gated by product status — Draft/Archived products
+    # render every publication as +not_available+ regardless of window.
+    module PublishingHelper
+      # @param product_status [String] the product's status (draft/active/archived)
+      # @param publication [Spree::ProductPublication]
+      # @return [Symbol] one of :live, :scheduled, :hidden, :not_available
+      def publication_schedule_status(product_status, publication)
+        return :not_available unless product_status == 'active'
+
+        now = Time.current
+        return :hidden if publication.unpublished_at && publication.unpublished_at <= now
+        return :scheduled if publication.published_at && publication.published_at > now
+
+        :live
+      end
+
+      # Renders a colored dot + status label for a publication row.
+      def publication_status_badge(product_status, publication)
+        status = publication_schedule_status(product_status, publication)
+        dot_class = case status
+                    when :live then 'bg-success'
+                    when :scheduled then 'bg-warning'
+                    else 'bg-secondary'
+                    end
+
+        label = Spree.t("admin.publishing.status_#{status}")
+
+        content_tag(:span, class: 'd-inline-flex align-items-center gap-1 text-muted small') do
+          content_tag(:span, '', class: "publication-dot rounded-circle #{dot_class}",
+                                 style: 'display:inline-block; width:0.5rem; height:0.5rem;') +
+            content_tag(:span, label)
+        end
+      end
+
+      # One-line summary of the publication window in the store's timezone.
+      def publication_caption(product_status, publication, store)
+        status = publication_schedule_status(product_status, publication)
+        tz = ActiveSupport::TimeZone[store.preferred_timezone] || Time.zone
+
+        case status
+        when :not_available
+          Spree.t('admin.publishing.caption_not_available',
+                  product_status: Spree.t("admin.products.status_options.#{product_status}", default: product_status.to_s.humanize))
+        when :hidden
+          Spree.t('admin.publishing.caption_unpublished',
+                  date: l(publication.unpublished_at.in_time_zone(tz), format: :short))
+        when :scheduled
+          if publication.unpublished_at
+            Spree.t('admin.publishing.caption_window',
+                    start: l(publication.published_at.in_time_zone(tz), format: :short),
+                    end:   l(publication.unpublished_at.in_time_zone(tz), format: :short))
+          else
+            Spree.t('admin.publishing.caption_scheduled',
+                    date: l(publication.published_at.in_time_zone(tz), format: :short))
+          end
+        else # :live
+          if publication.unpublished_at
+            Spree.t('admin.publishing.caption_hidden_after',
+                    date: l(publication.unpublished_at.in_time_zone(tz), format: :short))
+          else
+            Spree.t('admin.publishing.caption_live')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,24 +1,6 @@
 module Spree
   module Admin
     module TurboHelper
-      def turbo_close_modal(modal_id = nil)
-        Spree::Deprecation.warn('turbo_close_modal is deprecated and will be removed in Spree 5.5. Use turbo_close_dialog instead.')
-
-        modal_id ||= 'modal'
-
-        turbo_stream.replace :modal_scripts do
-          turbo_frame_tag :modal_scripts do
-            javascript_tag do
-              raw <<~JS
-                if (document.querySelector('##{modal_id}')) {
-                  window.$("##{modal_id}").modal('hide');
-                }
-              JS
-            end
-          end
-        end
-      end
-
       def turbo_close_dialog
         turbo_stream.replace 'main-dialog' do
           render 'spree/admin/shared/dialog'

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

@@ -93,6 +93,7 @@ module Spree
       def custom_webhook_events
         %w[
           customer.password_reset_requested
+          newsletter_subscriber.subscription_requested
           order.completed
           order.paid
           order.canceled

data/app/javascript/spree/admin/application.js

@@ -68,6 +68,7 @@ import OrderBillingAddressController from 'spree/admin/controllers/order_billing
 import PageBuilderController from 'spree/admin/controllers/page_builder_controller'
 import PasswordToggle from 'spree/admin/controllers/password_toggle_controller'
 import ProductFormController from 'spree/admin/controllers/product_form_controller'
+import ProductPublishingController from 'spree/admin/controllers/product_publishing_controller'
 import QueryBuilderController from 'spree/admin/controllers/query_builder_controller'
 import RangeInputController from 'spree/admin/controllers/range_input_controller'
 import TableController from 'spree/admin/controllers/table_controller'
@@ -140,6 +141,7 @@ application.register('page-builder', PageBuilderController)
 application.register('password-toggle', PasswordToggle)
 application.register('password-visibility', PasswordVisibility)
 application.register('product-form', ProductFormController)
+application.register('product-publishing', ProductPublishingController)
 application.register('query-builder', QueryBuilderController)
 application.register('range-input', RangeInputController)
 application.register('table', TableController)

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

@@ -4,10 +4,6 @@ export default class extends Controller {
   static targets = [
     'trackInventoryCheckbox',
     'quantityForm',
-    'availableOn',
-    'makeActiveAt',
-    'discontinueOn',
-    'status',
     'pricesForm'
   ]
 
@@ -26,28 +22,6 @@ export default class extends Controller {
     this.togglePricesFormVisibility()
   }
 
-  switchAvailabilityDatesFields(event) {
-    let status = event.target.value
-    if (status === 'draft') {
-      this.show(this.availableOnTarget)
-      this.show(this.makeActiveAtTarget)
-    } else if (status === 'active') {
-      this.show(this.availableOnTarget)
-      this.hide(this.makeActiveAtTarget)
-    } else {
-      this.hide(this.availableOnTarget)
-      this.hide(this.makeActiveAtTarget)
-    }
-  }
-
-  show(element) {
-    element.classList.remove('hidden', 'd-none')
-  }
-
-  hide(element) {
-    element.classList.add('hidden')
-  }
-
   toggleQuantityFormVisibility() {
     if (this.hasQuantityFormTarget) {
       if (!this.hasVariantsValue && this.trackInventoryCheckboxTarget.checked) {

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

@@ -0,0 +1,11 @@
+import { Controller } from '@hotwired/stimulus'
+
+// Toggles the "Manage" channel-checkbox panel on the product Publishing card.
+// Pairs with spree/admin/app/views/spree/admin/products/form/_publishing.html.erb.
+export default class extends Controller {
+  static targets = ['manage']
+
+  toggleManage() {
+    this.manageTarget.classList.toggle('d-none')
+  }
+}

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

@@ -6,9 +6,26 @@ export default class extends Controller {
     'url',
   ]
 
+  connect() {
+    this.urlTouched = this.hasUrlTarget && this.urlTarget.value.length > 0
+    if (this.hasUrlTarget) {
+      this.urlTarget.addEventListener('input', () => { this.urlTouched = true })
+    }
+  }
+
   updateUrlFromName() {
+    if (this.urlTouched) return
     const name = this.nameTarget.value
-    const url = name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)+/g, '')
+    // Mirrors ActiveSupport's +String#parameterize+: NFKD decompose, drop
+    // combining marks (accents), lowercase, hyphenate the rest. Keeps the
+    // legacy admin's auto-fill aligned with what +normalizes :code+ stores
+    // server-side — without NFKD, "Café" rendered "caf-" instead of "cafe".
+    const url = name
+      .normalize('NFKD')
+      .replace(/\p{M}/gu, '')
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, '-')
+      .replace(/(^-|-$)+/g, '')
     this.urlTarget.value = url
   }
 }

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

@@ -13,6 +13,7 @@ module Spree
         [
           *metadata_rows,
           :separator,
+          channel_row,
           market_row,
           locale_row,
           currency_row,
@@ -73,6 +74,17 @@ module Spree
         rows
       end
 
+      def channel_row
+        return nil if order.channel.blank?
+
+        {
+          label: Spree.t(:channel),
+          value: order.channel.name,
+          id: 'channel',
+          link: Spree::Core::Engine.routes.url_helpers.edit_admin_channel_path(order.channel)
+        }
+      end
+
       def market_row
         return nil if order.market.blank?
 

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

@@ -24,3 +24,21 @@
     <% end %>
   </div>
 </div>
+
+<div class="card mb-6" id="api-key-scopes" data-secret-only data-show-when-key-type="secret">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t('admin.api_keys.scopes', default: 'Scopes') %></h5>
+    <p class="text-sm text-gray-500 mt-1">
+      <%= Spree.t('admin.api_keys.scopes_description', default: 'Required for secret keys. Pick the narrowest set of scopes your integration needs.') %>
+    </p>
+  </div>
+  <div class="card-body">
+    <% Spree::ApiKey::SCOPES.each do |scope| %>
+      <div class="custom-control form-checkbox mb-1">
+        <%= f.check_box :scopes, { multiple: true, class: 'custom-control-input', id: "api_key_scopes_#{scope}" }, scope, nil %>
+        <%= f.label "scopes_#{scope}", scope, class: 'custom-control-label font-mono text-sm' %>
+      </div>
+    <% end %>
+    <%= f.hidden_field :scopes, value: '', multiple: true %>
+  </div>
+</div>

data/app/views/spree/admin/assets/edit.html.erb

@@ -1,17 +1,72 @@
-<%= turbo_frame_tag :dialog do %>
-  <%= dialog_header(Spree.t(:edit) + ' ' + Spree.t(:image)) %>
+<%= turbo_frame_tag :drawer do %>
   <%= form_with model: @asset, url: spree.admin_asset_path(@asset), method: :put, scope: :asset do |f| %>
-    <div class="dialog-body pb-0" data-turbo-permanent id="asset-<%= @asset.key.parameterize %>">
-      <%= f.spree_file_field :attachment, width: 200, height: 200, can_delete: false, label: Spree.t(:image) %>
+    <%= drawer_header(Spree.t(:edit) + ' ' + Spree.t(:image)) %>
+
+    <div class="drawer-body">
+      <% if @asset.attachment.attached? %>
+        <% blob_url_opts = { host: request.host_with_port, protocol: (request.ssl? ? 'https' : 'http') } %>
+        <% download_url = Rails.application.routes.url_helpers.rails_blob_url(@asset.attachment.blob, **blob_url_opts, disposition: 'attachment') %>
+        <% original_url = Rails.application.routes.url_helpers.rails_blob_url(@asset.attachment.blob, **blob_url_opts) %>
+        <div class="mb-4 rounded-lg border bg-light overflow-hidden">
+          <a href="<%= original_url %>"
+             target="_blank"
+             rel="noopener"
+             title="<%= Spree.t(:view_full_size) %>"
+             style="display: block; position: relative; cursor: zoom-in;">
+            <%= spree_image_tag(@asset.attachment, variant: :large, alt: @asset.alt, class: 'w-full max-h-96 object-contain') %>
+            <span style="position: absolute; top: 8px; right: 8px; display: inline-flex; align-items: center; justify-content: center; width: 32px; height: 32px; border-radius: 6px; background: rgba(255,255,255,0.95); color: #4b5563; box-shadow: 0 1px 2px rgba(0,0,0,0.1); pointer-events: none;">
+              <%= icon('zoom-in', class: 'mr-0') %>
+            </span>
+          </a>
+        </div>
+        <div class="flex gap-2 mb-4">
+          <%= link_to original_url, target: '_blank', rel: 'noopener', class: 'btn btn-light btn-sm' do %>
+            <%= icon('external-link', class: 'mr-1') %><%= Spree.t(:view_full_size) %>
+          <% end %>
+          <%= link_to download_url, target: '_blank', rel: 'noopener', class: 'btn btn-light btn-sm' do %>
+            <%= icon('download', class: 'mr-1') %><%= Spree.t(:download) %>
+          <% end %>
+        </div>
+      <% else %>
+        <%= f.spree_file_field :attachment, width: 200, height: 200, can_delete: false, label: Spree.t(:image) %>
+      <% end %>
+
+      <%= f.spree_text_area :alt, label: Spree.t(:alt_text), rows: 3 %>
+
+      <%# Variant assignment shows only for product-level assets — variant-pinned assets
+          already live on a single variant via the polymorphic viewable, so the
+          join-table UI doesn't apply. Empty submission (no boxes ticked) clears
+          all links thanks to the hidden field below. %>
+      <% if @asset.viewable_type == 'Spree::Product' && @asset.viewable.present? && @asset.viewable.variants.any? %>
+        <% product = @asset.viewable %>
+        <% linked_ids = @asset.variant_media.pluck(:variant_id).to_set %>
+        <div class="mt-4 pt-4 border-t">
+          <label class="form-label"><%= Spree.t(:assigned_variants) %></label>
+          <p class="text-muted small mb-2">
+            <%= Spree.t(:assigned_variants_help) %>
+          </p>
+          <%= hidden_field_tag 'asset[variant_ids][]', '' %>
+          <div class="flex flex-col gap-1">
+            <% product.variants.each do |variant| %>
+              <% chip_id = "asset_variant_#{variant.id}" %>
+              <div class="custom-control form-checkbox rounded-lg hover:bg-gray-100 p-2 transition-colors duration-100 ease-linear">
+                <%= check_box_tag('asset[variant_ids][]', variant.to_param, linked_ids.include?(variant.id), id: chip_id, class: 'custom-control-input') %>
+                <%= label_tag chip_id, class: 'custom-control-label' do %>
+                  <%= variant.descriptive_name.presence || variant.sku %>
+                <% end %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
     </div>
-    <div class="dialog-body" style="min-height: 200px">
-      <%= f.spree_text_area :alt, label: Spree.t(:alt_text), rows: 4 %>
-    </div>
-    <div class="dialog-footer">
+
+    <div class="drawer-footer gap-3">
       <%= turbo_save_button_tag %>
+      <%= drawer_discard_button %>
       <%= link_to Spree.t('actions.destroy'), object_url(@asset),
           data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: '_top' },
           class: 'btn btn-danger ml-auto' if can?(:destroy, @asset) %>
     </div>
   <% end %>
-<% end %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<div class="card mb-6">
+  <div class="card-body" data-controller="slug-form">
+    <%= f.spree_text_field :name,
+                           autofocus: f.object.new_record?,
+                           required: true,
+                           data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>
+    <%= f.spree_text_field :code,
+                           required: true,
+                           hint: Spree.t('admin.channels.code_hint'),
+                           data: { slug_form_target: :url } %>
+    <%= f.spree_check_box :active, label: Spree.t(:active) %>
+    <%= f.spree_check_box :default, label: Spree.t('admin.channels.default'), hint: Spree.t('admin.channels.default_hint') %>
+    <%= f.spree_select :preferred_order_routing_strategy,
+        options_for_select(channel_order_routing_strategy_options, f.object.preferred_order_routing_strategy),
+        { label: Spree.t('admin.channels.order_routing_strategy'),
+          help_bubble: Spree.t('admin.channels.order_routing_strategy_hint'),
+          include_blank: Spree.t('admin.channels.order_routing_strategy_inherit') } %>
+  </div>
+</div>

data/app/views/spree/admin/channels/edit.html.erb

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -0,0 +1,12 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:channels) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:channels_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_channel), new_object_url, class: "btn btn-primary" if can? :create, Spree::Channel %>
+<% end %>
+
+<%= render_admin_partials(:channels_header_partials) %>
+
+<%= render_table @collection, :channels %>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/new_resource' %>

data/app/views/spree/admin/integrations/_integration.html.erb

@@ -5,29 +5,27 @@
 
 <div id="integration-<%= integration_class.integration_key %>" class="col mb-6 flex items-stretch">
   <div class="card w-full">
-    <div class="card-header border-b flex flex-col gap-4 items-center justify-between h-auto pr-4 <% if integration.present? %>bg-green-50<% end %>">
+    <div class="card-header border-b flex items-center justify-center h-auto pr-4 <% if integration.present? %>bg-green-50<% end %>">
       <div class="flex items-center py-1">
         <%= image_tag integration_class.icon_path, alt: integration_name, height: 36 if integration_class.icon_path.present? %>
       </div>
-
-      <% if integration.present? %>
-        <span class="badge badge-success small">
-          <%= icon('check', class: 'mr-1') %>
-          <%= Spree.t(:active) %>
-        </span>
-      <% end %>
     </div>
 
     <div class="card-body">
       <p><%= integration_description %></p>
     </div>
 
-    <div class="card-footer flex <% if integration.present? %>items-baseline justify-between<% else %>flex-col<% end %>">
+    <div class="card-footer flex <% if integration.present? %>items-center gap-3<% else %>flex-col<% end %>">
       <% if integration.present? %>
         <%= link_to spree.edit_admin_integration_path(integration), class: 'btn btn-sm btn-light' do %>
           <%= icon 'settings' %>
           <%= Spree.t(:settings) %>
         <% end if can?(:update, integration) %>
+
+        <span class="ml-auto inline-flex items-center text-xs font-medium text-green-700">
+          <span class="w-1.5 h-1.5 rounded-full bg-green-500 mr-1"></span>
+          <%= Spree.t(:active) %>
+        </span>
       <% else %>
         <%= link_to_with_icon 'plus', "#{Spree.t('actions.connect')} #{integration_class.integration_name}", spree.new_admin_integration_path(integration: { type: integration_class.name }), class: 'btn btn-primary truncate w-full' if can?(:create, Spree::Integration) %>
       <% end %>

data/app/views/spree/admin/integrations/edit.html.erb

@@ -5,7 +5,7 @@
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %>
 
-<%= form_for @integration, as: :integration, url: spree.admin_integration_path(@integration) do |form| %>
+<%= form_for @integration, as: :integration, url: spree.admin_integration_path(@integration), html: { id: "edit_integration_#{@integration.id}" } do |form| %>
   <div class="grid grid-cols-12 gap-6">
     <div class="col-span-12 lg:col-span-6 lg:col-start-4">
       <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>

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

@@ -1,7 +1,7 @@
 <div class="grid grid-cols-12 gap-6" data-controller="product-form slug-form seo-form" data-seo-form-editor-value="tinymce">
   <div class="col-span-12 md:col-span-8">
     <%= render 'spree/admin/products/form/base', f: f %>
-    <%= render 'spree/admin/shared/media_form', viewable: @product.master, viewable_type: 'Spree::Variant' %>
+    <%= render 'spree/admin/shared/media_form', viewable: @product, viewable_type: 'Spree::Product' %>
     <%= f.fields_for :master, @product.master do |vf| %>
       <%= render 'spree/admin/variants/form/pricing', f: vf %>
     <% end unless @product.has_variants? %>
@@ -11,6 +11,7 @@
   </div>
   <div class="col-span-12 md:col-span-4">
     <%= render 'spree/admin/products/form/status', f: f %>
+    <%= render 'spree/admin/products/form/publishing', f: f %>
     <%= render 'spree/admin/products/form/categorization', f: f %>
     <%= render 'spree/admin/products/form/shipping', f: f %>
     <%= render 'spree/admin/products/form/tax', f: f %>

data/app/views/spree/admin/products/form/_publishing.html.erb

@@ -0,0 +1,125 @@
+<%#
+  Publishing card — mirrors the SPA's <PublishingCard> in
+  packages/dashboard/src/components/spree/products/publishing-card.tsx.
+
+  All channel attach/detach AND per-channel scheduling submit through the
+  same nested-attributes form (+legacy_product_publications_attributes+). Each row
+  in the Manage panel toggles the +_destroy+ flag on the corresponding
+  publication; unchecked rows for unattached channels send blank attrs that
+  the model's +reject_if+ discards.
+
+  Datetime inputs render values in the store's timezone since datetime-local
+  has no TZ awareness (same pattern as the legacy form/_status partial).
+%>
+
+<%
+  store_timezone = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
+  to_store_local = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
+  tz_help        = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
+  store_channels = current_store.channels.order(:name).to_a
+  publications_by_channel = @product.product_publications.includes(:channel).index_by(&:channel_id)
+
+  # Build one record per store channel: the existing publication when
+  # attached, or a fresh ProductPublication when not. Stable channel-keyed
+  # indices keep the form params deterministic so checkbox toggles always
+  # reference the right slot.
+  channel_rows = store_channels.map do |channel|
+    publication = publications_by_channel[channel.id] ||
+                  @product.product_publications.build(channel: channel)
+    [channel, publication]
+  end
+%>
+
+<div class="card mb-6" data-controller="product-publishing">
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h6 class="card-title mb-0"><%= Spree.t('admin.publishing.title') %></h6>
+    <% if store_channels.any? %>
+      <button type="button"
+              class="btn btn-sm btn-outline-secondary"
+              data-action="product-publishing#toggleManage">
+        <%= Spree.t('admin.publishing.manage_cta') %>
+      </button>
+    <% end %>
+  </div>
+
+  <div class="card-body">
+    <% if store_channels.empty? %>
+      <p class="text-xs text-muted mb-0"><%= Spree.t('admin.publishing.no_channels') %></p>
+    <% else %>
+      <%# ---- Manage panel (hidden by default) ---- %>
+      <div class="d-none flex flex-col gap-2 mb-3" data-product-publishing-target="manage">
+        <p class="text-xs text-muted mb-1"><%= Spree.t('admin.publishing.manage_description') %></p>
+        <% channel_rows.each_with_index do |(channel, publication), index| %>
+          <%= f.fields_for :legacy_product_publications, publication, child_index: index do |pf| %>
+            <%= pf.hidden_field :id if publication.persisted? %>
+            <%= pf.hidden_field :channel_id, value: channel.id %>
+            <% checked_by_default = publication.persisted? || (@product.new_record? && channel.default?) %>
+            <label class="flex items-center gap-3 rounded border px-3 py-2 cursor-pointer hover:bg-gray-50 text-sm">
+              <%# The +_destroy+ hidden field defaults to 1 (= destroy/skip);
+                  the checkbox flips it to 0 (= keep/upsert) when checked.
+                  +include_hidden: false+ on the checkbox keeps Rails from
+                  emitting its own competing hidden field. %>
+              <%= pf.hidden_field :_destroy, value: '1', id: nil %>
+              <%= pf.check_box :_destroy,
+                               { checked: checked_by_default,
+                                 class: 'form-check-input m-0',
+                                 include_hidden: false },
+                               '0', '1' %>
+              <span class="flex-1"><%= channel.name %></span>
+              <% unless channel.active? %>
+                <span class="text-xs text-muted"><%= Spree.t('admin.publishing.inactive_marker') %></span>
+              <% end %>
+            </label>
+          <% end %>
+        <% end %>
+      </div>
+
+      <%# ---- Per-publication scheduling rows ---- %>
+      <% if publications_by_channel.empty? %>
+        <p class="text-xs text-muted mb-0"><%= Spree.t('admin.publishing.empty') %></p>
+      <% else %>
+        <% channel_rows.each_with_index do |(channel, publication), index| %>
+          <% next unless publication.persisted? %>
+          <%= f.fields_for :legacy_product_publications, publication, child_index: index do |pf| %>
+            <details class="publication-row group rounded -mx-2 px-2 hover:bg-gray-50">
+              <summary class="flex items-start justify-between gap-3 py-2 cursor-pointer" style="list-style: none;">
+                <div class="flex min-w-0 flex-1 flex-col gap-0.5">
+                  <div class="flex items-center gap-2">
+                    <span class="truncate text-sm font-medium"><%= channel.name %></span>
+                    <%= publication_status_badge(@product.status, publication) %>
+                  </div>
+                  <span class="text-xs text-muted">
+                    <%= publication_caption(@product.status, publication, current_store) %>
+                  </span>
+                </div>
+                <span class="shrink-0 mt-1 opacity-0 transition-opacity group-hover:opacity-100 text-muted">
+                  <%= icon('pencil', class: 'h-3.5 w-3.5') %>
+                </span>
+              </summary>
+              <div class="mt-2 ps-2 pb-2 flex flex-col gap-3">
+                <div>
+                  <%= pf.label :published_at,
+                               Spree.t('admin.publishing.published_at_label'),
+                               class: 'form-label text-xs mb-1' %>
+                  <%= pf.datetime_field :published_at,
+                                        value: to_store_local.call(publication.published_at),
+                                        class: 'form-control form-control-sm' %>
+                  <small class="text-muted text-xs"><%= tz_help %></small>
+                </div>
+                <div>
+                  <%= pf.label :unpublished_at,
+                               Spree.t('admin.publishing.unpublished_at_label'),
+                               class: 'form-label text-xs mb-1' %>
+                  <%= pf.datetime_field :unpublished_at,
+                                        value: to_store_local.call(publication.unpublished_at),
+                                        class: 'form-control form-control-sm' %>
+                  <small class="text-muted text-xs"><%= tz_help %></small>
+                </div>
+              </div>
+            </details>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/products/form/_status.html.erb

@@ -1,51 +1,7 @@
-<%# datetime-local inputs have no timezone; render values in the store's timezone so admins see and submit values in the store's local time. %>
-<%
-  store_timezone       = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
-  to_store_local       = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
-  make_active_at_local = to_store_local.call(@product.make_active_at)
-  available_on_local   = to_store_local.call(@product.available_on)
-  discontinue_on_local = to_store_local.call(@product.discontinue_on)
-  tz_help              = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
-%>
-
 <div class="card mb-6">
   <div class="card-body">
-    <div class="grid grid-cols-12 gap-6 mb-6">
-      <div class="col-span-6">
-        <%= f.spree_select :status,
-                           available_status_options(@product),
-                           { selected: @product.status, help_bubble: show_product_status_help_bubble? ? Spree.t('admin.products.status_form.status') : nil },
-                           { data: {
-                               action: 'change->product-form#switchAvailabilityDatesFields',
-                               'product-form-target': 'status'
-                             }
-                           } %>
-      </div>
-      <div class="col-span-6 <%= 'hidden' if @product.active? %>" data-product-form-target="makeActiveAt">
-        <% if can?(:activate, @product) %>
-          <%= f.spree_datetime_field :make_active_at,
-                                     value: make_active_at_local,
-                                     help: tz_help,
-                                     help_bubble: Spree.t('admin.products.status_form.make_active_at'),
-                                     max: discontinue_on_local %>
-        <% end %>
-      </div>
-    </div>
-    <div class="grid grid-cols-12 gap-6">
-      <div data-product-form-target="availableOn" class="col-span-6">
-        <%= f.spree_datetime_field :available_on,
-                                   value: available_on_local,
-                                   help: tz_help,
-                                   help_bubble: Spree.t('admin.products.status_form.available_on'),
-                                   max: discontinue_on_local %>
-      </div>
-      <div data-product-form-target="discontinueOn" class="col-span-6">
-        <%= f.spree_datetime_field :discontinue_on,
-                                   value: discontinue_on_local,
-                                   help: tz_help,
-                                   help_bubble: Spree.t('admin.products.status_form.discontinue_on'),
-                                   min: make_active_at_local %>
-      </div>
-    </div>
+    <%= f.spree_select :status,
+                       available_status_options(@product),
+                       { selected: @product.status, help_bubble: show_product_status_help_bubble? ? Spree.t('admin.products.status_form.status') : nil } %>
   </div>
 </div>

data/app/views/spree/admin/shared/_media_asset.html.erb

@@ -7,7 +7,7 @@
     <button class="btn btn-light btn-sm px-1"><%= icon('grip-vertical', class: 'mr-0') %></button>
   </div>
 
-  <%= link_to spree.edit_admin_asset_path(asset), data: { turbo_frame: 'dialog', action: 'dialog#open' } do %>
+  <%= link_to spree.edit_admin_asset_path(asset), data: { turbo_frame: 'drawer', action: 'drawer#open' } do %>
     <%= spree_image_tag(asset.attachment, width: 200, height: 200, alt: asset.alt, class: 'w-full block h-full absolute') %>
   <% end %>
 </div>

data/app/views/spree/admin/variants/edit.html.erb

@@ -10,7 +10,6 @@
       <%= render 'spree/admin/variants/form/basic', f: f %>
       <%= render 'spree/admin/variants/form/pricing', f: f %>
       <%= render 'spree/admin/variants/form/inventory', f: f %>
-      <%= render 'spree/admin/shared/media_form', viewable: @variant, viewable_type: 'Spree::Variant' %>
       <%= render 'spree/admin/shared/edit_resource_links', f: f %>
     </div>
   </div>

data/config/initializers/spree_admin_navigation.rb

@@ -251,6 +251,15 @@ Rails.application.config.after_initialize do
           active: -> { controller_name == 'policies' },
           if: -> { can?(:manage, Spree::Policy) }
 
+  # Channels
+  settings_nav.add :channels,
+          label: :channels,
+          url: :admin_channels_path,
+          icon: 'broadcast',
+          position: 65,
+          active: -> { controller_name == 'channels' },
+          if: -> { can?(:manage, Spree::Channel) }
+
   # Payment Methods
   settings_nav.add :payment_methods,
           label: :payments,

data/config/initializers/spree_admin_tables.rb

@@ -128,6 +128,19 @@ Rails.application.config.after_initialize do
                                         search_url: ->(view_context) { view_context.spree.admin_tags_select_options_path(format: :json, taggable_type: 'Spree::Product') },
                                         method: ->(product) { product.tag_list.to_sentence }
 
+  Spree.admin.tables.products.add :channels,
+                                        label: :channels,
+                                        type: :association,
+                                        filter_type: :select,
+                                        sortable: false,
+                                        filterable: true,
+                                        default: false,
+                                        position: 90,
+                                        ransack_attribute: 'channels_id',
+                                        operators: %i[in not_in],
+                                        value_options: -> { Spree::Current.store&.channels&.order(:name)&.pluck(:name, :id)&.map { |name, id| { value: id, label: name } } || [] },
+                                        method: ->(product) { product.channels.pluck(:name).to_sentence }
+
   # Products bulk actions
   Spree.admin.tables.products.add_bulk_action :set_active,
                                                     label: 'admin.bulk_ops.products.title.set_active',
@@ -350,6 +363,19 @@ Rails.application.config.after_initialize do
                                       operators: %i[in],
                                       search_url: ->(view_context) { view_context.spree.select_options_admin_promotions_path(format: :json) }
 
+  Spree.admin.tables.orders.add :channel,
+                                      label: :channel,
+                                      type: :association,
+                                      filter_type: :select,
+                                      sortable: true,
+                                      filterable: true,
+                                      default: true,
+                                      position: 35,
+                                      ransack_attribute: 'channel_id',
+                                      operators: %i[eq not_eq in not_in],
+                                      value_options: -> { Spree::Current.store&.channels&.order(:name)&.pluck(:name, :id)&.map { |name, id| { value: id, label: name } } || [] },
+                                      method: ->(order) { order.channel&.name }
+
   # Register Checkouts table (draft orders)
   Spree.admin.tables.register(:checkouts, model_class: Spree::Order, search_param: :search, date_range_param: :created_at, new_resource: false)
 
@@ -1744,6 +1770,40 @@ Rails.application.config.after_initialize do
                                              default: true,
                                              position: 10
 
+  # ==========================================
+  # Register Channels table
+  # ==========================================
+  Spree.admin.tables.register(:channels, model_class: Spree::Channel, search_param: :name_cont)
+
+  Spree.admin.tables.channels.add :name,
+                                  label: :name,
+                                  type: :link,
+                                  sortable: true,
+                                  filterable: true,
+                                  default: true,
+                                  position: 10
+
+  Spree.admin.tables.channels.add :code,
+                                  label: :code,
+                                  sortable: true,
+                                  default: true,
+                                  position: 20
+
+  Spree.admin.tables.channels.add :active,
+                                  label: :status,
+                                  type: :status,
+                                  sortable: false,
+                                  default: true,
+                                  position: 30,
+                                  method: ->(c) { c.active? ? 'active' : 'inactive' }
+
+  Spree.admin.tables.channels.add :default,
+                                  label: :default,
+                                  type: :boolean,
+                                  sortable: true,
+                                  default: true,
+                                  position: 40
+
   # ==========================================
   # Register Refund Reasons table
   # ==========================================

data/config/locales/en.yml

@@ -26,6 +26,8 @@ en:
         revoked: API key has been revoked
         revoked_at: Revoked at
         revoked_by: Revoked by
+        scopes: Scopes
+        scopes_description: Required for secret keys. Pick the narrowest set of scopes your integration needs.
         secret_key_hidden: This secret key cannot be revealed. If you've lost it, revoke this key and create a new one.
         statuses:
           active: Active
@@ -73,6 +75,13 @@ en:
           title:
             add_tags: Add tags
             remove_tags: Remove tags
+      channels:
+        code_hint: A short, stable identifier (e.g. "online", "pos", "wholesale"). Used by API clients via the X-Spree-Channel header and for order attribution.
+        default: Default channel
+        default_hint: Exactly one channel per store is the default. Used as the fallback when no channel is selected and as the auto-publish target for new products.
+        order_routing_strategy: Order routing strategy
+        order_routing_strategy_hint: Overrides the store-level routing strategy for orders attributed to this channel.
+        order_routing_strategy_inherit: Inherit from store
       checkout_settings:
         checkout_links:
           description: Links to these pages will be displayed in the checkout footer.
@@ -278,14 +287,34 @@ en:
         seo:
           placeholder: Add a title and description to see how this product might appear in a search engine listing
         status_form:
-          available_on: Marks when the product will be released, put a future date to indicate that this is a pre-order
-          discontinue_on: Marks when the product should be automatically taken off from your site
-          make_active_at: Marks when the product should be automatically promoted to "active" state
           status: Draft products aren't available for purchase. Active products are live.
+        status_options:
+          active: Active
+          archived: Archived
+          draft: Draft
         stores:
           choose_stores: Choose which stores this product should be available in
         variants:
           option_types_link: To add more option types please go to <a href="%{link}">Option Types</a>
+      publishing:
+        caption_hidden_after: Comes down %{date}
+        caption_live: Visible to customers now
+        caption_not_available: Hidden — product is %{product_status}
+        caption_scheduled: Goes live %{date}
+        caption_unpublished: Was hidden on %{date}
+        caption_window: Live %{start} → %{end}
+        empty: Not listed on any sales channel yet.
+        inactive_marker: Inactive
+        manage_cta: Manage
+        manage_description: Pick which sales channels list this product. Toggle a channel off to unlist it everywhere.
+        no_channels: No sales channels available. Create one in Settings → Sales channels.
+        published_at_label: Publish from
+        status_hidden: Hidden
+        status_live: Live
+        status_not_available: Not available
+        status_scheduled: Scheduled
+        title: Publishing
+        unpublished_at_label: Unpublish on
       recommended_size: Recommended size
       report_created: Your report is being generated. You will receive an email with a download link when it is ready!
       reset_digital_link_download_limits: Reset download limits

data/config/routes.rb

@@ -226,6 +226,7 @@ Spree::Core::Engine.add_routes do
     resources :payment_methods, except: :show
     resources :shipping_methods, except: :show
     resources :shipping_categories, except: :show
+    resources :channels, except: :show
     resources :store_credit_categories
     resources :tax_rates, except: :show
     resources :tax_categories, except: :show

data/lib/spree/admin/engine.rb

@@ -9,6 +9,8 @@ module Spree
         :admin_users_header_partials,
         :body_end_partials,
         :body_start_partials,
+        :channels_actions_partials,
+        :channels_header_partials,
         :classifications_actions_partials,
         :classifications_header_partials,
         :coupon_codes_actions_partials,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.5.0.rc1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-19 00:00:00.000000000 Z
+date: 2026-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 5.5.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 5.5.0.rc1
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -301,6 +301,7 @@ files:
 - app/controllers/spree/admin/assets_controller.rb
 - app/controllers/spree/admin/base_controller.rb
 - app/controllers/spree/admin/bulk_operations_controller.rb
+- app/controllers/spree/admin/channels_controller.rb
 - app/controllers/spree/admin/checkouts_controller.rb
 - app/controllers/spree/admin/classifications_controller.rb
 - app/controllers/spree/admin/countries_controller.rb
@@ -392,6 +393,7 @@ files:
 - app/helpers/spree/admin/base_helper.rb
 - app/helpers/spree/admin/bulk_editor_helper.rb
 - app/helpers/spree/admin/bulk_operations_helper.rb
+- app/helpers/spree/admin/channels_helper.rb
 - app/helpers/spree/admin/code_block_helper.rb
 - app/helpers/spree/admin/customer_returns_helper.rb
 - app/helpers/spree/admin/dialog_helper.rb
@@ -400,7 +402,6 @@ files:
 - app/helpers/spree/admin/flash_helper.rb
 - app/helpers/spree/admin/json_preview_helper.rb
 - app/helpers/spree/admin/metafields_helper.rb
-- app/helpers/spree/admin/modal_helper.rb
 - app/helpers/spree/admin/navigation_helper.rb
 - app/helpers/spree/admin/onboarding_helper.rb
 - app/helpers/spree/admin/orders_filters_helper.rb
@@ -411,6 +412,7 @@ files:
 - app/helpers/spree/admin/promotion_actions_helper.rb
 - app/helpers/spree/admin/promotion_rules_helper.rb
 - app/helpers/spree/admin/promotions_helper.rb
+- app/helpers/spree/admin/publishing_helper.rb
 - app/helpers/spree/admin/reimbursement_type_helper.rb
 - app/helpers/spree/admin/shipment_helper.rb
 - app/helpers/spree/admin/sortable_tree_helper.rb
@@ -456,6 +458,7 @@ files:
 - app/javascript/spree/admin/controllers/page_builder_controller.js
 - app/javascript/spree/admin/controllers/password_toggle_controller.js
 - app/javascript/spree/admin/controllers/product_form_controller.js
+- app/javascript/spree/admin/controllers/product_publishing_controller.js
 - app/javascript/spree/admin/controllers/query_builder_controller.js
 - app/javascript/spree/admin/controllers/range_input_controller.js
 - app/javascript/spree/admin/controllers/replace_controller.js
@@ -546,6 +549,10 @@ files:
 - app/views/spree/admin/bulk_operations/forms/_tag_picker.html.erb
 - app/views/spree/admin/bulk_operations/forms/_taxon_picker.html.erb
 - app/views/spree/admin/bulk_operations/new.html.erb
+- app/views/spree/admin/channels/_form.html.erb
+- app/views/spree/admin/channels/edit.html.erb
+- app/views/spree/admin/channels/index.html.erb
+- app/views/spree/admin/channels/new.html.erb
 - app/views/spree/admin/checkouts/index.html.erb
 - app/views/spree/admin/classifications/_classification.html.erb
 - app/views/spree/admin/classifications/create.turbo_stream.erb
@@ -776,6 +783,7 @@ files:
 - app/views/spree/admin/products/form/_base.html.erb
 - app/views/spree/admin/products/form/_categorization.html.erb
 - app/views/spree/admin/products/form/_inventory.html.erb
+- app/views/spree/admin/products/form/_publishing.html.erb
 - app/views/spree/admin/products/form/_shipping.html.erb
 - app/views/spree/admin/products/form/_status.html.erb
 - app/views/spree/admin/products/form/_tax.html.erb
@@ -795,17 +803,17 @@ files:
 - app/views/spree/admin/promotion_actions/new.html.erb
 - app/views/spree/admin/promotion_rules/_promotion_rule.html.erb
 - app/views/spree/admin/promotion_rules/edit.html.erb
+- app/views/spree/admin/promotion_rules/forms/_category.html.erb
 - app/views/spree/admin/promotion_rules/forms/_country.html.erb
 - app/views/spree/admin/promotion_rules/forms/_currency.html.erb
+- app/views/spree/admin/promotion_rules/forms/_customer.html.erb
 - app/views/spree/admin/promotion_rules/forms/_customer_group.html.erb
+- app/views/spree/admin/promotion_rules/forms/_customer_logged_in.html.erb
 - app/views/spree/admin/promotion_rules/forms/_first_order.html.erb
 - app/views/spree/admin/promotion_rules/forms/_item_total.html.erb
 - app/views/spree/admin/promotion_rules/forms/_one_use_per_user.html.erb
 - app/views/spree/admin/promotion_rules/forms/_option_value.html.erb
 - app/views/spree/admin/promotion_rules/forms/_product.html.erb
-- app/views/spree/admin/promotion_rules/forms/_taxon.html.erb
-- app/views/spree/admin/promotion_rules/forms/_user.html.erb
-- app/views/spree/admin/promotion_rules/forms/_user_logged_in.html.erb
 - app/views/spree/admin/promotion_rules/new.html.erb
 - app/views/spree/admin/promotions/_actions.html.erb
 - app/views/spree/admin/promotions/_form.html.erb
@@ -881,7 +889,6 @@ files:
 - app/views/spree/admin/shared/_map.html.erb
 - app/views/spree/admin/shared/_media_asset.html.erb
 - app/views/spree/admin/shared/_media_form.html.erb
-- app/views/spree/admin/shared/_modal.html.erb
 - app/views/spree/admin/shared/_multi_product_picker.html.erb
 - app/views/spree/admin/shared/_new_item_dropdown.html.erb
 - app/views/spree/admin/shared/_new_resource.html.erb
@@ -1164,9 +1171,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.5.0.rc1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.3
+  source_code_uri: https://github.com/spree/spree/tree/v5.5.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,31 +0,0 @@
-module Spree
-  module Admin
-    module ModalHelper
-      # render a header for the modal
-      # @param title [String, Proc] the title of the modal
-      # @return [String]
-      def modal_header(title)
-        Spree::Deprecation.warn('Bootstrap modals are deprecated and will be removed in Spree 5.5. Please use native dialogs with `dialog_header` helper.')
-
-        title = capture(&title) if block_given?
-        content_tag(:div, class: 'modal-header') do
-          content_tag(:h5, title, class: 'modal-title') + modal_close_button
-        end.html_safe
-      end
-
-      # render a close button for the modal
-      # @return [String]
-      def modal_close_button
-        button_tag('', type: 'button', class: 'btn-close', data: { dismiss: 'modal', aria_label: Spree.t(:close) }).html_safe
-      end
-
-      # render a discard button for the modal
-      # @return [String]
-      def modal_discard_button
-        button_tag(type: 'button', class: 'btn btn-light mr-auto', data: { dismiss: 'modal' }) do
-          Spree.t('actions.discard')
-        end.html_safe
-      end
-    end
-  end
-end

data/app/views/spree/admin/shared/_modal.html.erb

@@ -1,27 +0,0 @@
-<div class="modal fade" id="modal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered">
-    <%= turbo_frame_tag :dialog_modal do %>
-      <div class="modal-content">
-        <%= modal_header(Spree.t(:loading)) %>
-        <div class="modal-body text-center min-h-[300px]">
-          <%= render 'spree/admin/shared/spinner' %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
-<div class="modal fade" id="modal-lg" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered modal-lg">
-    <%= turbo_frame_tag :dialog_modal_lg do %>
-      <div class="modal-content">
-        <%= modal_header(Spree.t(:loading)) %>
-        <div class="modal-body text-center min-h-[300px]">
-          <%= render 'spree/admin/shared/spinner' %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
-<%= turbo_frame_tag :modal_scripts %>