Merge pull request #9015 from google/bug/5354-dashboard-sharing-block…

…ed-no-owner Bug/5354 dashboard sharing blocked no owner
google · Jul 26, 2024 · 0bb8fa2 · 0bb8fa2
2 parents 8883a8b + 6979a49
commit 0bb8fa2
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 21 deletions.
diff --git a/assets/js/components/dashboard-sharing/DashboardSharingSettings/Module.js b/assets/js/components/dashboard-sharing/DashboardSharingSettings/Module.js
@@ -53,6 +53,8 @@ import {
 	PERMISSION_DELEGATE_MODULE_SHARING_MANAGEMENT,
 	PERMISSION_MANAGE_MODULE_SHARING_OPTIONS,
 } from '../../../googlesitekit/datastore/user/constants';
+import WarningNotice from '../../WarningNotice';
+import Link from '../../Link';
 
 const viewAccessOptions = [
 	{
@@ -65,14 +67,25 @@ const viewAccessOptions = [
 	},
 ];
 
-export default function Module( { moduleSlug, moduleName, ownerUsername } ) {
+export default function Module( {
+	moduleSlug,
+	moduleName,
+	ownerUsername,
+	recoverable,
+} ) {
 	const viewContext = useViewContext();
 	const moduleRef = useRef();
 
 	const [ manageViewAccess, setManageViewAccess ] = useState( undefined );
+
+	const hasRecoverableModules = useSelect( ( select ) =>
+		select( CORE_MODULES ).hasRecoverableModules()
+	);
 	const hasMultipleAdmins = useSelect( ( select ) =>
 		select( CORE_SITE ).hasMultipleAdmins()
 	);
+	const showManageColumn = hasRecoverableModules || hasMultipleAdmins;
+
 	const management = useSelect(
 		( select ) =>
 			select( CORE_MODULES ).getSharingManagement( moduleSlug ) ?? 'owner'
@@ -99,6 +112,12 @@ export default function Module( { moduleSlug, moduleName, ownerUsername } ) {
 		select( CORE_MODULES ).isDoingSubmitSharingChanges()
 	);
 
+	const recoverableModuleSupportLink = useSelect( ( select ) =>
+		select( CORE_SITE ).getDocumentationLinkURL(
+			'dashboard-sharing-module-recovery'
+		)
+	);
+
 	const { setSharingManagement } = useDispatch( CORE_MODULES );
 
 	const sharedOwnershipModule =
@@ -180,7 +199,27 @@ export default function Module( { moduleSlug, moduleName, ownerUsername } ) {
 					/>
 				) }
 
-				{ ! hasSharingCapability && (
+				{ recoverable && (
+					<WarningNotice>
+						{ createInterpolateElement(
+							__(
+								'Managing user required to manage view access. <Link>Learn more</Link>',
+								'google-site-kit'
+							),
+							{
+								Link: (
+									<Link
+										href={ recoverableModuleSupportLink }
+										external
+										hideExternalIndicator
+									/>
+								),
+							}
+						) }
+					</WarningNotice>
+				) }
+
+				{ ! hasSharingCapability && ! recoverable && (
 					<p className="googlesitekit-dashboard-sharing-settings__note">
 						{ __(
 							'Contact managing user to manage view access',
@@ -190,7 +229,7 @@ export default function Module( { moduleSlug, moduleName, ownerUsername } ) {
 				) }
 			</div>
 
-			{ hasMultipleAdmins && (
+			{ showManageColumn && (
 				<div className="googlesitekit-dashboard-sharing-settings__column--manage">
 					{ sharedOwnershipModule && (
 						<p className="googlesitekit-dashboard-sharing-settings__note">

diff --git a/assets/js/components/dashboard-sharing/DashboardSharingSettings/index.js b/assets/js/components/dashboard-sharing/DashboardSharingSettings/index.js
@@ -39,10 +39,16 @@ import {
 } from '../../../googlesitekit/datastore/user/constants';
 
 export default function DashboardSharingSettings() {
+	const hasRecoverableModules = useSelect( ( select ) =>
+		select( CORE_MODULES ).hasRecoverableModules()
+	);
+
 	const hasMultipleAdmins = useSelect( ( select ) =>
 		select( CORE_SITE ).hasMultipleAdmins()
 	);
 
+	const showManageColumn = hasRecoverableModules || hasMultipleAdmins;
+
 	const sortedShareableModules = useSelect( ( select ) => {
 		const userID = select( CORE_USER ).getID();
 		const shareableModules = select( CORE_MODULES ).getShareableModules();
@@ -79,7 +85,7 @@ export default function DashboardSharingSettings() {
 				'googlesitekit-dashboard-sharing-settings',
 				{
 					'googlesitekit-dashboard-sharing-settings--has-multiple-admins':
-						hasMultipleAdmins,
+						showManageColumn,
 				}
 			) }
 		>
@@ -91,7 +97,7 @@ export default function DashboardSharingSettings() {
 					{ __( 'Who can view', 'google-site-kit' ) }
 				</div>
 
-				{ hasMultipleAdmins && (
+				{ showManageColumn && (
 					<div className="googlesitekit-dashboard-sharing-settings__column--manage">
 						{ __(
 							'Who can manage view access',
@@ -102,14 +108,17 @@ export default function DashboardSharingSettings() {
 			</header>
 
 			<div className="googlesitekit-dashboard-sharing-settings__main">
-				{ sortedShareableModules.map( ( { slug, name, owner } ) => (
-					<Module
-						key={ slug }
-						moduleSlug={ slug }
-						moduleName={ name }
-						ownerUsername={ owner?.login }
-					/>
-				) ) }
+				{ sortedShareableModules.map(
+					( { slug, name, owner, recoverable } ) => (
+						<Module
+							key={ slug }
+							moduleSlug={ slug }
+							moduleName={ name }
+							ownerUsername={ owner?.login }
+							recoverable={ recoverable }
+						/>
+					)
+				) }
 			</div>
 		</div>
 	);

diff --git a/assets/js/components/dashboard-sharing/DashboardSharingSettings/index.test.js b/assets/js/components/dashboard-sharing/DashboardSharingSettings/index.test.js
@@ -81,7 +81,7 @@ describe( 'DashboardSharingSettings', () => {
 			expect( container ).toHaveTextContent( 'Search Console' );
 		} );
 
-		it( 'should render the modules with user role select when the admin owns the modules', () => {
+		it( 'should render the modules with user role select when the admin owns the modules', async () => {
 			act( () => {
 				provideModules( registry, modules );
 				provideModuleRegistrations( registry );
@@ -107,9 +107,15 @@ describe( 'DashboardSharingSettings', () => {
 					.dispatch( MODULES_SEARCH_CONSOLE )
 					.receiveGetSettings( { ownerID: 1 } );
 			} );
-			const { container } = render( <DashboardSharingSettings />, {
-				registry,
-			} );
+
+			const { container, waitForRegistry } = render(
+				<DashboardSharingSettings />,
+				{
+					registry,
+				}
+			);
+
+			await waitForRegistry();
 
 			expect(
 				container.querySelector(
@@ -118,7 +124,7 @@ describe( 'DashboardSharingSettings', () => {
 			).toBeInTheDocument();
 		} );
 
-		it( 'should not render sharing management for a single admin environment', () => {
+		it( 'should not render sharing management for a single admin environment', async () => {
 			act( () => {
 				provideModules( registry, modules );
 				provideModuleRegistrations( registry );
@@ -144,9 +150,14 @@ describe( 'DashboardSharingSettings', () => {
 					.dispatch( MODULES_SEARCH_CONSOLE )
 					.receiveGetSettings( { ownerID: 1 } );
 			} );
-			const { container } = render( <DashboardSharingSettings />, {
-				registry,
-			} );
+			const { container, waitForRegistry } = render(
+				<DashboardSharingSettings />,
+				{
+					registry,
+				}
+			);
+
+			await waitForRegistry();
 
 			expect( container ).not.toHaveTextContent(
 				'Who can manage view access'

diff --git a/assets/js/googlesitekit/modules/datastore/modules.js b/assets/js/googlesitekit/modules/datastore/modules.js
@@ -1319,6 +1319,25 @@ const baseSelectors = {
 		return calculateRecoverableModules( modules, state.recoverableModules );
 	} ),
 
+	/**
+	 * Checks if there are any recoverable modules for dashboard sharing.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @param {Object} state Data store's state.
+	 * @return {(boolean|undefined)} `true` if there are recoverable modules.
+	 * 								 `false` if there are none.
+	 * 								 `undefined` if not loaded.
+	 */
+	hasRecoverableModules: ( state ) => {
+		// Return `undefined` if recoverableModules haven't been loaded yet.
+		if ( state.recoverableModules === undefined ) {
+			return undefined;
+		}
+
+		return Object.keys( state.recoverableModules ).length > 0;
+	},
+
 	/**
 	 * Gets the list of shared ownership modules for dashboard sharing.
 	 *

diff --git a/assets/sass/components/global/_googlesitekit-sharing-settings.scss b/assets/sass/components/global/_googlesitekit-sharing-settings.scss
@@ -164,6 +164,16 @@
 			display: flex;
 			flex: 1 1 45%;
 		}
+
+		.googlesitekit-warning-notice {
+			margin-right: $grid-gap-desktop;
+			padding: $grid-gap-phone / 2 $grid-gap-phone;
+
+			.googlesitekit-cta-link {
+				font-weight: $fw-normal;
+				text-decoration: underline;
+			}
+		}
 	}
 
 	.googlesitekit-dashboard-sharing-settings__row {