Merge pull request #3719 from AlchemyCMS/backport/8.0-stable/pr-3712

[8.0-stable] Fix page cache flush not invalidating ETags

Author: tvdeyen

app/controllers/alchemy/admin/pages_controller.rb

@@ -217,11 +217,8 @@ def copy_language_tree
       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)
+        @current_language.pages.touch_all
+        PageVersion.where(page_id: @current_language.pages.select(:id)).touch_all
         respond_to { |format| format.js }
       end
 

app/models/alchemy/page/page_scopes.rb

@@ -78,18 +78,6 @@ module PageScopes
         #
         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 }

spec/requests/alchemy/admin/pages_controller_spec.rb

@@ -227,28 +227,28 @@ module Alchemy
         let(:content_pages) { [content_page_1, content_page_2] }
         let(:layout_pages) { [layout_page_1, layout_page_2] }
 
-        it "should update the published_at field of content pages" do
+        it "should update the updated_at field of content pages" do
           content_pages
 
           travel_to(Time.current) do
             post flush_admin_pages_path, xhr: true
-            # Reloading because published_at was directly updated in the database.
+            # Reloading because updated_at was directly updated in the database.
             content_pages.map(&:reload)
             content_pages.each do |page|
-              expect(page.published_at).to eq(Time.current)
+              expect(page.updated_at).to eq(Time.current)
             end
           end
         end
 
-        it "should update the published_at field of layout pages" do
+        it "should update the updated_at field of layout pages" do
           layout_pages
 
           travel_to(Time.current) do
             post flush_admin_pages_path, xhr: true
-            # Reloading because published_at was directly updated in the database.
+            # Reloading because updated_at was directly updated in the database.
             layout_pages.map(&:reload)
             layout_pages.each do |page|
-              expect(page.published_at).to eq(Time.current)
+              expect(page.updated_at).to eq(Time.current)
             end
           end
         end