alchemy_cms 8.1.8 → 8.1.10

data/app/components/alchemy/ingredients/base_editor.rb

@@ -161,7 +161,7 @@ module Alchemy
       end
 
       def form_field_counter
-        element.definition.ingredients.index { |i| i.role == role }
+        ingredient.id
       end
 
       # Renders the translated role of ingredient.

data/app/controllers/alchemy/admin/languages_controller.rb

@@ -30,6 +30,9 @@ module Alchemy
 
       def destroy
         if @language.destroy
+          if session[:alchemy_language_id] == @language.id
+            session.delete(:alchemy_language_id)
+          end
           flash[:notice] = Alchemy.t("Language successfully removed")
         else
           flash[:warning] = @language.errors.full_messages.to_sentence

data/app/decorators/alchemy/ingredient_editor.rb

@@ -164,7 +164,7 @@ module Alchemy
     private
 
     def form_field_counter
-      element.ingredient_definitions.index { _1.role == role }
+      id
     end
   end
 end

data/app/javascript/alchemy_admin/components/picture_thumbnail.js

@@ -44,7 +44,6 @@ export default class PictureThumbnail extends HTMLElement {
     if (alt) {
       this.image.alt = alt
     }
-    this.image.loading = "lazy"
   }
 
   start(src) {

data/app/models/alchemy/language/code.rb

@@ -13,6 +13,7 @@ module Alchemy::Language::Code
 
   module ClassMethods
     def find_by_code(code)
+      return unless code.respond_to?(:split)
       codes = code.split("-")
       codes << "" if codes.length == 1
       on_current_site.find_by(

data/app/services/alchemy/update_checks/alchemy_app.rb

@@ -40,7 +40,7 @@ module Alchemy
         connection.request(request)
       end
 
-      def uri = "https://www.alchemy-cms.com/update-check"
+      def uri = "https://app.alchemy-cms.com/update-check"
 
       def content_type = Marcel::EXTENSIONS["json"]
 

data/app/stylesheets/alchemy/admin/archive.scss

@@ -75,8 +75,8 @@ alchemy-uploader {
   }
 
   img {
-    max-width: 100%;
-    max-height: 100%;
+    max-width: var(--picture-width);
+    max-height: var(--picture-height);
 
     &:not([src*="alchemy/missing-image"]) {
       background: var(--thumbnail-background);

data/app/stylesheets/alchemy/admin/images.scss

@@ -1,11 +1,11 @@
 alchemy-picture-thumbnail {
   &[loading] {
-    img {
+    > img {
       opacity: 0;
     }
   }
 
-  img {
+  > img {
     opacity: 1;
     transition: opacity var(--transition-duration);
   }

data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb

@@ -22,7 +22,7 @@
           search_filter_params.merge(
             size: "small",
             form_field_id: @form_field_id
-          )
+          ).to_h
         ),
         class: "icon_button"
       ) %>
@@ -34,7 +34,7 @@
           search_filter_params.merge(
             size: "medium",
             form_field_id: @form_field_id
-          )
+          ).to_h
         ),
         class: "icon_button"
       ) %>
@@ -46,7 +46,7 @@
           search_filter_params.merge(
             size: "large",
             form_field_id: @form_field_id
-          )
+          ).to_h
         ),
         class: "icon_button"
       ) %>

data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb

@@ -10,7 +10,7 @@
         onclick: '$(self).attr("href", "#").off("click"); return false',
         method: 'put',
       ) do %>
-        <%= render Alchemy::Admin::PictureThumbnail.new(picture_to_assign) %>
+        <%= render Alchemy::Admin::PictureThumbnail.new(picture_to_assign, size: size) %>
       <% end %>
     </sl-tooltip>
   <% else %>

data/lib/alchemy/configuration.rb

@@ -68,6 +68,8 @@ module Alchemy
       ).to_h
     end
 
+    delegate :to_json, to: :to_h
+
     class << self
       def defined_configurations = []
 

data/lib/alchemy/controller_actions.rb

@@ -80,7 +80,8 @@ module Alchemy
 
     def load_alchemy_language_from_id_or_code(id_or_code)
       Language.find_by(id: id_or_code) ||
-        Language.find_by_code(id_or_code)
+        Language.find_by_code(id_or_code) ||
+        Language.default
     end
 
     # Stores language in +Current.language+

data/lib/alchemy/tasks/tidy.rb

@@ -63,13 +63,12 @@ module Alchemy
 
       def remove_duplicate_legacy_urls
         puts "\n## Removing duplicate legacy URLs"
-        sql = <<~SQL
-          DELETE FROM alchemy_legacy_page_urls A USING alchemy_legacy_page_urls B
-          WHERE A.page_id = B.page_id
-            AND A.urlname = B.urlname
-            AND A.id < B.id
-        SQL
-        count = ActiveRecord::Base.connection.exec_delete(sql)
+        keep_ids = Alchemy::LegacyPageUrl
+          .select("MAX(id)")
+          .group(:page_id, :urlname)
+        count = Alchemy::LegacyPageUrl
+          .where.not(id: keep_ids)
+          .delete_all
         log "Deleted #{count} duplicate legacy URLs"
       end
 

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "8.1.8"
+  VERSION = "8.1.10"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.1.8
+  version: 8.1.10
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -646,6 +646,8 @@ files:
 - app/assets/builds/alchemy/admin.css
 - app/assets/builds/alchemy/admin/page-select.css
 - app/assets/builds/alchemy/admin/print.css
+- app/assets/builds/alchemy/alchemy_admin.min.js
+- app/assets/builds/alchemy/alchemy_admin.min.js.map
 - app/assets/builds/alchemy/dark-theme.css
 - app/assets/builds/alchemy/light-theme.css
 - app/assets/builds/alchemy/preview.min.js