alchemy-solidus 7.2.1 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e50bb72fd9136b75ae2b8ea66ca80acb37edf3322f2aa750e0ca1f9bc5e1071
-  data.tar.gz: b6cbccde4616f51672baf1b45df5f06d11ad63edf13fdb0c1a6f100ee0b9e819
+  metadata.gz: 823fe7fab5027f254ca1440418ca0f5957e3e4825dba007096b8fd5268694141
+  data.tar.gz: cb223e06aa86c2a2cffed82b594e03d6febe9004b0fe55787b47b2ce76a5c3a0
 SHA512:
-  metadata.gz: a8324f5ffbf7fc02fd449f30d6b3bb80378cf188b3b4f6f966bcf95b467437160f0511e37eabf1e19ee6a6ae4bf970fb4491b5f6c99989dff9abf1fdedc59fb1
-  data.tar.gz: 5dd149df193cfe5638e9abd2d73d127d6c334de0d2a7ab7cebc868b98e34249af41796b4ad3518b9b1a35d50796c616f8609da2d1fee924df41c7c8288369365
+  metadata.gz: ff3cadb5fc31dc7603910e487cbaf59e13edf00f764ddb38af6dcd25f745b53e83a286ece56829acb34bcda3711210cb6144ae1cf3488a95cf00a0c48c06ecf2
+  data.tar.gz: 061dbe3d8ccf9c1884dac806d44737f9e6e5f0d605da197f517200f2fd2a40dd0a1820c5b08e28d62d02eb3deb07346dbb3de68e55fc91c4b2344844e7efa755

data/app/assets/config/alchemy_solidus/manifest.js

@@ -0,0 +1 @@
+//= link_tree ../../../javascript .js

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module LinkDialog
+      class ProductTab < BaseTab
+        delegate :alchemy, :current_alchemy_user, :spree, to: :helpers
+
+        def self.product_select_class
+          ProductSelect
+        end
+
+        def title
+          Alchemy.t("link_overlay_tab_label.product")
+        end
+
+        def self.panel_name
+          :product
+        end
+
+        def fields
+          [
+            product_select,
+            title_input,
+            target_select
+          ]
+        end
+
+        def message
+          render_message(:info, content_tag("h3", Alchemy.t(:choose_product_to_link)))
+        end
+
+        private
+
+        def product
+          slug = url&.match(/products\/(?<slug>[\w-]+)/)&.captures
+          return unless slug
+
+          @_product ||= Spree::Product.find_by(slug: slug)
+        end
+
+        def product_select
+          label = label_tag("product_link", Alchemy.t(:product), class: "control-label")
+          input = text_field_tag("product_link", product && url, id: "product_link",
+            placeholder: Alchemy.t(:search_product, scope: "solidus"),
+            class: "alchemy_selectbox")
+          select = render self.class.product_select_class.new(
+            current_alchemy_user.spree_api_key,
+            product: product,
+            url: spree.api_products_path
+          ).with_content(input)
+          content_tag("div", label + select, class: "input select")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Alchemy
+  module Admin
+    class ProductSelect < ViewComponent::Base
+      delegate :spree, to: :helpers
+
+      attr_reader :api_key, :product, :url, :query_params
+
+      def initialize(api_key, product: nil, url: nil, query_params: nil)
+        @api_key = api_key
+        @product = product
+        @url = url
+        @query_params = query_params
+      end
+
+      def call
+        content_tag("alchemy-product-select", content, attributes)
+      end
+
+      private
+
+      def attributes
+        attrs = {
+          url: url || spree.api_products_path,
+          "api-key": api_key
+        }
+
+        attrs[:"query-params"] = query_params.to_json if query_params
+
+        if product
+          attrs[:selection] = serialized_selection
+        end
+
+        attrs
+      end
+
+      def serialized_selection
+        {
+          name: product.name,
+          slug: product.slug
+        }.to_json
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+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),
+    })
+  }
+
+  get url() {
+    return this.getAttribute("url")
+  }
+
+  get apiToken() {
+    return this.getAttribute("api-key")
+  }
+
+  _initSelection(_$el, callback) {
+    const selection = this.getAttribute("selection")
+    const product = JSON.parse(selection)
+    callback(this._formatResult(product))
+  }
+
+  _formatResult(product) {
+    return {
+      id: `${Spree.mountedAt()}products/${product.slug}`,
+      text: product.name,
+    }
+  }
+
+  _searchQuery(value) {
+    const slug = value.replace(`${Spree.mountedAt()}products/`, "")
+    return `q[slug_eq]=${slug}`
+  }
+}
+
+customElements.define("alchemy-product-select", ProductSelect)

data/app/javascript/alchemy_solidus.js

@@ -0,0 +1 @@
+import "alchemy_solidus/components/product_select"

data/config/importmap.rb

@@ -0,0 +1,3 @@
+Alchemy.importmap.pin "alchemy_solidus", to: "alchemy_solidus.js", preload: true
+Alchemy.importmap.pin_all_from Alchemy::Solidus::Engine.root.join("app/javascript/alchemy_solidus"),
+  under: "alchemy_solidus", preload: true

data/config/initializers/alchemy.rb

@@ -52,4 +52,5 @@ end
 
 Rails.application.config.after_initialize do
   Alchemy::Modules.register_module(alchemy_module)
+  Alchemy.link_dialog_tabs.add(Alchemy::Admin::LinkDialog::ProductTab)
 end

data/lib/alchemy/solidus/engine.rb

@@ -10,6 +10,17 @@ module Alchemy
       include SolidusSupport::EngineExtensions
       engine_name "alchemy_solidus"
 
+      initializer "alchemy_solidus.assets", before: "alchemy.importmap" do |app|
+        Alchemy.admin_importmaps.add({
+          importmap_path: root.join("config/importmap.rb"),
+          source_paths: [
+            root.join("app/javascript")
+          ],
+          name: engine_name
+        })
+        app.config.assets.precompile << "alchemy_solidus/manifest.js"
+      end
+
       config.to_prepare do
         Alchemy.register_ability ::Spree::Ability
         ::Spree::Ability.register_ability ::Alchemy::Permissions

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "7.2.1"
+    VERSION = "7.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.2.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.2.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -240,17 +240,22 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/alchemy_solidus/manifest.js
 - app/assets/javascripts/alchemy/solidus/admin.js
 - app/assets/javascripts/alchemy/solidus/admin/product_select.js
 - app/assets/javascripts/alchemy/solidus/admin/select2_config.js
 - app/assets/javascripts/alchemy/solidus/admin/taxon_select.js
 - app/assets/javascripts/alchemy/solidus/admin/variant_select.js
+- app/components/alchemy/admin/link_dialog/product_tab.rb
+- app/components/alchemy/admin/product_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
 - app/decorators/models/spree/spree_product_decorator.rb
 - app/decorators/models/spree/spree_taxon_decorator.rb
 - app/decorators/models/spree/spree_variant_decorator.rb
+- app/javascript/alchemy_solidus.js
+- app/javascript/alchemy_solidus/components/product_select.js
 - app/models/alchemy/ingredients/spree_product.rb
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.rb
@@ -259,8 +264,6 @@ files:
 - app/overrides/alchemy/admin/pages/link/product_link_panel.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_sl_tab.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_tab.html.erb.deface
-- app/views/alchemy/admin/pages/_product_link.html.erb
-- app/views/alchemy/admin/pages/_product_link_script.html.erb
 - app/views/alchemy/ingredients/_spree_product_editor.html.erb
 - app/views/alchemy/ingredients/_spree_product_view.html.erb
 - app/views/alchemy/ingredients/_spree_taxon_editor.html.erb
@@ -268,6 +271,7 @@ files:
 - app/views/alchemy/ingredients/_spree_variant_editor.html.erb
 - app/views/alchemy/ingredients/_spree_variant_view.html.erb
 - app/views/spree/admin/shared/_alchemy_sub_menu.html.erb
+- config/importmap.rb
 - config/initializers/alchemy.rb
 - config/initializers/spree.rb
 - config/locales/alchemy_solidus.de.yml

data/app/views/alchemy/admin/pages/_product_link.html.erb

@@ -1,30 +0,0 @@
-<form data-link-form-type="product">
-  <%= render_message do %>
-    <h3><%= Alchemy.t(:choose_product_to_link) %></h3>
-  <% end %>
-  <div class="input select">
-    <label for="product_link" class="control-label">
-      <%= Spree::Product.model_name.human %>
-    </label>
-    <input type="text" id="product_link" class="alchemy_selectbox full_width">
-  </div>
-  <div class="input text">
-    <label for="product_link_title" class="control-label">
-      <%= Alchemy.t(:link_title) %>
-    </label>
-    <%= text_field_tag "product_link_title", '', class: 'link_title' %>
-  </div>
-  <div class="input select">
-    <label for="product_link_target" class="control-label">
-      <%= Alchemy.t("Open Link in") %>
-    </label>
-    <%= select_tag 'product_link_target',
-      options_for_select(Alchemy::Page.link_target_options),
-      class: 'alchemy_selectbox link_target' %>
-  </div>
-  <div class="submit">
-    <%= button_tag Alchemy.t(:apply), class: "create-link button", data: { link_type: "product" } %>
-  </div>
-</form>
-
-<%= render "product_link_script" %>

data/app/views/alchemy/admin/pages/_product_link_script.html.erb

@@ -1,47 +0,0 @@
-<script>
-  var $tabs = $("#overlay_tabs")
-
-  $tabs.on("SelectLinkTab.Alchemy", function(event, data) {
-    $("#product_link").select2("val", data.link.attr("href"))
-  })
-  $("#product_link").alchemyProductSelect({
-    placeholder: "<%= Alchemy.t(:search_product, scope: "solidus") %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_products_path %>",
-    formatResultObject(product) {
-      return {
-        id: Spree.mountedAt() + "products/"+ product.slug,
-        text: product.name,
-      }
-    },
-    initSelection($element, callback) {
-      var query = $element.val().replace(Spree.mountedAt() + "products/", "")
-      $.ajax({
-        url: "<%= spree.api_products_path %>",
-        data: {
-          q: { slug_eq: query },
-          page: 1,
-          per_page: 1
-        },
-        headers: {
-          Authorization: "Bearer <%= current_alchemy_user.spree_api_key %>"
-        }
-      }).done(function(data) {
-        var product = data.products[0]
-        if (product) {
-          callback({
-            id: Spree.mountedAt() + "products/"+ product.slug,
-            text: product.name
-          })
-          if (typeof $tabs.tabs === "function") {
-            $tabs.tabs("option", "active",
-              $("#overlay_tabs > div").index($("#overlay_tab_product_link"))
-            )
-          } else {
-            $tabs.get(0).show('overlay_tab_product_link')
-          }
-        }
-      })
-    },
-  })
-</script>