Global styles revisions: reduce visibility check from 2 to 1 revision (…

…#53281) * Now that #52965 has merged, we can show the revisions panel when there are more than 0 revisions since there is the default with which we can compare the single revision * Update E2E test to reflect the changes in this PR
WordPress · Aug 3, 2023 · f040080 · f040080
1 parent e70d419
commit f040080
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/packages/edit-site/src/components/global-styles/ui.js b/packages/edit-site/src/components/global-styles/ui.js
@@ -139,7 +139,7 @@ function GlobalStylesRevisionsMenu() {
 		goTo( '/revisions' );
 		setEditorCanvasContainerView( 'global-styles-revisions' );
 	};
-	const hasRevisions = revisionsCount >= 1;
+	const hasRevisions = revisionsCount > 0;
 
 	return (
 		<GlobalStylesMenuFill>

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
@@ -222,7 +222,7 @@ export default function SidebarNavigationScreenGlobalStyles() {
 	}, [ openGlobalStyles, setEditorCanvasContainerView ] );
 
 	// If there are no revisions, do not render a footer.
-	const hasRevisions = revisionsCount >= 2;
+	const hasRevisions = revisionsCount > 0;
 	const modifiedDateTime = revisions?.[ 0 ]?.modified;
 	const shouldShowGlobalStylesFooter =
 		hasRevisions && ! isLoadingRevisions && modifiedDateTime;

diff --git a/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js b/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
@@ -26,7 +26,7 @@ test.describe( 'Global styles revisions', () => {
 		await admin.visitSiteEditor();
 	} );
 
-	test( 'should display revisions UI when there is more than 1 revision', async ( {
+	test( 'should display revisions UI when there is 1 revision', async ( {
 		page,
 		editor,
 		userGlobalStylesRevisions,
@@ -39,19 +39,6 @@ test.describe( 'Global styles revisions', () => {
 		// Change a style and save it.
 		await page.getByRole( 'button', { name: 'Colors styles' } ).click();
 
-		await page
-			.getByRole( 'button', { name: 'Color Background styles' } )
-			.click();
-		await page
-			.getByRole( 'button', { name: 'Color: Black' } )
-			.click( { force: true } );
-
-		await editor.saveSiteEditorEntities();
-
-		/*
-		 * Change a style and save it again.
-		 * We need more than 2 revisions to show the UI.
-		 */
 		await page
 			.getByRole( 'button', { name: 'Color Background styles' } )
 			.click();
@@ -70,7 +57,7 @@ test.describe( 'Global styles revisions', () => {
 
 		// There should be 2 revisions not including the reset to theme defaults button.
 		await expect( revisionButtons ).toHaveCount(
-			currentRevisions.length + 2
+			currentRevisions.length + 1
 		);
 	} );