spree_admin 5.3.5 → 5.4.0.beta

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

@@ -37,7 +37,7 @@ module Spree
 
         scope = current_store.products.not_archived.accessible_by(current_ability, :index)
         scope = scope.where.not(id: params[:omit_ids].split(',')) if params[:omit_ids].present?
-        @products = scope.includes(master: :images, variants: :images).multi_search(query).limit(params[:limit] || 10)
+        @products = scope.includes(:thumbnail).multi_search(query).limit(params[:limit] || 10)
 
         respond_to do |format|
           format.turbo_stream do
@@ -69,7 +69,7 @@ module Spree
           # update the product again
           @product.slug = @product.slug_was if @product.slug.blank?
           invoke_callbacks(:update, :fails)
-          render :edit, status: :unprocessable_entity
+          render :edit, status: :unprocessable_content
         end
       end
 
@@ -140,13 +140,13 @@ module Spree
           uniq.group_by(&:option_type).each_with_index do |option, index|
             option_type, option_values = option
 
-            @product_options[option_type.id.to_s] = {
+            @product_options[option_type.prefixed_id] = {
               name: option_type.presentation,
               position: index + 1,
               values: option_values.map { |ov| { value: ov.name, text: ov.presentation } }.uniq
             }
 
-            @product_available_options[option_type.id.to_s] = option_type.option_values.map { |ov| { id: ov.name, name: ov.presentation } }.uniq
+            @product_available_options[option_type.prefixed_id] = option_type.option_values.map { |ov| { id: ov.name, name: ov.presentation } }.uniq
           end
 
         @product_stock = {}
@@ -169,9 +169,11 @@ module Spree
         end
 
         @product_variant_ids = {}
+        @product_variant_prefix_ids = {}
 
         @product.variants.includes(:option_values).each do |variant|
           @product_variant_ids[variant.human_name] = variant.id.to_s
+          @product_variant_prefix_ids[variant.human_name] = variant.to_param
         end
       end
 
@@ -207,11 +209,16 @@ module Spree
       end
 
       # These includes are not picked automatically by ar_lazy_preload gem so we need to specify them manually.
+      def collection_default_sort
+        'name asc'
+      end
+
       def collection_includes
         {
+          thumbnail: [attachment_attachment: :blob],
           stock_items: [],
-          master: [:images, :prices, :stock_items],
-          variants: [:images, :prices, :stock_items]
+          master: [:prices, :stock_items],
+          variants: [:prices, :stock_items]
         }
       end
 
@@ -254,7 +261,9 @@ module Spree
         return if @product.has_variants?
 
         available_stock_locations_list(master_stock_items_locations_opts).each do |_name, id|
-          @product.master.stock_items.build(stock_location_id: id, count_on_hand: 0) unless @product.master.stock_items.find { |stock_item| stock_item.stock_location_id == id }
+          @product.master.stock_items.build(stock_location_id: id, count_on_hand: 0) unless @product.master.stock_items.find do |stock_item|
+            stock_item.stock_location_id == id
+          end
         end
       end
 
@@ -266,7 +275,9 @@ module Spree
         return unless Spree::Config[:product_properties_enabled]
 
         Spree::Property.all.each do |property|
-          @product.product_properties.build(property: property) unless @product.product_properties.find { |product_property| product_property.property_id == property.id }
+          @product.product_properties.build(property: property) unless @product.product_properties.find do |product_property|
+            product_property.property_id == property.id
+          end
         end
       end
 
@@ -287,13 +298,11 @@ module Spree
       end
 
       def permitted_resource_params
-        @permitted_resource_params ||= begin
-          if cannot?(:activate, @product) && @new_status&.to_sym == :active
-            params.require(:product).permit(permitted_product_attributes).except(:status, :make_active_at)
-          else
-            params.require(:product).permit(permitted_product_attributes)
-          end
-        end
+        @permitted_resource_params ||= if cannot?(:activate, @product) && @new_status&.to_sym == :active
+                                         params.require(:product).permit(permitted_product_attributes).except(:status, :make_active_at)
+                                       else
+                                         params.require(:product).permit(permitted_product_attributes)
+                                       end
       end
     end
   end

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

@@ -19,7 +19,7 @@ module Spree
           flash[:success] = flash_message_for(@user, :successfully_updated)
           redirect_to spree.edit_admin_profile_path
         else
-          render :edit, status: :unprocessable_entity
+          render :edit, status: :unprocessable_content
         end
       end
 

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class PromotionActionsController < ResourceController
-      belongs_to 'spree/promotion', find_by: :id
+      belongs_to 'spree/promotion', find_by: :prefix_id
 
       helper_method :allowed_action_types
 

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class PromotionRulesController < ResourceController
-      belongs_to 'spree/promotion', find_by: :id
+      belongs_to 'spree/promotion', find_by: :prefix_id
 
       helper_method :allowed_rule_types
 

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

@@ -16,7 +16,7 @@ module Spree
 
       # POST /admin/promotions/:id/clone
       def clone
-        promotion = current_store.promotions.find(params[:id])
+        promotion = current_store.promotions.find_by_prefix_id!(params[:id])
         duplicator = Spree::PromotionHandler::PromotionDuplicator.new(promotion)
 
         @new_promo = duplicator.duplicate

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

@@ -3,7 +3,7 @@ module Spree
     class RefundsController < ResourceController
       include Spree::Admin::OrderBreadcrumbConcern
 
-      belongs_to 'spree/payment', find_by: :number
+      belongs_to 'spree/payment', find_by: :prefix_id
 
       before_action :load_order
       before_action :assign_refunder, only: :create

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class ReimbursementsController < ResourceController
-      belongs_to 'spree/order', find_by: :number
+      belongs_to 'spree/order', find_by: :prefix_id
 
       before_action :load_simulated_refunds, only: :edit
 
@@ -16,7 +16,7 @@ module Spree
 
       def build_resource
         if params[:build_from_customer_return_id].present?
-          customer_return = current_store.customer_returns.find(params[:build_from_customer_return_id])
+          customer_return = current_store.customer_returns.find_by_prefix_id!(params[:build_from_customer_return_id])
 
           Reimbursement.build_from_customer_return(customer_return)
         else

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

@@ -6,6 +6,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class
   before_action :load_resource
   before_action :set_currency, :set_current_store, only: [:new, :create]
+  after_action :set_return_to, only: [:index]
 
   rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
 
@@ -50,7 +51,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
             flash.now[:error] = @object.errors.full_messages.join(', ')
           end
         end
-        format.html { render action: :edit, status: :unprocessable_entity }
+        format.html { render action: :edit, status: :unprocessable_content }
       end
     end
   end
@@ -81,7 +82,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
             flash.now[:error] = @object.errors.full_messages.join(', ')
           end
         end
-        format.html { render action: :new, status: :unprocessable_entity }
+        format.html { render action: :new, status: :unprocessable_content }
       end
     end
   end
@@ -128,7 +129,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       @parent_data ||= {}
       @parent_data[:model_name] = model_name
       @parent_data[:model_class] = model_name.to_s.classify.constantize
-      @parent_data[:find_by] = options[:find_by] || :id
+      @parent_data[:find_by] = options[:find_by] || :prefix_id
     end
   end
 
@@ -187,14 +188,24 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def parent
     if parent_data.present?
       base_scope = parent_data[:model_class].try(:for_store, current_store) || parent_data[:model_class]
-
-      @parent ||= base_scope.
-                  # Don't use `find_by_attribute_name` to workaround globalize/globalize#423 bug
-                  send(:find_by, parent_data[:find_by].to_s => params["#{resource.model_name}_id"])
+      param_value = params["#{resource.model_name}_id"]
+      find_by = parent_data[:find_by]
+      parent_model_class = parent_data[:model_class]
+
+      # Skip prefix_id lookup for FriendlyId models (they use slug for to_param)
+      uses_friendly_id = parent_model_class.respond_to?(:friendly_id_config)
+      use_prefix_id = find_by == :prefix_id &&
+                      parent_model_class.respond_to?(:_prefix_id_prefix) &&
+                      parent_model_class._prefix_id_prefix.present? &&
+                      !uses_friendly_id
+
+      @parent ||= if use_prefix_id
+                    base_scope.find_by_prefix_id!(param_value)
+                  else
+                    base_scope.find_by!(find_by.to_s => param_value)
+                  end
       instance_variable_set("@#{resource.model_name}", @parent)
 
-      raise ActiveRecord::RecordNotFound if @parent.nil?
-
       @parent
     end
   end
@@ -204,9 +215,17 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
                    parent.send(controller_name)
                  else
                    model_class.try(:for_store, current_store) || model_class
-                end
+                 end
+
+    # Skip prefix_id lookup for FriendlyId models (they use slug for to_param)
+    uses_friendly_id = model_class.respond_to?(:friendly_id_config)
+    use_prefix_id = model_class.respond_to?(:_prefix_id_prefix) &&
+                    model_class._prefix_id_prefix.present? &&
+                    !uses_friendly_id
 
-    if model_class.try(:friendly)
+    if use_prefix_id
+      base_scope.find_by_prefix_id!(params[:id])
+    elsif uses_friendly_id
       base_scope.friendly.find(params[:id])
     else
       base_scope.find(params[:id])

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

@@ -5,7 +5,7 @@ module Spree
 
       layout 'turbo_rails/frame'
 
-      belongs_to 'spree/order', find_by: :number
+      belongs_to 'spree/order', find_by: :prefix_id
 
       before_action :load_variant, only: [:split, :transfer]
       before_action :refresh_shipping_rates, only: :edit
@@ -82,7 +82,7 @@ module Spree
       end
 
       def find_resource
-        record = parent.shipments.find_by!(number: params[:id])
+        record = parent.shipments.find_by_prefix_id!(params[:id])
         authorize! action, record
       end
 
@@ -91,7 +91,7 @@ module Spree
       end
 
       def load_variant
-        @variant = current_store.variants.accessible_by(current_ability, :manage).find(params[:variant_id])
+        @variant = current_store.variants.accessible_by(current_ability, :manage).find_by_prefix_id!(params[:variant_id])
       end
 
       def permitted_resource_params

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

@@ -20,7 +20,7 @@ module Spree
       end
 
       def load_data
-        @available_zones = current_store.supported_shipping_zones
+        @available_zones = Spree::Zone.all
         @tax_categories = Spree::TaxCategory.order(:name)
         @calculators = Spree::ShippingMethod.calculators
         @shipping_categories = Spree::ShippingCategory.all

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

@@ -8,7 +8,7 @@ module Spree
       before_action :ensure_unused_store_credit, only: [:update]
 
       def show
-        @store_credit = scope.find(params[:id])
+        @store_credit = scope.find_by_prefix_id!(params[:id])
         @store_credit_events = @store_credit.store_credit_events.reverse_chronological.includes(:originator, :order)
       end
 
@@ -26,7 +26,7 @@ module Spree
           redirect_to spree.admin_user_path(parent)
         else
           flash[:error] = Spree.t('store_credit.errors.unable_to_create')
-          render :new, status: :unprocessable_entity
+          render :new, status: :unprocessable_content
         end
       end
 
@@ -38,7 +38,7 @@ module Spree
           redirect_to spree.admin_user_store_credit_path(parent, @store_credit)
         else
           flash[:error] = Spree.t('store_credit.errors.unable_to_update')
-          render :edit, status: :unprocessable_entity
+          render :edit, status: :unprocessable_content
         end
       end
 
@@ -57,14 +57,14 @@ module Spree
       protected
 
       def parent
-        @parent ||= Spree.user_class.find_by(id: params[:user_id])
+        @parent ||= Spree.user_class.find_by_prefix_id!(params[:user_id])
       end
 
       def parent_data
         {
           model_name: 'spree/user',
           model_class: Spree.user_class,
-          find_by: :id
+          find_by: :prefix_id
         }
       end
 

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

@@ -7,32 +7,6 @@ module Spree
       before_action :normalize_supported_currencies, only: [:update]
       before_action :normalize_supported_locales, only: [:update]
       before_action :load_all_countries, only: [:edit, :update]
-      before_action :load_all_zones, only: [:edit, :update]
-
-      def new
-        @store = Spree::Store.new(
-          default_country_iso: current_store.default_country_iso,
-          default_currency: current_store.default_currency
-        )
-        render :new, layout: 'spree/admin_wizard'
-      end
-
-      def create
-        @store = Spree::Store.new(permitted_store_params)
-        @store.mail_from_address = current_store.mail_from_address
-
-        if @store.save
-          # Move/copy all existing users (staff) to the new store
-          current_store.role_users.each do |role_user|
-            @store.add_user(role_user.user, role_user.role)
-          end
-
-          flash[:success] = flash_message_for(@store, :successfully_created)
-          redirect_to spree.admin_getting_started_url(host: @store.url), allow_other_host: true
-        else
-          render :new, status: :unprocessable_entity
-        end
-      end
 
       def edit
         if params[:section] == 'emails'
@@ -61,7 +35,7 @@ module Spree
           flash[:error] = "#{Spree.t('store_errors.unable_to_update')}: #{@store.errors.full_messages.join(', ')}"
         end
 
-        if @store.saved_changes? && permitted_store_params[:code].present?
+        if @store.saved_changes? && permitted_store_params[:code].present? && spree.respond_to?(:admin_custom_domains_url)
           redirect_to spree.admin_custom_domains_url(host: @store.url), allow_other_host: true
         else
           respond_to do |format|
@@ -87,11 +61,6 @@ module Spree
         @countries = Spree::Country.pluck(:name, :id)
       end
 
-      def load_all_zones
-        @zones = Spree::Zone.pluck(:name, :id)
-        @zones.prepend([Spree.t(:no_limits_zone), ' '])
-      end
-
       def normalize_supported_currencies
         if params.dig(:store, :supported_currencies)&.is_a?(Array)
           params[:store][:supported_currencies] = params[:store][:supported_currencies].compact.uniq.reject(&:blank?).join(',')

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

@@ -38,7 +38,7 @@ module Spree
         if @taxon.move_to_child_with_index(new_parent, new_index)
           head :ok
         else
-          head :unprocessable_entity
+          head :unprocessable_content
         end
       end
 
@@ -49,7 +49,7 @@ module Spree
       end
 
       def location_after_save
-        spree.edit_admin_taxonomy_taxon_path(@taxon.taxonomy_id, @taxon.id)
+        spree.edit_admin_taxonomy_taxon_path(@taxon.taxonomy, @taxon)
       end
 
       def update_turbo_stream_enabled?
@@ -113,7 +113,7 @@ module Spree
         add_breadcrumb @taxonomy.name, collection_url
 
         if @object.present? && @object.persisted?
-          add_breadcrumb @object.name, spree.edit_admin_taxonomy_taxon_path(@taxonomy, @object.id)
+          add_breadcrumb @object.name, spree.edit_admin_taxonomy_taxon_path(@taxonomy, @object)
         end
       end
 

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

@@ -57,6 +57,7 @@ module Spree
 
       # Load available locales for this resource, excluding default
       def load_data
+        @default_locale = current_store.default_locale
         @locales = (current_store.supported_locales_list - [@default_locale]).sort
       end
 

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

@@ -58,7 +58,7 @@ module Spree
           flash[:success] = flash_message_for(@user, :successfully_created)
           redirect_to spree.admin_user_path(@user)
         else
-          render :new, status: :unprocessable_entity
+          render :new, status: :unprocessable_content
         end
       end
 
@@ -92,7 +92,7 @@ module Spree
       end
 
       def find_resource
-        model_class.accessible_by(current_ability, :show).find(params[:id])
+        model_class.accessible_by(current_ability, :show).find_by_prefix_id!(params[:id])
       end
 
       def collection_url

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module ApiKeysHelper
+      def api_key_type_options
+        Spree::ApiKey::KEY_TYPES.map do |type|
+          [Spree.t("admin.api_keys.key_types.#{type}"), type]
+        end
+      end
+
+      def api_key_status_badge(api_key)
+        if api_key.active?
+          content_tag(:span, icon('check') + Spree.t('admin.api_keys.statuses.active'), class: 'badge badge-success')
+        else
+          content_tag(:span, icon('alert-triangle') + Spree.t('admin.api_keys.statuses.revoked'), class: 'badge badge-danger')
+        end
+      end
+
+      def api_key_type_badge(api_key)
+        badge_class = api_key.publishable? ? 'badge-light' : 'badge-warning'
+        icon = api_key.publishable? ? 'eye' : 'lock-password'
+        content_tag(:span, icon(icon) + Spree.t("admin.api_keys.key_types.#{api_key.key_type}"), class: "badge #{badge_class}")
+      end
+
+      def masked_api_key(api_key)
+        token = api_key.token
+        "#{token[0..6]}#{'*' * 16}#{token[-4..]}"
+      end
+    end
+  end
+end

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

@@ -214,7 +214,7 @@ module Spree
         case key
         when :currency
           content_tag(:div, form.label("preferred_#{key}", Spree.t(key, scope: i18n_scope)) +
-            form.select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { data: { controller: 'autocomplete-select' }, disabled: current_store.supported_currencies.split(',').count == 1 }),
+            form.select("preferred_#{key}", current_store.supported_currencies_list, {}, { data: { controller: 'autocomplete-select' } }),
                       class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
         else
           if object.preference_type(key).to_sym == :boolean
@@ -361,6 +361,11 @@ module Spree
           return Spree.t(:none) if zone_ids.empty?
 
           Spree::Zone.where(id: zone_ids).pluck(:name).join(', ')
+        when :market_ids
+          market_ids = Array(value).reject(&:blank?).map(&:to_i)
+          return Spree.t(:none) if market_ids.empty?
+
+          Spree::Market.where(id: market_ids).pluck(:name).join(', ')
         when :user_ids
           user_ids = Array(value).reject(&:blank?).map(&:to_i)
           return Spree.t(:none) if user_ids.empty?

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

@@ -18,59 +18,63 @@ module Spree
       end
 
       def json_serializers_available?(record)
-        storefront_serializer_exists?(record) || platform_serializer_exists?(record)
+        store_serializer_exists?(record) || admin_serializer_exists?(record)
       end
 
-      def storefront_serializer_exists?(record)
-        storefront_serializer_for(record).present?
+      def store_serializer_exists?(record)
+        store_serializer_for(record).present?
       end
 
-      def platform_serializer_exists?(record)
-        platform_serializer_for(record).present?
+      def admin_serializer_exists?(record)
+        admin_serializer_for(record).present?
       end
 
-      def serialize_to_json(record, api_type: :storefront)
+      def serialize_to_json(record, api_type: :store)
         return unless record
 
         serializer = case api_type.to_sym
-                     when :storefront
-                       storefront_serializer_for(record)
-                     when :platform
-                       platform_serializer_for(record)
+                     when :store
+                       store_serializer_for(record)
+                     when :admin
+                       admin_serializer_for(record)
                      end
 
         return nil unless serializer
 
-        serializable_hash = serializer.new(
+        # Alba serializers use .new(object, params: {}).to_h
+        serialized_hash = serializer.new(
           record,
           params: serializer_params(record, api_type)
-        ).serializable_hash
+        ).to_h
 
-        JSON.pretty_generate(serializable_hash)
+        JSON.pretty_generate(serialized_hash)
       end
 
       private
 
-      def storefront_serializer_for(record)
-        serializer_for(record, api_type: :storefront, namespace: 'Spree::V2::Storefront')
+      def store_serializer_for(record)
+        serializer_for(record, namespace: 'Spree::Api::V3')
       end
 
-      def platform_serializer_for(record)
-        serializer_for(record, api_type: :platform, namespace: 'Spree::Api::V2::Platform')
+      def admin_serializer_for(record)
+        serializer_for(record, namespace: 'Spree::Api::V3::Admin')
       end
 
-      def serializer_for(record, api_type:, namespace:)
+      def serializer_for(record, namespace:)
         class_name = record.class.name.demodulize
-        method_name = "#{api_type}_#{class_name.underscore}_serializer"
-        if Spree.api.respond_to?(method_name)
-          Spree.api.public_send(method_name)
-        else
-          serializer_class_name = "#{namespace}::#{class_name}Serializer"
-          serializer_class_name.safe_constantize
+
+        # First try dependency lookup (without prefix for v3)
+        method_name = "#{class_name.underscore}_serializer"
+        if namespace == 'Spree::Api::V3' && Spree.api.respond_to?(method_name)
+          return Spree.api.public_send(method_name)
         end
+
+        # Fall back to direct constant lookup
+        serializer_class_name = "#{namespace}::#{class_name}Serializer"
+        serializer_class_name.safe_constantize
       end
 
-      def serializer_params(record, api_type)
+      def serializer_params(_record, api_type)
         params = {}
         params[:api_type] = api_type
         params[:store] = current_store if defined?(current_store) && current_store.present?

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

@@ -37,7 +37,7 @@ module Spree
       end
 
       def load_user
-        @user = Spree.user_class.find(params[:user_id]) if params[:user_id].present?
+        @user = Spree.user_class.find_by_prefix_id(params[:user_id]) if params[:user_id].present?
       end
     end
   end

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

@@ -23,7 +23,7 @@ module Spree
                     class: 'sortable-tree-item draggable',
                     data: {
                       sortable_tree_resource_name_value: :taxon,
-                      sortable_tree_update_url_value: spree.reposition_admin_taxonomy_taxon_path(child_resource.taxonomy_id, child_resource.id)
+                      sortable_tree_update_url_value: spree.reposition_admin_taxonomy_taxon_path(child_resource.taxonomy, child_resource)
                     })
       end
     end

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

@@ -3,10 +3,6 @@ module Spree
     module StoresHelper
       include Spree::ImagesHelper
 
-      def available_stores
-        @available_stores ||= Spree::Store.accessible_by(current_ability, :manage).includes(:logo_attachment, :favicon_image_attachment, :default_custom_domain)
-      end
-
       DEFAULT_ICON_SIZE = 40
 
       def store_admin_icon(store, opts = {})

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

@@ -19,7 +19,11 @@ export default class extends Controller {
       maxOptions: this.element.children.length,
       selectOnTab: true,
       allowEmptyOption: false,
-      plugins: plugins
+      plugins: plugins,
+      onItemAdd: function() {
+        this.setTextboxValue('')
+        this.refreshOptions(false)
+      }
     })
     if (!this.element.multiple) {
       this.select.on('type', () => {

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

@@ -3,7 +3,7 @@ import { Controller } from "@hotwired/stimulus"
 export default class extends Controller {
   static targets = ["input", "clear"]
 
-  inputTargetConnected() {
+  connect() {
     this.toggleClearButton()
   }
 

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

@@ -106,6 +106,10 @@ export default class extends Controller {
     if (this.multipleValue) {
       settings.maxItems = null
       settings.plugins = ['remove_button']
+      settings.onItemAdd = function() {
+        this.setTextboxValue('')
+        this.refreshOptions(false)
+      }
       if (this.activeOptionValue) settings.items = JSON.parse(this.activeOptionValue)
     } else {
       if (this.activeOptionValue) settings.items = [this.activeOptionValue]