Merge pull request #3672 from AlchemyCMS/backport/8.1-stable/pr-3671

[8.1-stable] fix(page tree): Use edit link in top frame

Author: tvdeyen

app/assets/builds/alchemy/admin.css

@@ -52,7 +52,8 @@
             @page.name,
             url(:edit_page),
             title: t(:edit_page),
-            class: "sitemap_pagename_link"
+            class: "sitemap_pagename_link",
+            "data-turbo-frame": "_top"
           ) %>
         <% else %>
           <%= content_tag("span", @page.name, class: "sitemap_pagename_link") %>

app/components/alchemy/admin/page_node.html.erb

@@ -1,10 +1,10 @@
 #errorExplanation {
-  background: #ffdfdf;
+  background: var(--notice-error-background-color);
   padding: var(--spacing-2);
   text-align: left;
   margin-bottom: var(--spacing-2);
-  border: 1px solid #d08f91;
-  color: #690001;
+  border: 1px solid var(--notice-error-border-color);
+  color: var(--notice-error-text-color);
   border-radius: var(--border-radius_medium);
 
   h2 {
@@ -51,16 +51,24 @@ body.error {
 }
 
 .turbo-frame-error {
-  display: block;
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-2);
   padding: var(--spacing-2);
-  background-color: var(--color-yellow_medium);
-  border: 1px solid var(--color-yellow_dark);
+  background-color: var(--notice-warning-background-color);
+  border: 1px solid var(--notice-warning-border-color);
   border-radius: var(--border-radius_medium);
   margin: var(--spacing-2);
-  color: var(--color-yellow_dark);
+  color: var(--notice-warning-text-color);
 
   &:before {
-    content: "⚠️";
+    display: inline-block;
+    content: "";
+    mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='currentColor'%3E%3Cpath d='M12.8659 3.00017L22.3922 19.5002C22.6684 19.9785 22.5045 20.5901 22.0262 20.8662C21.8742 20.954 21.7017 21.0002 21.5262 21.0002H2.47363C1.92135 21.0002 1.47363 20.5525 1.47363 20.0002C1.47363 19.8246 1.51984 19.6522 1.60761 19.5002L11.1339 3.00017C11.41 2.52187 12.0216 2.358 12.4999 2.63414C12.6519 2.72191 12.7782 2.84815 12.8659 3.00017ZM4.20568 19.0002H19.7941L11.9999 5.50017L4.20568 19.0002ZM10.9999 16.0002H12.9999V18.0002H10.9999V16.0002ZM10.9999 9.00017H12.9999V14.0002H10.9999V9.00017Z'%3E%3C/path%3E%3C/svg%3E")
+      no-repeat center center;
+    background-color: var(--notice-warning-text-color);
     padding: var(--spacing-2);
+    width: var(--icon-size-md);
+    height: var(--icon-size-md);
   }
 }

app/stylesheets/alchemy/admin/errors.scss

@@ -39,6 +39,20 @@
         expect(page).to have_select("preview_url", options: ["Internal", "Foo Preview"])
       end
     end
+
+    context "in pages tree" do
+      let!(:a_page) { create(:alchemy_page) }
+
+      describe "clicking the page name" do
+        it "opens the page in edit mode", :js do
+          visit alchemy.admin_pages_path(view: "tree")
+          within ".sitemap_page[name='#{a_page.name}']" do
+            click_link a_page.name
+          end
+          expect(page).to have_current_path("/admin/pages/#{a_page.id}/edit")
+        end
+      end
+    end
   end
 
   context "as editor" do