Merge pull request #3720 from AlchemyCMS/fix-page-cache-flushing

fix(Page Cache Flushing): Only touch public page versions

Author: tvdeyen

app/controllers/alchemy/admin/pages_controller.rb

@@ -222,8 +222,7 @@ def copy_language_tree
       end
 
       def flush
-        @current_language.pages.touch_all
-        PageVersion.where(page_id: @current_language.pages.select(:id)).touch_all
+        PageVersion.where(page_id: @current_language.pages.select(:id)).published.touch_all
         respond_to { |format| format.turbo_stream }
       end
 

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>

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"

spec/requests/alchemy/admin/pages_controller_spec.rb

@@ -125,29 +125,42 @@ module Alchemy
         let(:content_pages) { [content_page_1, content_page_2] }
         let(:layout_pages) { [layout_page_1, layout_page_2] }
 
-        it "should update the updated_at field of content pages" do
-          content_pages
+        it "should not update the updated_at field of pages" do
+          pages = content_pages + layout_pages
 
           travel_to(Time.current) do
-            post flush_admin_pages_path, xhr: true
-            # Reloading because updated_at was directly updated in the database.
-            content_pages.map(&:reload)
-            content_pages.each do |page|
-              expect(page.updated_at).to eq(Time.current)
-            end
+            expect {
+              post flush_admin_pages_path, xhr: true
+            }.to_not change {
+              # Reloading because updated_at was directly updated in the database.
+              pages.map { _1.reload.updated_at }
+            }
           end
         end
 
-        it "should update the updated_at field of layout pages" do
-          layout_pages
+        it "should update the updated_at field of public versions" do
+          page_versions = content_pages.map(&:public_version)
 
           travel_to(Time.current) do
-            post flush_admin_pages_path, xhr: true
-            # Reloading because updated_at was directly updated in the database.
-            layout_pages.map(&:reload)
-            layout_pages.each do |page|
-              expect(page.updated_at).to eq(Time.current)
-            end
+            expect {
+              post flush_admin_pages_path, xhr: true
+            }.to change {
+              # Reloading because updated_at was directly updated in the database.
+              page_versions.map { _1.reload.updated_at }
+            }
+          end
+        end
+
+        it "should not update the updated_at field of draft versions" do
+          page_versions = content_pages.map(&:draft_version)
+
+          travel_to(Time.current) do
+            expect {
+              post flush_admin_pages_path, xhr: true
+            }.to_not change {
+              # Reloading because updated_at was directly updated in the database.
+              page_versions.map { _1.reload.updated_at }
+            }
           end
         end
       end