alchemy-solidus 7.5.1 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286c4a4ae1a6aba7c83ecc17b9f51e06b2e4b3cf7504382970edaed1c4de9ef1
-  data.tar.gz: fd623314a68027a9a1cd6bcd49067e0891a6342364f140668217f2c3fa339d7c
+  metadata.gz: 15dc076bf68bd7b1c707371eb37043cce0118953337e4cb83a4d3b618986c96f
+  data.tar.gz: b4d750ba90f8e34ca84116c92fe644a286f2d7dbb3ce27e856ecef9b292e3f0d
 SHA512:
-  metadata.gz: 541d7bda1ff72e631923ab176dcd868c3f5bb16716a6e0eb0592a0749a9fef22f08f043c2b8393e9ce0a6e82ac2fcf919fb9fc5de621ddc452146e22d8045060
-  data.tar.gz: 3d260407d78557bda063934ac4105ff8f7357a40f0a9b25313608a8a5f256cc7eb2a739eb3775ec924cbd0c3dc9e7765da950936e2fba57ccda68fc7af1272d4
+  metadata.gz: 33b5b8f176dbf5db6047537a149b55048956f5732bd0c63b47e2b67de6a0949240d8d62786288bc76f9ddd69bfad544c7c4509017d176c8891654958480389e1
+  data.tar.gz: 1fe4a15e0c4da77036c0df1e6adbe2c68fa8d6f5e0adcb5d56f4602b0c6156beb870fcfabb9ec1f71a7d3cb19b91b52aa10f6d738fff45ccd43b95831e88d083

data/app/components/alchemy/admin/link_dialog/product_tab.rb

@@ -47,7 +47,8 @@ module Alchemy
           select = render self.class.product_select_class.new(
             current_alchemy_user.spree_api_key,
             product: product,
-            url: spree.api_products_path
+            url: spree.api_products_path,
+            value_attribute: :slug
           ).with_content(input)
           content_tag("div", label + select, class: "input select")
         end

data/app/components/alchemy/admin/product_select.rb

@@ -1,15 +1,19 @@
 module Alchemy
   module Admin
     class ProductSelect < ViewComponent::Base
+      VALUE_ATTRIBUTES = %i[id slug].freeze
+
       delegate :spree, to: :helpers
 
-      attr_reader :api_key, :product, :url, :query_params
+      attr_reader :api_key, :product, :url, :query_params, :placeholder
 
-      def initialize(api_key, product: nil, url: nil, query_params: nil)
+      def initialize(api_key, product: nil, url: nil, query_params: nil, placeholder: nil, value_attribute: nil)
         @api_key = api_key
         @product = product
         @url = url
         @query_params = query_params
+        @placeholder = placeholder
+        @value_attribute = value_attribute
       end
 
       def call
@@ -18,9 +22,15 @@ module Alchemy
 
       private
 
+      def value_attribute
+        @value_attribute.in?(VALUE_ATTRIBUTES) ? @value_attribute : :id
+      end
+
       def attributes
         attrs = {
+          placeholder: placeholder || Alchemy.t(:search_product, scope: "solidus"),
           url: url || spree.api_products_path,
+          "value-attribute": value_attribute,
           "api-key": api_key
         }
 
@@ -35,8 +45,8 @@ module Alchemy
 
       def serialized_selection
         {
-          name: product.name,
-          slug: product.slug
+          id: product.send(value_attribute),
+          name: product.name
         }.to_json
       end
     end

data/app/components/alchemy/admin/taxon_select.rb

@@ -0,0 +1,46 @@
+module Alchemy
+  module Admin
+    class TaxonSelect < ViewComponent::Base
+      delegate :spree, to: :helpers
+
+      attr_reader :api_key, :taxon, :url, :query_params, :placeholder
+
+      def initialize(api_key, taxon: nil, url: nil, query_params: nil, placeholder: nil)
+        @api_key = api_key
+        @taxon = taxon
+        @url = url
+        @query_params = query_params
+        @placeholder = placeholder
+      end
+
+      def call
+        content_tag("alchemy-taxon-select", content, attributes)
+      end
+
+      private
+
+      def attributes
+        attrs = {
+          url: url || spree.api_taxons_path,
+          placeholder: placeholder || Alchemy.t(:search_taxon, scope: :solidus),
+          "api-key": api_key
+        }
+
+        attrs[:"query-params"] = query_params.to_json if query_params
+
+        if taxon
+          attrs[:selection] = serialized_selection
+        end
+
+        attrs
+      end
+
+      def serialized_selection
+        {
+          id: taxon.id,
+          text: taxon.pretty_name
+        }.to_json
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/variant_select.rb

@@ -0,0 +1,48 @@
+module Alchemy
+  module Admin
+    class VariantSelect < ViewComponent::Base
+      delegate :spree, to: :helpers
+
+      attr_reader :api_key, :variant, :url, :query_params, :placeholder
+
+      def initialize(api_key, variant: nil, url: nil, query_params: nil, placeholder: nil)
+        @api_key = api_key
+        @variant = variant
+        @url = url
+        @query_params = query_params
+        @placeholder = placeholder
+      end
+
+      def call
+        content_tag("alchemy-variant-select", content, attributes)
+      end
+
+      private
+
+      def attributes
+        attrs = {
+          url: url || spree.api_variants_path,
+          placeholder: placeholder || Alchemy.t(:search_variant, scope: :solidus),
+          "api-key": api_key
+        }
+
+        attrs[:"query-params"] = query_params.to_json if query_params
+
+        if variant
+          attrs[:selection] = serialized_selection
+        end
+
+        attrs
+      end
+
+      def serialized_selection
+        {
+          id: variant.id,
+          name: variant.name,
+          sku: variant.sku,
+          options_text: variant.options_text
+        }.to_json
+      end
+    end
+  end
+end

data/app/javascript/alchemy_solidus/components/ajax_config.js

@@ -0,0 +1,10 @@
+export default function ajaxConfig(ajaxConfig, apiKey) {
+  return {
+    ...ajaxConfig,
+    params: {
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+      },
+    },
+  }
+}

data/app/javascript/alchemy_solidus/components/product_select.js

@@ -1,42 +1,71 @@
-import "alchemy_solidus/product_select"
-
-export default class ProductSelect extends HTMLElement {
-  connectedCallback() {
-    const input = this.querySelector("#product_link")
-    input.classList.add("alchemy_selectbox")
-
-    $(input).alchemyProductSelect({
-      baseUrl: this.url,
-      apiToken: this.apiToken,
-      initSelection: this._initSelection.bind(this),
-      formatResultObject: this._formatResult.bind(this),
-    })
-  }
+import { RemoteSelect } from "alchemy_admin/components/remote_select"
+import ajaxConfig from "alchemy_solidus/components/ajax_config"
 
-  get url() {
-    return this.getAttribute("url")
+export default class ProductSelect extends RemoteSelect {
+  get ajaxConfig() {
+    return ajaxConfig(super.ajaxConfig, this.apiKey)
   }
 
-  get apiToken() {
+  get apiKey() {
     return this.getAttribute("api-key")
   }
 
-  _initSelection(_$el, callback) {
-    const selection = this.getAttribute("selection")
-    const product = JSON.parse(selection)
-    callback(this._formatResult(product))
+  get valueAttribute() {
+    return this.getAttribute("value-attribute") || "id"
   }
 
-  _formatResult(product) {
+  /**
+   * Parses server response into select2 results object
+   * @param {object} response
+   * @returns {object}
+   * @private
+   */
+  _parseResponse(response) {
     return {
-      id: `${Spree.mountedAt()}products/${product.slug}`,
-      text: product.name,
+      results: response.products.map((product) => {
+        return {
+          id: this._parsedValue(product),
+          name: product.name,
+        }
+      }),
+      more: response.current_page * response.per_page < response.total_count,
     }
   }
 
-  _searchQuery(value) {
-    const slug = value.replace(`${Spree.mountedAt()}products/`, "")
-    return `q[slug_eq]=${slug}`
+  /**
+   * The value used for the select send to the server
+   * after submitting the form this select is placed in.
+   *
+   * Note: Returning an url if the `value-attribute` is "slug".
+   *
+   * @param {object} product
+   * @returns {string}
+   */
+  _parsedValue(product) {
+    return this.valueAttribute === "slug"
+      ? `${Spree.mountedAt()}products/${product.slug}`
+      : product.id
+  }
+
+  /**
+   * result which is visible if a product was selected
+   * @param {object} product
+   * @returns {string}
+   * @private
+   */
+  _renderResult(product) {
+    return product.name
+  }
+
+  /**
+   * html template for each list entry
+   * @param {object} product
+   * @param {string} term
+   * @returns {string}
+   * @private
+   */
+  _renderListEntry(product, term) {
+    return this._hightlightTerm(product.name, term)
   }
 }
 

data/app/javascript/alchemy_solidus/components/taxon_select.js

@@ -0,0 +1,48 @@
+import { RemoteSelect } from "alchemy_admin/components/remote_select"
+import ajaxConfig from "alchemy_solidus/components/ajax_config"
+
+export default class TaxonSelect extends RemoteSelect {
+  get ajaxConfig() {
+    return ajaxConfig(super.ajaxConfig, this.apiKey)
+  }
+
+  get apiKey() {
+    return this.getAttribute("api-key")
+  }
+
+  /**
+   * Parses server response into select2 results object
+   * @param {object} response
+   * @returns {object}
+   * @private
+   */
+  _parseResponse(response) {
+    return {
+      results: response.taxons,
+      more: response.current_page * response.per_page < response.total_count,
+    }
+  }
+
+  /**
+   * result which is visible if a taxon was selected
+   * @param {object} taxon
+   * @returns {string}
+   * @private
+   */
+  _renderResult(taxon) {
+    return taxon.text || taxon.pretty_name
+  }
+
+  /**
+   * html template for each list entry
+   * @param {object} taxon
+   * @param {string} term
+   * @returns {string}
+   * @private
+   */
+  _renderListEntry(taxon, term) {
+    return this._hightlightTerm(taxon.pretty_name, term)
+  }
+}
+
+customElements.define("alchemy-taxon-select", TaxonSelect)

data/app/javascript/alchemy_solidus/components/variant_select.js

@@ -0,0 +1,79 @@
+import { RemoteSelect } from "alchemy_admin/components/remote_select"
+import ajaxConfig from "alchemy_solidus/components/ajax_config"
+
+export default class VariantSelect extends RemoteSelect {
+  get ajaxConfig() {
+    return ajaxConfig(super.ajaxConfig, this.apiKey)
+  }
+
+  get apiKey() {
+    return this.getAttribute("api-key")
+  }
+
+  /**
+   * Search query send to server from select2
+   * @param {string} term
+   * @param {number} page
+   * @returns {object}
+   * @private
+   */
+  _searchQuery(term, page) {
+    return {
+      q: {
+        product_name_or_sku_cont: term,
+        ...JSON.parse(this.queryParams),
+      },
+      page: page,
+    }
+  }
+
+  /**
+   * Parses server response into select2 results object
+   * @param {object} response
+   * @returns {object}
+   * @private
+   */
+  _parseResponse(response) {
+    return {
+      results: response.variants,
+      more: response.current_page * response.per_page < response.total_count,
+    }
+  }
+
+  /**
+   * result which is visible if a variant was selected
+   * @param {object} variant
+   * @returns {string}
+   * @private
+   */
+  _renderResult(variant) {
+    return variant.options_text
+      ? `${variant.name} - ${variant.options_text}`
+      : variant.name
+  }
+
+  /**
+   * html template for each list entry
+   * @param {object} variant
+   * @param {string} term
+   * @returns {string}
+   * @private
+   */
+  _renderListEntry(variant, term) {
+    const name = this._hightlightTerm(variant.name, term)
+    const sku = this._hightlightTerm(variant.sku, term)
+    return `
+      <div class="variant-select-result">
+        <div>
+          <span>${name}</span>
+        </div>
+        <div>
+          <span>${variant.options_text}</span>
+          <span>${sku}</span>
+        </div>
+      </div>
+    `
+  }
+}
+
+customElements.define("alchemy-variant-select", VariantSelect)

data/app/javascript/alchemy_solidus.js

@@ -1 +1,3 @@
 import "alchemy_solidus/components/product_select"
+import "alchemy_solidus/components/taxon_select"
+import "alchemy_solidus/components/variant_select"

data/app/views/alchemy/ingredients/_spree_product_editor.html.erb

@@ -3,26 +3,15 @@
   data: spree_product_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, spree_product_editor.ingredient) do |f| %>
     <%= ingredient_label(spree_product_editor, :product_id) %>
-    <%= f.text_field :product_id,
-      value: spree_product_editor.product&.id,
-      id: spree_product_editor.form_field_id(:product_id),
-      class: 'alchemy_selectbox full_width' %>
+    <%= render Alchemy::Admin::ProductSelect.new(
+      current_alchemy_user.spree_api_key,
+      query_params: spree_product_editor.settings[:query_params],
+      product: spree_product_editor.product
+    ) do %>
+      <%= f.text_field :product_id,
+        value: spree_product_editor.product&.id,
+        id: spree_product_editor.form_field_id(:product_id),
+        class: 'full_width' %>
+    <% end %>
   <% end %>
 <% end %>
-
-<script type="module">
-  import "alchemy_solidus/product_select"
-
-  $('#<%= spree_product_editor.form_field_id(:product_id) %>').alchemyProductSelect({
-    placeholder: "<%= Alchemy.t(:search_product, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_products_path %>",
-    query_params: <%== spree_product_editor.settings[:query_params].to_json %>,
-    <% if spree_product_editor.product %>
-    initialSelection: {
-      id: <%= spree_product_editor.product.id %>,
-      text: "<%= spree_product_editor.product.name %>"
-    }
-    <% end %>
-  })
-</script>

data/app/views/alchemy/ingredients/_spree_taxon_editor.html.erb

@@ -3,26 +3,15 @@
   data: spree_taxon_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, spree_taxon_editor.ingredient) do |f| %>
     <%= ingredient_label(spree_taxon_editor, :taxon_id) %>
-    <%= f.text_field :taxon_id,
-      value: spree_taxon_editor.taxon&.id,
-      id: spree_taxon_editor.form_field_id(:taxon_id),
-      class: 'alchemy_selectbox full_width' %>
+    <%= render Alchemy::Admin::TaxonSelect.new(
+      current_alchemy_user.spree_api_key,
+      query_params: spree_taxon_editor.settings[:query_params],
+      taxon: spree_taxon_editor.ingredient.taxon
+    ) do %>
+      <%= f.text_field :taxon_id,
+        value: spree_taxon_editor.taxon&.id,
+        id: spree_taxon_editor.form_field_id(:taxon_id),
+        class: "full_width" %>
+    <% end %>
   <% end %>
 <% end %>
-
-<script type="module">
-  import "alchemy_solidus/taxon_select"
-
-  $('#<%= spree_taxon_editor.form_field_id(:taxon_id) %>').alchemyTaxonSelect({
-    placeholder: "<%= Alchemy.t(:search_taxon, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_taxons_path %>",
-    query_params: <%== spree_taxon_editor.settings[:query_params].to_json %>,
-    <% if spree_taxon_editor.taxon %>
-    initialSelection: {
-      id: <%= spree_taxon_editor.taxon.id %>,
-      text: "<%= spree_taxon_editor.taxon.pretty_name %>"
-    }
-    <% end %>
-  })
-</script>

data/app/views/alchemy/ingredients/_spree_variant_editor.html.erb

@@ -3,10 +3,16 @@
   data: spree_variant_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, spree_variant_editor.ingredient) do |f| %>
     <%= ingredient_label(spree_variant_editor, :variant_id) %>
-    <%= f.text_field :variant_id,
-      value: spree_variant_editor.variant&.id,
-      id: spree_variant_editor.form_field_id(:variant_id),
-      class: 'alchemy_selectbox full_width' %>
+    <%= render Alchemy::Admin::VariantSelect.new(
+      current_alchemy_user.spree_api_key,
+      query_params: spree_variant_editor.settings[:query_params],
+      variant: spree_variant_editor.ingredient.variant
+    ) do %>
+      <%= f.text_field :variant_id,
+        value: spree_variant_editor.variant&.id,
+        id: spree_variant_editor.form_field_id(:variant_id),
+        class: 'alchemy_selectbox full_width' %>
+    <% end %>
   <% end %>
 <% end %>
 
@@ -28,21 +34,3 @@
     }
   }
 </style>
-
-<script type="module">
-  import "alchemy_solidus/variant_select"
-
-  $('#<%= spree_variant_editor.form_field_id(:variant_id) %>').alchemyVariantSelect({
-    placeholder: "<%= Alchemy.t(:search_variant, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_variants_path %>",
-    query_params: <%== spree_variant_editor.settings[:query_params].to_json %>,
-    <% if spree_variant_editor.variant %>
-    initialSelection: {
-      id: <%= spree_variant_editor.variant.id %>,
-      name: "<%= spree_variant_editor.variant.name %>",
-      options_text: "<%= spree_variant_editor.variant.options_text %>"
-    }
-    <% end %>
-  })
-</script>

data/config/initializers/alchemy.rb

@@ -1,27 +1,27 @@
 alchemy_module = {
-  engine_name: 'spree',
-  name: 'solidus',
+  engine_name: "spree",
+  name: "solidus",
   navigation: {
-    controller: '/spree/admin/orders',
-    action: 'index',
-    name: 'Store',
-    icon: Alchemy.gem_version >= Gem::Version.new("7.4.0.a") ? 'shopping-cart' : 'shopping-cart-line',
-    data: { turbolinks: false },
+    controller: "/spree/admin/orders",
+    action: "index",
+    name: "Store",
+    icon: (Alchemy.gem_version >= Gem::Version.new("7.4.0.a")) ? "shopping-cart" : "shopping-cart-line",
+    data: {turbolinks: false},
     sub_navigation: [
       {
-        controller: '/spree/admin/orders',
-        action: 'index',
-        name: 'Orders'
+        controller: "/spree/admin/orders",
+        action: "index",
+        name: "Orders"
       },
       {
-        controller: '/spree/admin/products',
-        action: 'index',
-        name: 'Products'
+        controller: "/spree/admin/products",
+        action: "index",
+        name: "Products"
       },
       {
-        controller: '/spree/admin/stock_items',
-        action: 'index',
-        name: 'Stock'
+        controller: "/spree/admin/stock_items",
+        action: "index",
+        name: "Stock"
       }
     ]
   }
@@ -30,12 +30,12 @@ alchemy_module = {
 if defined?(Spree::Auth::Engine)
   alchemy_module[:navigation][:sub_navigation].push(
     {
-      controller: '/spree/admin/users',
-      action: 'index',
-      name: 'Users'
+      controller: "/spree/admin/users",
+      action: "index",
+      name: "Users"
     }
   )
-  Alchemy.user_class_name = 'Spree::User'
+  Alchemy.user_class_name = "Spree::User"
   Alchemy.current_user_method = :spree_current_user
 
   if Alchemy.respond_to?(:logout_method)

data/config/initializers/spree.rb

@@ -24,13 +24,13 @@ Rails.application.config.after_initialize do
             match_path: "/languages"
           ),
           (if defined?(Alchemy::Devise::Engine)
-              config.class::MenuItem.new(
-                label: :users,
-                condition: -> { can?(:index, :alchemy_admin_users) },
-                url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
-                match_path: "/users"
-              )
-            end),
+             config.class::MenuItem.new(
+               label: :users,
+               condition: -> { can?(:index, :alchemy_admin_users) },
+               url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
+               match_path: "/users"
+             )
+           end),
           config.class::MenuItem.new(
             label: :tags,
             condition: -> { can?(:index, :alchemy_admin_tags) },

data/db/migrate/20120229160509_create_alchemy_essence_spree_products.rb

@@ -1,8 +1,8 @@
 class CreateAlchemyEssenceSpreeProducts < ActiveRecord::Migration[4.2]
-	def change
-		create_table 'alchemy_essence_spree_products' do |t|
-			t.integer :spree_product_id
-		end
-		add_index :alchemy_essence_spree_products, :spree_product_id
-	end
+  def change
+    create_table "alchemy_essence_spree_products" do |t|
+      t.integer :spree_product_id
+    end
+    add_index :alchemy_essence_spree_products, :spree_product_id
+  end
 end

data/db/migrate/20191107135822_create_alchemy_essence_spree_variants.rb

@@ -1,7 +1,7 @@
 class CreateAlchemyEssenceSpreeVariants < ActiveRecord::Migration[5.2]
   def change
     create_table :alchemy_essence_spree_variants do |t|
-      t.references :variant, null: true, foreign_key: { to_table: Spree::Variant.table_name }
+      t.references :variant, null: true, foreign_key: {to_table: Spree::Variant.table_name}
 
       t.timestamps
     end

data/lib/alchemy/solidus/alchemy_user_extension.rb

@@ -7,7 +7,7 @@ module Alchemy
 
       def spree_roles
         if admin?
-          ::Spree::Role.where(name: 'admin')
+          ::Spree::Role.where(name: "admin")
         else
           ::Spree::Role.none
         end

data/lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb

@@ -1,6 +1,6 @@
 Spree::Admin::BaseController.unauthorized_redirect = -> do
   if spree_current_user
-    flash[:error] = I18n.t('spree.authorization_failure')
+    flash[:error] = I18n.t("spree.authorization_failure")
     redirect_to spree.root_path
   else
     store_location

data/lib/alchemy/solidus/spree_user_extension.rb

@@ -11,7 +11,7 @@ module Alchemy
 
       def alchemy_roles
         if has_spree_role?(:admin)
-          %w(admin)
+          %w[admin]
         else
           []
         end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "7.5.1"
+    VERSION = "7.6.0"
   end
 end

data/lib/generators/alchemy/solidus/install/install_generator.rb

@@ -15,29 +15,29 @@ module Alchemy
       desc "Installs Alchemy Solidus into your App."
 
       class_option :skip_alchemy_installer,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to run the Alchemy installer"
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to run the Alchemy installer"
       class_option :skip_alchemy_devise_installer,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to run the Alchemy Devise installer. NOTE: Automatically skipped if Alchemy::Devise is not available."
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to run the Alchemy Devise installer. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :skip_spree_custom_user_generator,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to run the Solidus custom user generator. NOTE: Automatically skipped if Alchemy::Devise is not available."
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to run the Solidus custom user generator. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :skip_alchemy_user_generator,
-                   default: false,
-                   type: :boolean,
-                   desc:
-                     "Set true if you don't want to generate an admin user. NOTE: Automatically skipped if Alchemy::Devise is not available."
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to generate an admin user. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :auto_accept,
-                   default: false,
-                   type: :boolean,
-                   desc: "Set true if run from a automated script (ie. on a CI)"
+        default: false,
+        type: :boolean,
+        desc: "Set true if run from a automated script (ie. on a CI)"
 
       source_root File.expand_path("files", __dir__)
 
@@ -66,7 +66,7 @@ module Alchemy
 
       def run_spree_custom_user_generator
         if alchemy_devise_present? &&
-             !options[:skip_spree_custom_user_generator]
+            !options[:skip_spree_custom_user_generator]
           arguments =
             (
               if options[:auto_accept]
@@ -77,15 +77,15 @@ module Alchemy
             )
           Spree::CustomUserGenerator.start(arguments)
           gsub_file "lib/spree/authentication_helpers.rb",
-                    /main_app\./,
-                    "Alchemy."
+            /main_app\./,
+            "Alchemy."
           rake("db:migrate", abort_on_failure: true)
         end
       end
 
       def create_admin_user
         if alchemy_devise_present? && !options[:skip_alchemy_user_generator] &&
-             Alchemy::User.count.zero?
+            Alchemy::User.count.zero?
           login = ENV.fetch("ALCHEMY_ADMIN_USER_LOGIN", "admin")
           email = ENV.fetch("ALCHEMY_ADMIN_USER_EMAIL", "admin@example.com")
           password = ENV.fetch("ALCHEMY_ADMIN_USER_PASSWORD", "test1234")
@@ -123,12 +123,12 @@ module Alchemy
               default: mountpoint
             )
         end
-        if File.read(routes_file_path).match SPREE_MOUNT_REGEXP
-          sentinel = SPREE_MOUNT_REGEXP
+        sentinel = if File.read(routes_file_path).match SPREE_MOUNT_REGEXP
+          SPREE_MOUNT_REGEXP
         else
-          sentinel = "Rails.application.routes.draw do\n"
+          "Rails.application.routes.draw do\n"
         end
-        inject_into_file routes_file_path, { after: sentinel } do
+        inject_into_file routes_file_path, {after: sentinel} do
           "\n  mount Alchemy::Engine, at: '/#{mountpoint.chomp("/")}'\n"
         end
       end
@@ -136,12 +136,12 @@ module Alchemy
       def set_root_route
         routes_file_path = Rails.root.join("config", "routes.rb")
         if options[:auto_accept] ||
-             yes?("\nDo you want Alchemy to handle the root route '/'? (y/n)")
+            yes?("\nDo you want Alchemy to handle the root route '/'? (y/n)")
           sentinel = "Rails.application.routes.draw do\n"
-          inject_into_file routes_file_path, { after: sentinel } do
+          inject_into_file routes_file_path, {after: sentinel} do
             <<~ROOT_ROUTE
-              \  # Let AlchemyCMS handle the root route
-              \  root to: 'alchemy/pages#index'
+              # Let AlchemyCMS handle the root route
+              root to: 'alchemy/pages#index'
             ROOT_ROUTE
           end
           copy_file("db/seeds/alchemy/pages.yml")
@@ -151,7 +151,7 @@ module Alchemy
 
       def append_assets
         append_file "vendor/assets/javascripts/alchemy/admin/all.js",
-                    "//= require alchemy/solidus/admin.js"
+          "//= require alchemy/solidus/admin.js"
       end
 
       private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 7.5.1
+  version: 7.6.0
 platform: ruby
 authors:
 - Thomas von Deyen
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -243,6 +243,8 @@ files:
 - app/assets/javascripts/alchemy/solidus/admin.js
 - app/components/alchemy/admin/link_dialog/product_tab.rb
 - app/components/alchemy/admin/product_select.rb
+- app/components/alchemy/admin/taxon_select.rb
+- app/components/alchemy/admin/variant_select.rb
 - app/components/alchemy/ingredients/spree_product_view.rb
 - app/components/alchemy/ingredients/spree_taxon_view.rb
 - app/components/alchemy/ingredients/spree_variant_view.rb
@@ -250,11 +252,10 @@ files:
 - app/decorators/models/alchemy/solidus/spree_taxon_decorator.rb
 - app/decorators/models/alchemy/solidus/spree_variant_decorator.rb
 - app/javascript/alchemy_solidus.js
+- app/javascript/alchemy_solidus/components/ajax_config.js
 - app/javascript/alchemy_solidus/components/product_select.js
-- app/javascript/alchemy_solidus/product_select.js
-- app/javascript/alchemy_solidus/select2_config.js
-- app/javascript/alchemy_solidus/taxon_select.js
-- app/javascript/alchemy_solidus/variant_select.js
+- app/javascript/alchemy_solidus/components/taxon_select.js
+- app/javascript/alchemy_solidus/components/variant_select.js
 - app/models/alchemy/ingredients/spree_product.rb
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.rb
@@ -309,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.5
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!

data/app/javascript/alchemy_solidus/product_select.js

@@ -1,37 +0,0 @@
-import { getSelect2Config } from "alchemy_solidus/select2_config"
-
-$.fn.alchemyProductSelect = function (options) {
-  const config = getSelect2Config(options)
-
-  function formatResultObject(product) {
-    return {
-      id: product.id,
-      text: product.name,
-    }
-  }
-
-  const select2config = Object.assign(config, {
-    ajax: Object.assign(config.ajax, {
-      data(term, page) {
-        return {
-          q: Object.assign(
-            {
-              name_cont: term,
-            },
-            options.query_params
-          ),
-          page: page,
-        }
-      },
-      results(data, page) {
-        return {
-          results: data.products.map(
-            options.formatResultObject || formatResultObject
-          ),
-          more: page * data.per_page < data.total_count,
-        }
-      },
-    }),
-  })
-  this.select2(select2config)
-}

data/app/javascript/alchemy_solidus/select2_config.js

@@ -1,24 +0,0 @@
-export function getSelect2Config(options) {
-  const headers = {
-    Authorization: "Bearer " + options.apiToken,
-  }
-
-  return {
-    placeholder: options.placeholder,
-    minimumInputLength: 3,
-    allowClear: true,
-    initSelection:
-      options.initSelection ||
-      function (_$el, callback) {
-        if (options.initialSelection) {
-          callback(options.initialSelection)
-        }
-      },
-    ajax: {
-      url: options.baseUrl,
-      datatype: "json",
-      quietMillis: 300,
-      params: { headers: headers },
-    },
-  }
-}

data/app/javascript/alchemy_solidus/taxon_select.js

@@ -1,37 +0,0 @@
-import { getSelect2Config } from "alchemy_solidus/select2_config"
-
-$.fn.alchemyTaxonSelect = function (options) {
-  const config = getSelect2Config(options)
-
-  this.select2(
-    $.extend(true, config, {
-      ajax: {
-        data(term, page) {
-          return {
-            q: $.extend(
-              {
-                name_cont: term,
-              },
-              options.query_params
-            ),
-            page: page,
-          }
-        },
-        results(data, page) {
-          return {
-            results: data.taxons.map(function (taxon) {
-              return {
-                id: taxon.id,
-                text: taxon.pretty_name,
-              }
-            }),
-            more: page * data.per_page < data.total_count,
-          }
-        },
-      },
-      formatSelection(taxon) {
-        return taxon.text || taxon.name
-      },
-    })
-  )
-}

data/app/javascript/alchemy_solidus/variant_select.js

@@ -1,55 +0,0 @@
-import { getSelect2Config } from "alchemy_solidus/select2_config"
-
-$.fn.alchemyVariantSelect = function (options) {
-  const config = getSelect2Config(options)
-
-  function formatSelection(variant) {
-    return variant.options_text
-      ? `${variant.name} - ${variant.options_text}`
-      : variant.name
-  }
-
-  function formatResult(variant, _el, query) {
-    const matchTerm = new RegExp(query.term, "gi")
-    const formatMatch = (match) => `<em>${match}</em>`
-    const name = variant.name.replace(matchTerm, formatMatch)
-    const sku = variant.sku.replace(matchTerm, formatMatch)
-    return `
-      <div class="variant-select-result">
-        <div>
-          <span>${name}</span>
-        </div>
-        <div>
-          <span>${variant.options_text}</span>
-          <span>${sku}</span>
-        </div>
-      </div>
-    `
-  }
-
-  this.select2(
-    $.extend(true, config, {
-      ajax: {
-        data(term, page) {
-          return {
-            q: $.extend(
-              {
-                product_name_or_sku_cont: term,
-              },
-              options.query_params
-            ),
-            page: page,
-          }
-        },
-        results(data, page) {
-          return {
-            results: data.variants,
-            more: page * data.per_page < data.total_count,
-          }
-        },
-      },
-      formatSelection,
-      formatResult,
-    })
-  )
-}