From e1005e3bb6dc2422779a59ef686f8169144bb519 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Tue, 6 Jul 2021 15:45:30 +0200
Subject: [PATCH] Improve cache key defaults for menus #2138

With the currently generated templates the way menus are
being displayed depends on the (current) page and whether
one is in preview mode or not.

Thus both facts should probably go in the cache key as well.
---
 lib/generators/alchemy/menus/templates/node.html.erb     | 2 +-
 lib/generators/alchemy/menus/templates/node.html.haml    | 2 +-
 lib/generators/alchemy/menus/templates/node.html.slim    | 2 +-
 lib/generators/alchemy/menus/templates/wrapper.html.erb  | 2 +-
 lib/generators/alchemy/menus/templates/wrapper.html.haml | 2 +-
 lib/generators/alchemy/menus/templates/wrapper.html.slim | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/generators/alchemy/menus/templates/node.html.erb b/lib/generators/alchemy/menus/templates/node.html.erb
index cd92392c61..5e5b0b84c8 100644
--- a/lib/generators/alchemy/menus/templates/node.html.erb
+++ b/lib/generators/alchemy/menus/templates/node.html.erb
@@ -1,4 +1,4 @@
-<%% cache node do %>
+<%% cache [node, @page, @preview_mode] do %>
   <%%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
     <%%= link_to_if node.url,
       node.name,
diff --git a/lib/generators/alchemy/menus/templates/node.html.haml b/lib/generators/alchemy/menus/templates/node.html.haml
index f186012dad..9cbe89d3cd 100644
--- a/lib/generators/alchemy/menus/templates/node.html.haml
+++ b/lib/generators/alchemy/menus/templates/node.html.haml
@@ -1,4 +1,4 @@
-- cache node do
+- cache [node, @page, @preview_mode] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,
diff --git a/lib/generators/alchemy/menus/templates/node.html.slim b/lib/generators/alchemy/menus/templates/node.html.slim
index b07bb2355f..cbd1862a2c 100644
--- a/lib/generators/alchemy/menus/templates/node.html.slim
+++ b/lib/generators/alchemy/menus/templates/node.html.slim
@@ -1,4 +1,4 @@
-- cache node do
+- cache [node, @page, @preview_mode] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,
diff --git a/lib/generators/alchemy/menus/templates/wrapper.html.erb b/lib/generators/alchemy/menus/templates/wrapper.html.erb
index 5d8767acba..5df6d76364 100644
--- a/lib/generators/alchemy/menus/templates/wrapper.html.erb
+++ b/lib/generators/alchemy/menus/templates/wrapper.html.erb
@@ -1,4 +1,4 @@
-<%% cache menu do %>
+<%% cache [menu, @page, @preview_mode] do %>
   <ul class="nav">
     <%%= render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),
diff --git a/lib/generators/alchemy/menus/templates/wrapper.html.haml b/lib/generators/alchemy/menus/templates/wrapper.html.haml
index b4f4533630..6c9268cf5d 100644
--- a/lib/generators/alchemy/menus/templates/wrapper.html.haml
+++ b/lib/generators/alchemy/menus/templates/wrapper.html.haml
@@ -1,4 +1,4 @@
-- cache menu do
+- cache [menu, @page, @preview_mode] do
   %ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),
diff --git a/lib/generators/alchemy/menus/templates/wrapper.html.slim b/lib/generators/alchemy/menus/templates/wrapper.html.slim
index 83845288ff..a9c34304e1 100644
--- a/lib/generators/alchemy/menus/templates/wrapper.html.slim
+++ b/lib/generators/alchemy/menus/templates/wrapper.html.slim
@@ -1,4 +1,4 @@
-- cache menu do
+- cache [menu, @page, @preview_mode] do
   ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),