From 9a225ac2f0ffabe5cf619d1907c3d592da41e502 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Thu, 29 Jul 2021 15:47:35 +0200 Subject: [PATCH 1/3] Fix `group: sidebar` conflicting with Bolt's sidebar --- templates/_base/layout.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/_base/layout.html.twig b/templates/_base/layout.html.twig index 563e482dd..fcde51705 100644 --- a/templates/_base/layout.html.twig +++ b/templates/_base/layout.html.twig @@ -75,7 +75,7 @@ 'action.view': 'action.view'|trans, }|json_encode %}
-
+
Date: Thu, 29 Jul 2021 16:05:09 +0200 Subject: [PATCH 2/3] Put back the sidebar with new selector --- assets/js/app/sidebar/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/app/sidebar/index.js b/assets/js/app/sidebar/index.js index 9d50ead37..757a8485e 100644 --- a/assets/js/app/sidebar/index.js +++ b/assets/js/app/sidebar/index.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import store from './store'; import Sidebar from './Components/Sidebar.vue'; -const id = 'sidebar'; +const id = 'bolt--sidebar'; if (document.getElementById(id)) { new Vue({ From d15000da943e0fec00dec510a541ca533c16eeab Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Thu, 29 Jul 2021 16:21:14 +0200 Subject: [PATCH 3/3] Rename tests looking for sidebar --- tests/e2e/record_listing.feature | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/e2e/record_listing.feature b/tests/e2e/record_listing.feature index 354bffa3f..d2d78be70 100644 --- a/tests/e2e/record_listing.feature +++ b/tests/e2e/record_listing.feature @@ -82,8 +82,8 @@ Feature: Record listing When I hover over the "Tests" element Then I should see 6 "li" in the 4th ".admin__sidebar--menu ul" - And I should see "New" in the "#sidebar ul li:nth-child(8) ul > li:nth-child(1) > a" element - And I should see "Title of the test" in the "#sidebar ul li:nth-child(8) ul > li:nth-child(2) > a" element + And I should see "New" in the "#bolt--sidebar ul li:nth-child(8) ul > li:nth-child(1) > a" element + And I should see "Title of the test" in the "#bolt--sidebar ul li:nth-child(8) ul > li:nth-child(2) > a" element @javascript Scenario: As an admin I want to see the settings menu items @@ -92,10 +92,10 @@ Feature: Record listing Then I should see "Configuration" in the ".admin__sidebar--menu" element When I hover over the "Configuration" element - Then I should see "Users & Permissions" in the "#sidebar ul > li:nth-child(10) li:nth-child(1)" element - Then I should see "Main Configuration" in the "#sidebar ul > li:nth-child(10) li:nth-child(2)" element - Then I should see "Content Types" in the "#sidebar ul > li:nth-child(10) li:nth-child(3)" element - Then I should see "Taxonomies" in the "#sidebar ul > li:nth-child(10) li:nth-child(4)" element - Then I should see "Menu set up" in the "#sidebar ul > li:nth-child(10) li:nth-child(5)" element - Then I should see "Routing Configuration" in the "#sidebar ul > li:nth-child(10) li:nth-child(6)" element - Then I should see "All Configuration Files" in the "#sidebar ul > li:nth-child(10) li:nth-child(7)" element + Then I should see "Users & Permissions" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(1)" element + Then I should see "Main Configuration" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(2)" element + Then I should see "Content Types" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(3)" element + Then I should see "Taxonomies" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(4)" element + Then I should see "Menu set up" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(5)" element + Then I should see "Routing Configuration" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(6)" element + Then I should see "All Configuration Files" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(7)" element