alchemy-solidus 8.1.0 → 8.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f430eef503b1316b367b98550bd8dc9154fa4a042695b38f55b14177c245c96
-  data.tar.gz: e872e1bf804dda6d5a9cfc60936818af8409ec5896b9fd7981daa52b9ce6301f
+  metadata.gz: 388e43431448c1a1a17fa17d35cd664791e29cb0ce0347d0305eade52beee9f2
+  data.tar.gz: 0a3898bfe1729d1493192d7afc18ce9a1fd49b08a3bc104b50d1a1495ef8d903
 SHA512:
-  metadata.gz: 381b2949455b301e3b4eb336904becdf86c36dfd1ef12558f8b22465e79b724ec35a2286f3e73de4194c2c504f7758114b6afadabdaadb50de1e2eed98864afd
-  data.tar.gz: 2ba6d5d1aa1c0e520b288c909ad58f66be3dba275c84ffc74a3ad509fda13b6cb40b7c10fd3030858cdc96260d83858cf5516313c0cf643b6cafdf61a72e1b2c
+  metadata.gz: 38f6dda602d371891230ea523e3de04ab5175c61e35777f29383799f8271bdf3df771f77853f2c7b17d2a520d215609fa3c3138783a40e5e0cdfc8befdc8aff7
+  data.tar.gz: 0c9cfc91e7d5f2bb9c0d9f0819cdc042daea377876a465a759e962ae08148934250e5cab74609f98631b49e06301b0fc9f77dd11eec66b8e4eb110743f3b002e

data/Rakefile

@@ -14,9 +14,9 @@ task default: %i[test_setup spec]
 
 desc "Setup test app"
 task :test_setup do
-  solidus_branch = ENV.fetch("SOLIDUS_BRANCH", "v4.6")
+  solidus_branch = ENV.fetch("SOLIDUS_BRANCH", "v4.7")
   solidus_install_options = "--payment-method=none --frontend=none --authentication=none"
-  if ["v4.5", "v4.6", "main"].include?(solidus_branch)
+  if ["v4.5", "v4.6", "v4.7", "main"].include?(solidus_branch)
     solidus_install_options += " --admin-preview=false"
   end
   ENV["SKIP_SOLIDUS_BOLT"] = "1" # solidus_frontend defaults to installing solidus_bolt if auto-accept is used

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

@@ -46,7 +46,8 @@ module Alchemy
       def serialized_selection
         {
           id: product.send(value_attribute),
-          name: product.name
+          name: product.name,
+          image: product.master&.gallery&.images&.[](0)&.url(:mini)
         }.to_json
       end
     end

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

@@ -40,7 +40,8 @@ module Alchemy
           id: variant.id,
           name: variant.name,
           sku: variant.sku,
-          options_text: variant.options_text
+          options_text: variant.options_text,
+          image: variant.gallery.images[0]&.url(:mini)
         }.to_json
       end
     end

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

@@ -15,7 +15,7 @@ export default class ProductSelect extends RemoteSelect {
   }
 
   /**
-   * Parses server response into select2 results object
+   * Parses server response into a results object
    * @param {object} response
    * @returns {object}
    * @private
@@ -26,6 +26,7 @@ export default class ProductSelect extends RemoteSelect {
         return {
           id: this._parsedValue(product),
           name: product.name,
+          image: product.master?.images[0]?.mini_url,
         }
       }),
       more: response.current_page * response.per_page < response.total_count,
@@ -48,24 +49,30 @@ export default class ProductSelect extends RemoteSelect {
   }
 
   /**
-   * result which is visible if a product was selected
+   * slots of a dropdown option
    * @param {object} product
-   * @returns {string}
-   * @private
+   * @param {string} term
+   * @returns {object}
+   * @protected
    */
-  _renderResult(product) {
-    return product.name
+  _entry(product, term) {
+    return {
+      primary: this._hightlightTerm(product.name, term),
+      media: product.image
+    }
   }
 
   /**
-   * html template for each list entry
+   * slots of the selected product shown in the control
    * @param {object} product
-   * @param {string} term
-   * @returns {string}
-   * @private
+   * @returns {object}
+   * @protected
    */
-  _renderListEntry(product, term) {
-    return this._hightlightTerm(product.name, term)
+  _selectedEntry(product) {
+    return {
+      primary: product.name,
+      media: product.image
+    }
   }
 }
 

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

@@ -11,7 +11,7 @@ export default class TaxonSelect extends RemoteSelect {
   }
 
   /**
-   * Parses server response into select2 results object
+   * Parses server response into a results object
    * @param {object} response
    * @returns {object}
    * @private
@@ -24,24 +24,28 @@ export default class TaxonSelect extends RemoteSelect {
   }
 
   /**
-   * result which is visible if a taxon was selected
+   * slots of a dropdown option
    * @param {object} taxon
-   * @returns {string}
-   * @private
+   * @param {string} term
+   * @returns {object}
+   * @protected
    */
-  _renderResult(taxon) {
-    return taxon.text || taxon.pretty_name
+  _entry(taxon, term) {
+    return {
+      primary: this._hightlightTerm(taxon.pretty_name, term)
+    }
   }
 
   /**
-   * html template for each list entry
+   * slots of the selected taxon shown in the control
    * @param {object} taxon
-   * @param {string} term
-   * @returns {string}
-   * @private
+   * @returns {object}
+   * @protected
    */
-  _renderListEntry(taxon, term) {
-    return this._hightlightTerm(taxon.pretty_name, term)
+  _selectedEntry(taxon) {
+    return {
+      primary: taxon.text || taxon.pretty_name
+    }
   }
 }
 

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

@@ -11,7 +11,7 @@ export default class VariantSelect extends RemoteSelect {
   }
 
   /**
-   * Search query send to server from select2
+   * Search query send to server
    * @param {string} term
    * @param {number} page
    * @returns {object}
@@ -28,51 +28,51 @@ export default class VariantSelect extends RemoteSelect {
   }
 
   /**
-   * Parses server response into select2 results object
+   * Parses server response into a results object
    * @param {object} response
    * @returns {object}
    * @private
    */
   _parseResponse(response) {
     return {
-      results: response.variants,
+      results: response.variants.map((variant) => {
+        return {
+          ...variant,
+          image: variant.images[0]?.mini_url
+        }
+      }),
       more: response.current_page * response.per_page < response.total_count,
     }
   }
 
   /**
-   * result which is visible if a variant was selected
+   * slots of a dropdown option
    * @param {object} variant
-   * @returns {string}
-   * @private
+   * @param {string} term
+   * @returns {object}
+   * @protected
    */
-  _renderResult(variant) {
-    return variant.options_text
-      ? `${variant.name} - ${variant.options_text}`
-      : variant.name
+  _entry(variant, term) {
+    return {
+      primary: this._hightlightTerm(variant.name, term),
+      secondary: variant.options_text,
+      secondaryAside: variant.sku,
+      media: variant.image
+    }
   }
 
   /**
-   * html template for each list entry
+   * slots of the selected variant shown in the control
    * @param {object} variant
-   * @param {string} term
-   * @returns {string}
-   * @private
+   * @returns {object}
+   * @protected
    */
-  _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>
-    `
+  _selectedEntry(variant) {
+    return {
+      primary: variant.name,
+      secondary: variant.options_text,
+      media: variant.image
+    }
   }
 }
 

data/app/jobs/alchemy/solidus/invalidate_elements_cache_job.rb

@@ -4,6 +4,11 @@ module Alchemy
       queue_as :default
 
       def perform(model_name, id)
+        Alchemy::Deprecation.warn <<~WARN
+          Alchemy::Solidus::InvalidateElementsCacheJob is deprecated and will be removed in 9.0.
+          Please use Alchemy::InvalidateElementsCacheJob instead.
+        WARN
+
         now = Time.current
 
         element_ids = model(model_name)

data/app/overrides/spree/admin/users/_form/alchemy_roles_field.html.erb.deface

@@ -0,0 +1,10 @@
+<!-- insert_after '[data-hook="admin_user_form_roles"]' -->
+
+<%= f.field_container :alchemy_roles do %>
+  <%= label_tag nil, t(".alchemy_roles") %>
+  <%= admin_hint t(".alchemy_roles"), t(:alchemy_roles_html, scope: [:spree, :hints, "spree/user"]) %>
+  <%= f.collection_select :alchemy_roles, Alchemy.config.user_roles, :to_s, :capitalize,
+    {include_blank: false},
+    multiple: true, disabled: cannot?(:update_role, @user),
+    class: "select2 fullwidth" %>
+<% end %>

data/app/patches/controllers/alchemy/solidus/spree_admin_users_controller_patch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeAdminUsersControllerPatch
+      private
+
+      def permitted_user_attributes
+        attributes = super
+        attributes << {alchemy_roles: []} if can?(:update_role, @user)
+        attributes
+      end
+
+      if defined?(::Spree::Admin::UsersController)
+        ::Spree::Admin::UsersController.prepend self
+      end
+    end
+  end
+end

data/app/patches/models/alchemy/solidus/alchemy_user_patch.rb

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

data/app/patches/models/alchemy/solidus/spree_product_patch.rb

@@ -4,8 +4,6 @@ module Alchemy
   module Solidus
     module SpreeProductPatch
       def self.prepended(base)
-        # Solidus runs touch callbacks on product after_save
-        base.after_touch :touch_alchemy_ingredients
         base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeProduct", as: :related_object, dependent: :nullify
       end
 
@@ -24,13 +22,9 @@ module Alchemy
         taxons.each(&:touch)
       end
 
-      # Touch all elements that have this product assigned to one of its ingredients.
-      # This cascades to all parent elements and pages as well.
-      def touch_alchemy_ingredients
-        InvalidateElementsCacheJob.perform_later("SpreeProduct", id)
-      end
-
       ::Spree::Product.prepend self
     end
   end
+
+  ::Spree::Product.include RelatableResource
 end

data/app/patches/models/alchemy/solidus/spree_taxon_patch.rb

@@ -4,20 +4,11 @@ module Alchemy
   module Solidus
     module SpreeTaxonPatch
       def self.prepended(base)
-        base.after_update :touch_alchemy_ingredients
-        base.after_touch :touch_alchemy_ingredients
         base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeTaxon", as: :related_object, dependent: :nullify
       end
 
       ::Spree::Taxon.prepend self
-
-      private
-
-      # Touch all elements that have this taxon assigned to one of its ingredients.
-      # This cascades to all parent elements and pages as well.
-      def touch_alchemy_ingredients
-        InvalidateElementsCacheJob.perform_later("SpreeTaxon", id)
-      end
     end
   end
+  ::Spree::Taxon.include RelatableResource
 end

data/app/patches/models/alchemy/solidus/spree_user_patch.rb

@@ -11,16 +11,9 @@ module Alchemy
         email
       end
 
-      def alchemy_roles
-        if has_spree_role?(:admin)
-          %w[admin]
-        else
-          []
-        end
-      end
-
       if defined?(::Spree::User)
         ::Spree::User.prepend self
+        ::Spree::User.include Alchemy::UserMethods
       end
     end
   end

data/app/patches/models/alchemy/solidus/spree_variant_patch.rb

@@ -4,20 +4,12 @@ module Alchemy
   module Solidus
     module SpreeVariantPatch
       def self.prepended(base)
-        base.after_update :touch_alchemy_ingredients
-        base.after_touch :touch_alchemy_ingredients
         base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeVariant", as: :related_object, dependent: :nullify
       end
 
       ::Spree::Variant.prepend self
-
-      private
-
-      # Touch all elements that have this variant assigned to one of its ingredients.
-      # This cascades to all parent elements and pages as well.
-      def touch_alchemy_ingredients
-        InvalidateElementsCacheJob.perform_later("SpreeVariant", id)
-      end
     end
   end
+
+  ::Spree::Variant.include RelatableResource
 end

data/config/locales/alchemy_solidus.de.yml

@@ -18,3 +18,16 @@ de:
         users: Benutzer
         pictures: Bilder
         attachments: Dateien
+      users:
+        form:
+          alchemy_roles: Alchemy Rollen
+    hints:
+      spree/user:
+        alchemy_roles_html: |
+          <p>Diese Rollen steuern den Zugriff zum Alchemy CMS.</p>
+          <ul>
+            <li><kbd>Mitglied</kbd> beschreibt regulär angemeldete Kunden und ermöglicht den Zugriff auf regulär gesicherte Seiten. Sie <strong>ermöglicht nicht</strong> auf den Admin Bereich zuzugreifen.</li>
+            <li><kbd>Autor</kbd> ermöglicht Seiteninhalte zu bearbeiten, aber keine Seiten zu erstellen.</li>
+            <li><kbd>Editor</kbd> ermöglicht vollen Zugriff auf Seiten und Sprachen.</li>
+            <li><kbd>Admin</kbd> ermöglicht <strong>vollen Zugriff auf alles</strong>.</li>
+          </ul>

data/config/locales/alchemy_solidus.en.yml

@@ -0,0 +1,33 @@
+en:
+  alchemy:
+    choose_product_to_link: Choose a product to link to
+    link_overlay_tab_label:
+      product: Product
+    solidus:
+      search_variant: Search a variant by name or sku
+      search_product: Search a product by name
+      search_taxon: Search a taxon by name
+  spree:
+    admin:
+      tab:
+        cms: CMS
+        pages: Pages
+        sites: Sites
+        languages: Languages
+        tags: Tags
+        users: Users
+        pictures: Pictures
+        attachments: Attachments
+      users:
+        form:
+          alchemy_roles: Alchemy Roles
+    hints:
+      spree/user:
+        alchemy_roles_html: |
+          <p>These roles allow access to Alchemy CMS.</p>
+          <ul>
+            <li><kbd>Member</kbd> describes regular logged in customers and allows to visit regularly restricted pages. It <strong>does not</strong> grant access to the CMS backend.</li>
+            <li><kbd>Author</kbd> grants access to edit content but not to create pages.</li>
+            <li><kbd>Editor</kbd> grants access to fully manage pages and languages.</li>
+            <li><kbd>Admin</kbd> grants access <strong>to manage everything</strong>.</li>
+          </ul>

data/config/locales/alchemy_solidus.it.yml

@@ -0,0 +1,24 @@
+it:
+  spree:
+    admin:
+      tab:
+        cms: CMS
+        pages: "Pagine"
+        sites: "Siti"
+        languages: "Lingue"
+        tags: "Tags"
+        pictures: "Immagini"
+        attachments: "File"
+      users:
+        form:
+          alchemy_roles: Alchemy Ruoli
+    hints:
+      spree/user:
+        alchemy_roles_html: |
+          <p>Questi ruoli consentono l'accesso ad Alchemy CMS.</p>
+          <ul>
+            <li><kbd>Membro</kbd> indica i normali clienti autenticati e consente di visitare le pagine ad accesso limitato. <strong>Non</strong> concede l'accesso al backend del CMS.</li>
+            <li><kbd>Autore</kbd> concede l'accesso alla modifica dei contenuti, ma non alla creazione di pagine.</li>
+            <li><kbd>Editore</kbd> concede l'accesso alla gestione completa di pagine e lingue.</li>
+            <li><kbd>Amministratore</kbd> concede l'accesso <strong>alla gestione di tutto</strong>.</li>
+          </ul>

data/lib/alchemy/solidus/test_support/factories/ingredient_factories.rb

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  %w[
+    product
+    taxon
+    variant
+  ].each do |ingredient|
+    factory :"alchemy_ingredient_spree_#{ingredient}", class: "Alchemy::Ingredients::Spree#{ingredient.classify}" do
+      role { ingredient }
+      type { "Alchemy::Ingredients::Spree#{ingredient.classify}" }
+      association :element, name: ingredient, factory: :alchemy_element
+    end
+  end
+end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "8.1.0"
+    VERSION = "8.4.1"
   end
 end

data/lib/generators/alchemy/solidus/install/files/db/migrate/set_alchemy_roles.tt

@@ -0,0 +1,16 @@
+class SetAlchemyRolesOn<%= @table_name.camelcase %>Table < ActiveRecord::Migration[7.2]
+  def up
+    Spree::User.find_each do |user|
+      alchemy_roles = if user.has_spree_role?(:admin)
+        "admin"
+      end
+      user.update_column(:alchemy_roles, alchemy_roles)
+    end
+  end
+
+  def down
+    Spree::User.find_each do |user|
+      user.update_column(:alchemy_roles, nil)
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 require "rails/generators"
+require "rails/generators/active_record/migration"
 require "generators/alchemy/install/install_generator"
+require "generators/alchemy/user_columns_migration/user_columns_migration_generator"
 require "generators/spree/custom_user/custom_user_generator"
 require "solidus_support"
 
@@ -11,6 +13,8 @@ end
 module Alchemy
   module Solidus
     class InstallGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+
       SPREE_MOUNT_REGEXP = /mount\sSpree::Core::Engine.*$/
       desc "Installs Alchemy Solidus into your App."
 
@@ -24,6 +28,11 @@ module Alchemy
         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_alchemy_user_columns_generator,
+        default: false,
+        type: :boolean,
+        desc:
+          "Set true if you don't want to run the Alchemy user columns generator. NOTE: Automatically skipped if Spree::User is not available."
       class_option :skip_spree_custom_user_generator,
         default: false,
         type: :boolean,
@@ -64,6 +73,20 @@ module Alchemy
         end
       end
 
+      def run_alchemy_user_columns_generator
+        if defined?(::Spree::User) &&
+            !options[:skip_alchemy_user_columns_generator]
+          @table_name = ::Spree::User.table_name
+          arguments = [
+            "--table-name",
+            @table_name, options[:auto_accept] && "--force"
+          ].compact
+          Alchemy::Generators::UserColumnsMigrationGenerator.start(arguments)
+          migration_template "db/migrate/set_alchemy_roles.tt", "db/migrate/set_alchemy_roles_on_#{@table_name}_table.rb"
+          rake("db:migrate", abort_on_failure: true)
+        end
+      end
+
       def run_spree_custom_user_generator
         if alchemy_devise_present? &&
             !options[:skip_spree_custom_user_generator]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.4.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.0.a
+        version: 8.4.0.a
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.0.a
+        version: 8.4.0.a
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 description: A AlchemyCMS and Solidus integration
 email:
 - thomas@vondeyen.com
@@ -284,8 +284,10 @@ 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/overrides/spree/admin/users/_form/alchemy_roles_field.html.erb.deface
 - app/patches/controllers/alchemy/solidus/alchemy_base_controller_patch.rb
 - app/patches/controllers/alchemy/solidus/application_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_admin_users_controller_patch.rb
 - app/patches/controllers/alchemy/solidus/spree_user_confirmations_controller_patch.rb
 - app/patches/controllers/alchemy/solidus/spree_user_passwords_controller_patch.rb
 - app/patches/controllers/alchemy/solidus/spree_user_registrations_controller_patch.rb
@@ -301,12 +303,13 @@ files:
 - config/initializers/alchemy.rb
 - config/initializers/spree.rb
 - config/locales/alchemy_solidus.de.yml
-- config/locales/alchemy_solidus_en.yml
-- config/locales/alchemy_solidus_it.yml
-- config/locales/en.yml
+- config/locales/alchemy_solidus.en.yml
+- config/locales/alchemy_solidus.it.yml
 - lib/alchemy-solidus.rb
 - lib/alchemy/solidus/engine.rb
+- lib/alchemy/solidus/test_support/factories/ingredient_factories.rb
 - lib/alchemy/solidus/version.rb
+- lib/generators/alchemy/solidus/install/files/db/migrate/set_alchemy_roles.tt
 - lib/generators/alchemy/solidus/install/files/db/seeds/alchemy/pages.yml
 - lib/generators/alchemy/solidus/install/install_generator.rb
 - lib/patches/backend/controllers/alchemy/solidus/spree_admin_base_controller_patch.rb
@@ -329,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.20
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!

data/config/locales/alchemy_solidus_en.yml

@@ -1,20 +0,0 @@
-en:
-  alchemy:
-    choose_product_to_link: Choose a product to link to
-    link_overlay_tab_label:
-      product: Product
-    solidus:
-      search_variant: Search a variant by name or sku
-      search_product: Search a product by name
-      search_taxon: Search a taxon by name
-  spree:
-    admin:
-      tab:
-        cms: CMS
-        pages: Pages
-        sites: Sites
-        languages: Languages
-        tags: Tags
-        users: Users
-        pictures: Pictures
-        attachments: Attachments

data/config/locales/alchemy_solidus_it.yml

@@ -1,11 +0,0 @@
-it:
-  spree:
-    admin:
-      tab:
-        cms: CMS
-        pages: "Pagine"
-        sites: "Siti"
-        languages: "Lingue"
-        tags: "Tags"
-        pictures: "Immagini"
-        attachments: "File"

data/config/locales/en.yml

@@ -1,5 +0,0 @@
-en:
-  alchemy:
-    essences:
-      essence_spree_taxon_editor:
-        none: None