From 667130beb8ce1390d4c12b435cf3ca18c6bb6738 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 4 May 2022 16:15:13 +0100
Subject: [PATCH] Issue #3278696 by Spokje: Rename Oliveros
 block.block.book_navigation.yml and block.block.primary_admin_actions.yml
 confirm standard

(cherry picked from commit d8b72b6a4df2aa6664d426611814dc559d1f405b)
---
 .../tests/src/Functional/PageCacheTagsIntegrationTest.php     | 4 ++--
 ...navigation.yml => block.block.olivero_book_navigation.yml} | 2 +-
 ...ions.yml => block.block.olivero_primary_admin_actions.yml} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename core/themes/olivero/config/optional/{block.block.book_navigation.yml => block.block.olivero_book_navigation.yml} (91%)
 rename core/themes/olivero/config/optional/{block.block.primary_admin_actions.yml => block.block.olivero_primary_admin_actions.yml} (89%)

diff --git a/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
index 96acf10a546..e6453c032b4 100644
--- a/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
@@ -106,7 +106,7 @@ class PageCacheTagsIntegrationTest extends BrowserTestBase {
       'config:block.block.olivero_primary_local_tasks',
       'config:block.block.olivero_secondary_local_tasks',
       'config:block.block.olivero_syndicate',
-      'config:block.block.primary_admin_actions',
+      'config:block.block.olivero_primary_admin_actions',
       'config:block.block.olivero_page_title',
       'node_view',
       'node:' . $node_1->id(),
@@ -145,7 +145,7 @@ class PageCacheTagsIntegrationTest extends BrowserTestBase {
       'config:block.block.olivero_primary_local_tasks',
       'config:block.block.olivero_secondary_local_tasks',
       'config:block.block.olivero_syndicate',
-      'config:block.block.primary_admin_actions',
+      'config:block.block.olivero_primary_admin_actions',
       'config:block.block.olivero_page_title',
       'node_view',
       'node:' . $node_2->id(),
diff --git a/core/themes/olivero/config/optional/block.block.book_navigation.yml b/core/themes/olivero/config/optional/block.block.olivero_book_navigation.yml
similarity index 91%
rename from core/themes/olivero/config/optional/block.block.book_navigation.yml
rename to core/themes/olivero/config/optional/block.block.olivero_book_navigation.yml
index bc67ab71df6..efb06a89237 100644
--- a/core/themes/olivero/config/optional/block.block.book_navigation.yml
+++ b/core/themes/olivero/config/optional/block.block.olivero_book_navigation.yml
@@ -5,7 +5,7 @@ dependencies:
     - book
   theme:
     - olivero
-id: book_navigation
+id: olivero_book_navigation
 theme: olivero
 region: sidebar
 weight: 0
diff --git a/core/themes/olivero/config/optional/block.block.primary_admin_actions.yml b/core/themes/olivero/config/optional/block.block.olivero_primary_admin_actions.yml
similarity index 89%
rename from core/themes/olivero/config/optional/block.block.primary_admin_actions.yml
rename to core/themes/olivero/config/optional/block.block.olivero_primary_admin_actions.yml
index 5c767596150..9daef689bf9 100644
--- a/core/themes/olivero/config/optional/block.block.primary_admin_actions.yml
+++ b/core/themes/olivero/config/optional/block.block.olivero_primary_admin_actions.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   theme:
     - olivero
-id: primary_admin_actions
+id: olivero_primary_admin_actions
 theme: olivero
 region: highlighted
 weight: -5