alchemy_cms 8.1.3 → 8.1.4

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

@@ -222,11 +222,7 @@ module Alchemy
       end
 
       def flush
-        @current_language.pages.flushables.update_all(published_at: Time.current)
-        # We need to ensure, that also all layoutpages get the +published_at+ timestamp set,
-        # but not set to public true, because the cache_key for an element is +published_at+
-        # and we don't want the layout pages to be present in +Page.published+ scope.
-        @current_language.pages.flushable_layoutpages.update_all(published_at: Time.current)
+        PageVersion.where(page_id: @current_language.pages.select(:id)).published.touch_all
         respond_to { |format| format.turbo_stream }
       end
 

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

@@ -29,9 +29,7 @@ export default class PictureThumbnail extends HTMLElement {
   }
 
   connectedCallback() {
-    if (this.image) {
-      this.replaceChildren(this.image)
-    }
+    this.#setImage()
   }
 
   disconnectedCallback() {
@@ -77,22 +75,31 @@ export default class PictureThumbnail extends HTMLElement {
 
   #onError(evt) {
     const message = `Could not load ${this.image.src}`
+    const hoist = this.closest(".ingredient-editor")
     this.spinner.stop()
     this.innerHTML = `
-      <sl-tooltip content="${message}">
+      <sl-tooltip content="${message}" ${hoist ? "hoist" : ""}>
         <alchemy-icon name="alert" class="error"></alchemy-icon>
       </sl-tooltip>
     `
     console.error(message, evt)
   }
 
+  #setImage() {
+    if (this.image?.complete) {
+      this.replaceChildren(this.image)
+    } else if (this.image) {
+      this.append(this.image)
+    }
+  }
+
   set loading(value) {
     value ? this.load() : this.stop()
   }
 
   set src(src) {
     this.start(src)
-    this.replaceChildren(this.image)
+    this.#setImage()
   }
 
   get name() {

data/app/models/alchemy/page/page_scopes.rb

@@ -78,18 +78,6 @@ module Alchemy
         #
         scope :contentpages, -> { where(layoutpage: [false, nil]) }
 
-        # Returns all public contentpages that are not locked.
-        #
-        # Used for flushing all pages caches at once.
-        #
-        scope :flushables, -> { not_locked.published.contentpages }
-
-        # Returns all layoutpages that are not locked.
-        #
-        # Used for flushing all pages caches at once.
-        #
-        scope :flushable_layoutpages, -> { not_locked.layoutpages }
-
         # All searchable pages
         #
         scope :searchables, -> { not_restricted.published.contentpages }

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

@@ -49,7 +49,7 @@ alchemy-uploader {
     text-decoration: none;
   }
 
-  alchemy-icon {
+  alchemy-icon:not(.error) {
     display: flex;
     width: var(--picture-width);
     height: var(--picture-height);

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

@@ -12,7 +12,7 @@ alchemy-icon {
   }
 
   &.error {
-    padding: 2rem;
+    padding: 0;
   }
 }
 

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

@@ -307,6 +307,12 @@ sl-tooltip {
     border-radius: var(--border-radius_medium);
     box-shadow: var(--tooltip-box-shadow);
   }
+
+  @media (pointer: coarse) {
+    &::part(base__popup) {
+      display: none;
+    }
+  }
 }
 
 sl-button {

data/app/views/alchemy/_menubar.html.erb

@@ -35,7 +35,8 @@
         }
 
         .menubar:hover,
-        .menubar:focus-within {
+        .menubar:focus-within,
+        .menubar.is-open {
           left: 0;
         }
 
@@ -121,9 +122,32 @@
         }
 
         connectedCallback() {
-          const bar = this.shadowRoot.querySelector(".menubar")
-          const width = bar.offsetWidth
-          bar.style = `--panel-width: ${width}px; --left-offset: calc(var(--icon-size) + 32px);`
+          const width = this.bar.offsetWidth
+          this.bar.style = `--panel-width: ${width}px; --left-offset: calc(var(--icon-size) + 32px);`
+          this.bar.addEventListener("touchstart", this, { passive: false })
+          document.addEventListener("touchstart", this, { passive: true })
+        }
+
+        handleEvent(event) {
+          // click on menubar
+          if (event.currentTarget === this.bar) {
+            if (!this.bar.classList.contains("is-open")) {
+              event.preventDefault()
+              this.bar.classList.add("is-open")
+            }
+          // click outside of menubar
+          } else if (!event.composedPath().includes(this.bar)) {
+            this.bar.classList.remove("is-open")
+          }
+        }
+
+        disconnectedCallback() {
+          this.bar.removeEventListener("touchstart", this)
+          document.removeEventListener("touchstart", this)
+        }
+
+        get bar() {
+          return this.shadowRoot.querySelector(".menubar")
         }
       }
 

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

@@ -21,8 +21,8 @@
         <%= button_to(
           render_icon(:eraser),
           alchemy.flush_admin_pages_path,
-          "turbo-method": :post,
-          class: "icon_button please_wait"
+          "data-turbo-confirm": Alchemy.t(:confirm_to_flush_cache),
+          class: "icon_button"
         ) %>
       </sl-tooltip>
     </div>

data/config/locales/alchemy.en.yml

@@ -399,6 +399,7 @@ en:
     confirm_to_delete_menu: "Do you really want to delete this menu?"
     confirm_to_delete_node: "Do you really want to delete this menu node?"
     confirm_to_delete_page: "Do you really want to delete this page?"
+    confirm_to_flush_cache: "Do you really want to flush the page cache? This will might take a while and can make first page requests slow."
     ingredient_validations_headline: "Please check marked fields below"
     copy: "copy"
     copy_element: "Copy this element"

data/lib/alchemy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.1.3
+  version: 8.1.4
 platform: ruby
 authors:
 - Thomas von Deyen