Merge pull request #5227 from google/enhancement/5047-remove-ud-ff

Remove unifiedDashboard feature flag.
google · Jun 6, 2022 · 75735ed · 75735ed
2 parents 1fdff53 + 34c7c53
commit 75735ed
Show file tree

Hide file tree

Showing 118 changed files with 357 additions and 7,227 deletions.
diff --git a/.storybook/storybook-data.js b/.storybook/storybook-data.js
@@ -80,69 +80,6 @@ module.exports = [
 			},
 		},
 	},
-	{
-		id: 'analytics-module-components-module-page-overview-widget--loaded',
-		kind: 'Analytics Module',
-		name: 'Overview Widget',
-		story: 'Loaded',
-		parameters: {
-			fileName: './stories/module-analytics-components.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				readySelector:
-					'.googlesitekit-chart .googlesitekit-chart__inner',
-			},
-		},
-	},
-	{
-		id:
-			'analytics-module-components-module-page-overview-widget--zero-data',
-		kind: 'Analytics Module',
-		name: 'Overview Widget with zero data',
-		story: 'Zero Data',
-		parameters: {
-			fileName: './stories/module-analytics-components.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				readySelector:
-					'.googlesitekit-chart .googlesitekit-chart__inner',
-			},
-		},
-	},
-	{
-		id:
-			'search-console-module-components-module-page-overview-widget--loaded',
-		kind: 'Search Console Module',
-		name: 'Overview Widget',
-		story: 'Loaded',
-		parameters: {
-			fileName: './stories/module-search-console-components.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				readySelector:
-					'.googlesitekit-chart .googlesitekit-chart__inner',
-			},
-		},
-	},
-	{
-		id:
-			'search-console-module-components-module-page-overview-widget--zero-data',
-		kind: 'Search Console Module',
-		name: 'Overview Widget with zero data',
-		story: 'Zero Data',
-		parameters: {
-			fileName: './stories/module-search-console-components.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				readySelector:
-					'.googlesitekit-chart .googlesitekit-chart__inner',
-			},
-		},
-	},
 	{
 		id: 'global-notifications--module-setup-complete',
 		kind: 'Global/Notifications',

diff --git a/assets/js/components/DashboardEntryPoint.js b/assets/js/components/DashboardEntryPoint.js
@@ -21,37 +21,18 @@
  */
 import PropTypes from 'prop-types';
 
-/**
- * WordPress dependencies
- */
-import { Fragment } from '@wordpress/element';
-
 /**
  * Internal dependencies
  */
-import { useFeature } from '../hooks/useFeature';
 import ModuleSetup from './setup/ModuleSetup';
-import DashboardApp from './dashboard/DashboardApp';
 import DashboardMainApp from './DashboardMainApp';
-import NotificationCounter from './legacy-notifications/notification-counter';
 
 export default function DashboardEntryPoint( { setupModuleSlug } ) {
-	const unifiedDashboardEnabled = useFeature( 'unifiedDashboard' );
-
 	if ( !! setupModuleSlug ) {
 		return <ModuleSetup moduleSlug={ setupModuleSlug } />;
 	}
 
-	if ( unifiedDashboardEnabled ) {
-		return <DashboardMainApp />;
-	}
-
-	return (
-		<Fragment>
-			<NotificationCounter />
-			<DashboardApp />
-		</Fragment>
-	);
+	return <DashboardMainApp />;
 }
 
 DashboardEntryPoint.propTypes = {

diff --git a/assets/js/components/DashboardEntryPoint.test.js b/assets/js/components/DashboardEntryPoint.test.js
@@ -24,9 +24,6 @@ import { mockCreateComponent } from '../../../tests/js/mock-component-utils';
 import DashboardEntryPoint from './DashboardEntryPoint';
 
 jest.mock( './setup/ModuleSetup', () => mockCreateComponent( 'ModuleSetup' ) );
-jest.mock( './dashboard/DashboardApp', () =>
-	mockCreateComponent( 'DashboardApp' )
-);
 jest.mock( './DashboardMainApp', () =>
 	mockCreateComponent( 'DashboardMainApp' )
 );
@@ -35,30 +32,12 @@ jest.mock( './legacy-notifications/notification-counter', () =>
 );
 
 describe( 'DashboardEntryPoint', () => {
-	const unifiedDashboardRenderOptions = { features: [ 'unifiedDashboard' ] };
-
-	it( 'should render the unified dashboard when unified dashboard is enabled', () => {
-		const { container } = render(
-			<DashboardEntryPoint />,
-			unifiedDashboardRenderOptions
-		);
-		expect( container ).toMatchSnapshot();
-	} );
-
-	it( 'should render the module setup component when unified dashboard is enabled and passed the setupModuleSlug prop', () => {
-		const { container } = render(
-			<DashboardEntryPoint setupModuleSlug="analytics" />,
-			unifiedDashboardRenderOptions
-		);
-		expect( container ).toMatchSnapshot();
-	} );
-
-	it( 'should render the non-unified dashboard when unified dashboard is not enabled', () => {
+	it( 'should render the unified dashboard', () => {
 		const { container } = render( <DashboardEntryPoint /> );
 		expect( container ).toMatchSnapshot();
 	} );
 
-	it( 'should render the module setup component when unified dashboard is not enabled and passed the setupModuleSlug prop', () => {
+	it( 'should render the module setup component when the setupModuleSlug prop is passed', () => {
 		const { container } = render(
 			<DashboardEntryPoint setupModuleSlug="analytics" />
 		);

diff --git a/assets/js/components/DateRangeSelector.js b/assets/js/components/DateRangeSelector.js
@@ -40,14 +40,11 @@ import { getAvailableDateRanges } from '../util/date-range';
 import Menu from './Menu';
 import Button from './Button';
 import { trackEvent } from '../util';
-import { useFeature } from '../hooks/useFeature';
 import { CORE_UI } from '../googlesitekit/datastore/ui/constants';
 import useViewContext from '../hooks/useViewContext';
 const { useSelect, useDispatch } = Data;
 
 export default function DateRangeSelector() {
-	const unifiedDashboardEnabled = useFeature( 'unifiedDashboard' );
-
 	const ranges = getAvailableDateRanges();
 	const dateRange = useSelect( ( select ) =>
 		select( CORE_USER ).getDateRange()
@@ -102,10 +99,7 @@ export default function DateRangeSelector() {
 					'googlesitekit-header__dropdown',
 					'googlesitekit-header__date-range-selector-menu',
 					'googlesitekit-border-radius-round--phone',
-					'googlesitekit-button-icon--phone',
-					{
-						'googlesitekit-header__date-range-selector-menu--has-unified-dashboard': unifiedDashboardEnabled,
-					}
+					'googlesitekit-button-icon--phone'
 				) }
 				text
 				onClick={ handleMenu }

diff --git a/assets/js/components/Header.js b/assets/js/components/Header.js
@@ -47,7 +47,6 @@ import useDashboardType from '../hooks/useDashboardType';
 const { useSelect } = Data;
 
 const Header = ( { children, subHeader, showNavigation } ) => {
-	const unifiedDashboardEnabled = useFeature( 'unifiedDashboard' );
 	const dashboardSharingEnabled = useFeature( 'dashboardSharing' );
 	const isDashboard = !! useDashboardType();
 	const isViewOnly = useViewOnly();
@@ -65,7 +64,7 @@ const Header = ( { children, subHeader, showNavigation } ) => {
 			<header
 				className={ classnames( 'googlesitekit-header', {
 					'googlesitekit-header--has-subheader': hasSubheader,
-					'googlesitekit-header--has-unified-dashboard': unifiedDashboardEnabled,
+					'googlesitekit-header--has-navigation': showNavigation,
 				} ) }
 			>
 				<Grid>
@@ -106,7 +105,7 @@ const Header = ( { children, subHeader, showNavigation } ) => {
 
 			{ showNavigation && <DashboardNavigation /> }
 
-			{ unifiedDashboardEnabled && <EntityHeader /> }
+			<EntityHeader />
 
 			<ErrorNotifications />
 

diff --git a/assets/js/components/PostSearcherAutoSuggest.js b/assets/js/components/PostSearcherAutoSuggest.js
@@ -41,7 +41,6 @@ import { END, ENTER, ESCAPE, HOME } from '@wordpress/keycodes';
 import API from 'googlesitekit-api';
 import Data from 'googlesitekit-data';
 import { useDebouncedState } from '../hooks/useDebouncedState';
-import { useFeature } from '../hooks/useFeature';
 import { CORE_SITE } from '../googlesitekit/datastore/site/constants';
 
 const { useSelect } = Data;
@@ -84,8 +83,6 @@ export default function PostSearcherAutoSuggest( {
 	const [ results, setResults ] = useState( [] );
 	const noResultsMessage = __( 'No results found', 'google-site-kit' );
 
-	const unifiedDashboardEnabled = useFeature( 'unifiedDashboard' );
-
 	const currentEntityTitle = useSelect( ( select ) =>
 		select( CORE_SITE ).getCurrentEntityTitle()
 	);
@@ -226,10 +223,6 @@ export default function PostSearcherAutoSuggest( {
 					break;
 			}
 
-			if ( ! unifiedDashboardEnabled ) {
-				return;
-			}
-
 			switch ( e.keyCode ) {
 				case ESCAPE:
 					return onClose();
@@ -239,7 +232,7 @@ export default function PostSearcherAutoSuggest( {
 					break;
 			}
 		},
-		[ onClose, onSelectCallback, searchTerm, unifiedDashboardEnabled ]
+		[ onClose, onSelectCallback, searchTerm ]
 	);
 
 	return (
@@ -262,7 +255,7 @@ export default function PostSearcherAutoSuggest( {
 				autoFocus={ autoFocus }
 			/>
 
-			{ ( ! unifiedDashboardEnabled || ! isLoading ) &&
+			{ ! isLoading &&
 				showDropdown &&
 				debouncedValue !== currentEntityTitle &&
 				debouncedValue !== '' &&

diff --git a/assets/js/components/UserMenu.js b/assets/js/components/UserMenu.js
@@ -19,7 +19,6 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
 import { useClickAway } from 'react-use';
 
 /**
@@ -44,7 +43,6 @@ import Dialog from './Dialog';
 import Button from './Button';
 import Menu from './Menu';
 import Portal from './Portal';
-import { useFeature } from '../hooks/useFeature';
 import { CORE_SITE } from '../googlesitekit/datastore/site/constants';
 import { CORE_USER } from '../googlesitekit/datastore/user/constants';
 import { CORE_LOCATION } from '../googlesitekit/datastore/location/constants';
@@ -53,7 +51,6 @@ import useViewContext from '../hooks/useViewContext';
 const { useSelect, useDispatch } = Data;
 
 export default function UserMenu() {
-	const unifiedDashboardEnabled = useFeature( 'unifiedDashboard' );
 	const proxyPermissionsURL = useSelect( ( select ) =>
 		select( CORE_SITE ).getProxyPermissionsURL()
 	);
@@ -152,7 +149,7 @@ export default function UserMenu() {
 		navigateTo( postDisconnectURL );
 	}, [ postDisconnectURL, navigateTo, viewContext ] );
 
-	if ( ! unifiedDashboardEnabled && ! userEmail ) {
+	if ( ! userEmail ) {
 		return null;
 	}
 
@@ -163,25 +160,13 @@ export default function UserMenu() {
 				className="googlesitekit-user-selector googlesitekit-dropdown-menu googlesitekit-dropdown-menu__icon-menu mdc-menu-surface--anchor"
 			>
 				<Button
-					className={ classnames(
-						'googlesitekit-header__dropdown',
-						'mdc-button--dropdown',
-						// Adds circle background to the non-unified dashboard tablet + mobile view
-						'googlesitekit-border-radius-round--tablet',
-						'googlesitekit-border-radius-round--phone',
-						{
-							'googlesitekit-border-radius-round': unifiedDashboardEnabled,
-							'googlesitekit-button-icon': unifiedDashboardEnabled,
-						}
-					) }
+					className="googlesitekit-header__dropdown mdc-button--dropdown googlesitekit-border-radius-round--tablet googlesitekit-border-radius-round--phone googlesitekit-border-radius-round googlesitekit-button-icon"
 					text
 					onClick={ handleMenu }
 					icon={
 						!! userPicture && (
 							<i
-								className={ classnames( 'mdc-button__icon', {
-									'mdc-button__account': unifiedDashboardEnabled,
-								} ) }
+								className="mdc-button__icon mdc-button__account"
 								aria-hidden="true"
 							>
 								<img
@@ -200,9 +185,8 @@ export default function UserMenu() {
 					aria-controls="user-menu"
 					aria-label={ __( 'Account', 'google-site-kit' ) }
 					tooltip
-				>
-					{ unifiedDashboardEnabled ? undefined : userEmail }
-				</Button>
+				/>
+
 				<Menu
 					className="googlesitekit-width-auto"
 					menuOpen={ menuOpen }

diff --git a/assets/js/components/UserMenu.test.js b/assets/js/components/UserMenu.test.js
@@ -70,7 +70,7 @@ describe( 'UserMenu', () => {
 			container = render( <UserMenu />, { registry } ).container;
 			fireEvent.click(
 				container.querySelector(
-					'.googlesitekit-header__dropdown span'
+					'.googlesitekit-user-selector .googlesitekit-header__dropdown'
 				)
 			);
 			menu = container.querySelector( '#user-menu' );

diff --git a/assets/js/components/__snapshots__/DashboardEntryPoint.test.js.snap b/assets/js/components/__snapshots__/DashboardEntryPoint.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DashboardEntryPoint should render the module setup component when unified dashboard is enabled and passed the setupModuleSlug prop 1`] = `
+exports[`DashboardEntryPoint should render the module setup component when the setupModuleSlug prop is passed 1`] = `
 <div>
   <div>
     ModuleSetup
@@ -9,29 +9,7 @@ exports[`DashboardEntryPoint should render the module setup component when unifi
 </div>
 `;
 
-exports[`DashboardEntryPoint should render the module setup component when unified dashboard is not enabled and passed the setupModuleSlug prop 1`] = `
-<div>
-  <div>
-    ModuleSetup
-    {"moduleSlug":"analytics"}
-  </div>
-</div>
-`;
-
-exports[`DashboardEntryPoint should render the non-unified dashboard when unified dashboard is not enabled 1`] = `
-<div>
-  <div>
-    NotificationCounter
-    {}
-  </div>
-  <div>
-    DashboardApp
-    {}
-  </div>
-</div>
-`;
-
-exports[`DashboardEntryPoint should render the unified dashboard when unified dashboard is enabled 1`] = `
+exports[`DashboardEntryPoint should render the unified dashboard 1`] = `
 <div>
   <div>
     DashboardMainApp