alchemy_cms 7.1.0.pre.rc1 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52cea190db8dfb6571f62d93f72942df0c05afbf7b7988b952da56cbbba5dd91
-  data.tar.gz: efd336249755bc11de59ff751be0af224ab9861f902df7ddd4226a97208840b6
+  metadata.gz: 158a3b005d476cb225569f0efa198ee7d9a5da5d056ba2125470d7bd21d2b99e
+  data.tar.gz: 9a5d55fff7333965e9510cb45deab35a4db635f2e98fdde484cf450656fa64bc
 SHA512:
-  metadata.gz: 587dee2f8372e32252543bbf6dd86bad7ab69d1734c2f129b3b6c4d11519e32f476f8605d2675e3df8cde2a1485ec470383baab818ab236895d61e0f37f9b631
-  data.tar.gz: dfdaa30ab9f4429d75fdc1bf4930cce9e5b093f9a5e4ca2a3a090008e90c0747b8efb6c7dc40fecc0874fd788db9de82da3a6e071eeed2c65e297ca2a3c9b7a2
+  metadata.gz: 56860b5eaf6cf7915bc90d5d96ac0f9d9e62bab6291a4d6d56f7a5f8e41dd451568c9ace0646c69a64e4541bddeaf45d2378726079012259149ad335cc70e8d1
+  data.tar.gz: 2d0241d235446e3e9a5058abeb5bbb249e5809b7fdbd1266f851748260d2f877d01a16d338af4f3c974699a2bf03f390e06e1b6d78fe0d2c61047fe1606035c4

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 7.1.1 (2024-01-31)
+
+- Translate collapse all elements button [#2711](https://github.com/AlchemyCMS/alchemy_cms/pull/2711) ([tvdeyen](https://github.com/tvdeyen))
+- Slighty raise page properties dialog width [#2710](https://github.com/AlchemyCMS/alchemy_cms/pull/2710) ([tvdeyen](https://github.com/tvdeyen))
+- [js] Update @shoelace-style/shoelace 2.12.0 → 2.13.1 (minor) [#2709](https://github.com/AlchemyCMS/alchemy_cms/pull/2709) ([depfu](https://github.com/apps/depfu))
+
+## 7.1.0 (2024-01-25)
+
+- Revert "Set admin picture thumbnail quality to 90" [#2706](https://github.com/AlchemyCMS/alchemy_cms/pull/2706) ([tvdeyen](https://github.com/tvdeyen))
+- [js] Update all development Yarn dependencies (2024-01-25) [#2705](https://github.com/AlchemyCMS/alchemy_cms/pull/2705) ([depfu](https://github.com/apps/depfu))
+- 7.1 Fix UI glitches [#2704](https://github.com/AlchemyCMS/alchemy_cms/pull/2704) ([tvdeyen](https://github.com/tvdeyen))
+- [7.1] Revert WebP thumbnails [#2703](https://github.com/AlchemyCMS/alchemy_cms/pull/2703) ([tvdeyen](https://github.com/tvdeyen))
+- TinyMCE: Trim spaces from pasted links [#2702](https://github.com/AlchemyCMS/alchemy_cms/pull/2702) ([mamhoff](https://github.com/mamhoff))
+- [js] Update sortablejs 1.15.1 → 1.15.2 (patch) [#2698](https://github.com/AlchemyCMS/alchemy_cms/pull/2698) ([depfu](https://github.com/apps/depfu))
+- [js] Update @rails/ujs 7.1.2 → 7.1.3 (patch) [#2697](https://github.com/AlchemyCMS/alchemy_cms/pull/2697) ([depfu](https://github.com/apps/depfu))
+- Set admin picture thumbnail quality to 90 [#2692](https://github.com/AlchemyCMS/alchemy_cms/pull/2692) ([tvdeyen](https://github.com/tvdeyen))
+- Set Tinymce editor form min-height [#2691](https://github.com/AlchemyCMS/alchemy_cms/pull/2691) ([tvdeyen](https://github.com/tvdeyen))
+- Link tinymce icons [#2690](https://github.com/AlchemyCMS/alchemy_cms/pull/2690) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.1.0-rc1 (2024-01-15)
 
 - Use title attribute for link_to_dialog and delete_button tooltip [#2688](https://github.com/AlchemyCMS/alchemy_cms/pull/2688) ([tvdeyen](https://github.com/tvdeyen))

data/app/assets/config/alchemy_manifest.js

@@ -5,6 +5,7 @@
 //= link alchemy/print.css
 //= link alchemy/welcome.css
 //= link tinymce/plugins/alchemy_link/plugin.min.js
+//= link tinymce/icons/remixicons/icons.js
 //= link_directory ../stylesheets/tinymce/skins/ui/alchemy/ .css
 //= link_directory ../stylesheets/tinymce/skins/content/alchemy/ .css
 //= link_tree ../images/alchemy/

data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee

@@ -60,7 +60,7 @@ Alchemy.ElementsWindow =
   createToolbar: (buttons) ->
     @toolbar = $('<div class="elements-window-toolbar" />')
     buttons.push
-      label: "Collapse all elements"
+      label: Alchemy.t("Collapse all elements")
       iconClass: "contract-up-down-line"
       align: "end"
       class: "right"

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -129,10 +129,11 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
   # Sets the link either in TinyMCE or on an Ingredient.
   setLink: (url, title, target) ->
+    trimmedUrl = url.trim()
     if @link_object.editor
-      @setTinyMCELink(url, title, target)
+      @setTinyMCELink(trimmedUrl, title, target)
     else
-      @link_object.setLink(url, title, target, @link_type)
+      @link_object.setLink(trimmedUrl, title, target, @link_type)
     return
 
   # Sets a link in TinyMCE editor.

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

@@ -121,6 +121,7 @@ export class ElementEditor extends HTMLElement {
     this.setClean()
     // Reset errors that might be visible from last save attempt
     this.errorsDisplay.innerHTML = ""
+    this.elementErrors.classList.add("hidden")
     this.body
       .querySelectorAll(".ingredient-editor")
       .forEach((el) => el.classList.remove("validation_failed"))

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

@@ -100,12 +100,19 @@ class Tinymce extends AlchemyHTMLElement {
       }
     })
 
-    return {
+    const config = {
       ...Alchemy.TinymceDefaults,
       ...customConfig,
       language: currentLocale(),
       selector: `#${this.editorId}`
     }
+
+    // Tinymce has a height of 400px by default
+    // if the element has a min_height set, we use this value for the height as well
+    // so we do not need to set both values in the element configuration
+    config.height = config.min_height
+
+    return config
   }
 
   get editorId() {

data/app/javascript/alchemy_admin/components/uploader/progress.js

@@ -27,7 +27,6 @@ export class Progress extends AlchemyHTMLElement {
     this.actionButton.addEventListener("click", () => {
       if (this.finished) {
         this.onComplete(this.status)
-        this.visible = false
       } else {
         this.cancel()
       }
@@ -126,6 +125,7 @@ export class Progress extends AlchemyHTMLElement {
    */
   _updateView() {
     const status = this.status
+    this.className = status
 
     // update progress bar
     this.progressElement.value = this.totalProgress
@@ -143,10 +143,9 @@ export class Progress extends AlchemyHTMLElement {
     if (this.finished) {
       this._setupCloseButton()
       this.onComplete(status)
+    } else {
+      this.visible = true
     }
-
-    this.className = status
-    this.visible = true
   }
 
   /**

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

@@ -112,9 +112,6 @@ export class Uploader extends AlchemyHTMLElement {
     }
     this.uploadProgress = new Progress(fileUploads)
     this.uploadProgress.onComplete = (status) => {
-      if (status === "successful" || status === "canceled") {
-        this.uploadProgress.visible = false
-      }
       this.dispatchCustomEvent(`upload.${status}`)
     }
 

data/app/models/alchemy/picture.rb

@@ -192,6 +192,21 @@ module Alchemy
       nil
     end
 
+    # Returns an url for the thumbnail representation of the picture
+    #
+    # @param [String] size - The size of the thumbnail
+    #
+    # @return [String]
+    def thumbnail_url(size: "160x120")
+      return if image_file.nil?
+
+      url(
+        flatten: true,
+        format: image_file_format || "jpg",
+        size: size
+      )
+    end
+
     # Updates name and tag_list attributes.
     #
     # Used by +Admin::PicturesController#update_multiple+

data/app/models/concerns/alchemy/picture_thumbnails.rb

@@ -84,7 +84,7 @@ module Alchemy
         crop_from: crop && crop_from.presence || default_crop_from&.join("x"),
         crop_size: crop && crop_size.presence || default_crop_size&.join("x"),
         flatten: true,
-        format: "webp"
+        format: picture&.image_file_format || "jpg"
       }
     end
 

data/app/views/alchemy/admin/crop.html.erb

@@ -8,7 +8,7 @@
     <%= simple_format Alchemy.t(:explain_cropping) %>
   <% end %>
   <div class="thumbnail_background">
-    <%= image_tag @picture.url(size: '800x600', flatten: true, format: "webp"), id: 'imageToCrop' %>
+    <%= image_tag @picture.thumbnail_url(size: '800x600'), id: 'imageToCrop' %>
   </div>
   <form>
     <%= button_tag Alchemy.t(:apply), type: 'submit' %>

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -19,7 +19,7 @@
           alchemy.edit_admin_layoutpage_path(layoutpage),
           {
             title: Alchemy.t(:edit_page_properties),
-            size: '410x170'
+            size: '450x170'
           },
           class: "icon_button"
         ) -%>

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

@@ -49,7 +49,7 @@
           alchemy.configure_admin_page_path(id: "__ID__"),
           {
             title: Alchemy.t(:edit_page_properties),
-            size: "450x680"
+            size: "500x680"
           },
           class: "icon_button"
         ) -%>

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

@@ -1,8 +1,8 @@
 <span class="page_status">
   <% if page.public? %>
-    <%= render_icon(:cloud, size: "1x", class: "disabled") %>
+    <%= render_icon(:cloud, size: "1x") %>
   <% else %>
-    <%= render_icon("cloud-off", size: "1x") %>
+    <%= render_icon("cloud-off", size: "1x", class: "disabled") %>
   <% end %>
 </span>
 <span class="page_status">

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

@@ -38,7 +38,7 @@
           alchemy.edit_admin_layoutpage_path(@page),
           {
             title: Alchemy.t(:page_properties),
-            size: '450x170'
+            size: '500x170'
           },
           class: :icon_button,
           'data-alchemy-hotkey' => 'alt+e'
@@ -49,7 +49,7 @@
           alchemy.configure_admin_page_path(@page),
           {
             title: Alchemy.t(:page_properties),
-            size: '450x680'
+            size: '500x680'
           },
           class: :icon_button,
           'data-alchemy-hotkey' => 'alt+e'

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

@@ -20,7 +20,7 @@
     </sl-tooltip>
   </span>
   <% end %>
-  <% picture_url = picture.url(size: preview_size(@size), flatten: true, format: "webp") %>
+  <% picture_url = picture.thumbnail_url(size: preview_size(@size)) %>
   <% image = image_tag(picture_url || "alchemy/missing-image.svg", alt: picture.name) %>
   <% if can?(:edit, picture) && picture_url %>
     <%= link_to(

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

@@ -2,7 +2,7 @@
   <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
     <%= link_to(
       image_tag(
-        picture_to_assign.url(size: preview_size(size), flatten: true, format: "webp") || "alchemy/missing-image.svg",
+        picture_to_assign.thumbnail_url(size: preview_size(size)) || "alchemy/missing-image.svg",
         alt: picture_to_assign.name
       ),
       alchemy.assign_admin_picture_path(

data/app/views/alchemy/admin/uploader/_button.html.erb

@@ -17,9 +17,10 @@
 </alchemy-uploader>
 
 <script type='text/javascript'>
-  document.querySelector("alchemy-uploader").addEventListener("Alchemy.upload.successful", () => {
+  document.querySelector("alchemy-uploader").addEventListener("Alchemy.upload.successful", (evt) => {
     setTimeout(() => {
       var url = '<%= redirect_url.html_safe %>';
+      evt.target.uploadProgress.visible = false;
       <% if local_assigns[:in_dialog] %>
       $.get(url, null, null, 'script');
       <% else %>

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -203,8 +203,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
       allow(record).to receive(:settings) { settings }
     end
 
-    it "includes webp file format." do
-      expect(thumbnail_url).to match(/\.webp/)
+    it "includes the image's original file format." do
+      expect(thumbnail_url).to match(/\.png/)
     end
 
     it "flattens the image." do
@@ -305,8 +305,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
         create(:alchemy_picture)
       end
 
-      it "uses webp image format." do
-        expect(thumbnail_url_options[:format]).to eq("webp")
+      it "includes the image's original file format." do
+        expect(thumbnail_url_options[:format]).to eq("png")
       end
 
       it "flattens the image." do
@@ -381,7 +381,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
           crop_from: nil,
           crop_size: nil,
           flatten: true,
-          format: "webp",
+          format: "jpg",
           size: "160x120"
         )
       end
@@ -400,7 +400,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             crop_from: nil,
             crop_size: nil,
             flatten: true,
-            format: "webp",
+            format: "jpg",
             size: "160x120"
           )
         end

data/lib/alchemy/tinymce.rb

@@ -22,7 +22,6 @@ module Alchemy
       width: "auto",
       resize: true,
       min_height: 250,
-      height: 250,
       menubar: false,
       statusbar: true,
       toolbar: [

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.1.0-rc1"
+  VERSION = "7.1.1"
 
   def self.version
     VERSION

data/package.json

@@ -10,18 +10,18 @@
   "author": "Thomas von Deyen",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@rails/ujs": "^7.1.2",
-    "@shoelace-style/shoelace": "^2.12.0",
+    "@rails/ujs": "^7.1.3",
+    "@shoelace-style/shoelace": "^2.13.1",
     "@ungap/custom-elements": "^1.3.0",
     "clipboard": "^2.0.11",
     "flatpickr": "^4.6.13",
     "keymaster": "^1.6.2",
-    "sortablejs": "^1.15.1",
+    "sortablejs": "^1.15.2",
     "tinymce": "^6.8.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.11",
-    "@babel/preset-env": "^7.22.11",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.7",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
@@ -31,8 +31,8 @@
     "jest-environment-jsdom": "^29.6.4",
     "jquery": "^3.7.1",
     "jsdom-testing-mocks": "^1.11.0",
-    "prettier": "^3.0.0",
-    "rollup": "^4.9.3",
+    "prettier": "^3.2.4",
+    "rollup": "^4.9.5",
     "xhr-mock": "^2.5.1"
   },
   "jest": {