address feedback

Automattic · Nov 25, 2024 · 6c57e7f · 6c57e7f
1 parent bdd8a95
commit 6c57e7f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx
@@ -4,8 +4,8 @@ import { SiteExcerptData } from '@automattic/sites';
 import { useI18n } from '@wordpress/react-i18n';
 import React, { useMemo, useEffect } from 'react';
 import ItemPreviewPane from 'calypso/a8c-for-agencies/components/items-dashboard/item-preview-pane';
-import HostingFeaturesIcon from 'calypso/sites/tools/hosting-features/components/hosting-features-icon';
 import { areHostingFeaturesSupported } from 'calypso/sites/hosting-features/features';
+import HostingFeaturesIcon from 'calypso/sites/tools/hosting-features/components/hosting-features-icon';
 import { useStagingSite } from 'calypso/sites/tools/staging-site/hooks/use-staging-site';
 import { getMigrationStatus } from 'calypso/sites-dashboard/utils';
 import { useSelector } from 'calypso/state';
@@ -98,7 +98,8 @@ const DotcomPreviewPane = ( {
 						<HostingFeaturesIcon />
 					</span>
 				),
-				enabled: areHostingFeaturesSupported( site ),
+				enabled:
+					( isSimpleSite || isPlanExpired ) && ! config.isEnabled( 'untangling/hosting-menu' ),
 				featureIds: [ DOTCOM_HOSTING_FEATURES ],
 			},
 			{
@@ -137,16 +138,10 @@ const DotcomPreviewPane = ( {
 				],
 			},
 			{
-				label: (
-					<span>
-						{ __( 'Advanced Tools' ) }
-						<HostingFeaturesIcon />
-					</span>
-				),
+				label: __( 'Advanced Tools' ),
 				enabled:
-					! areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ),
+					areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ),
 				featureIds: [
-					TOOLS,
 					TOOLS_STAGING_SITE,
 					TOOLS_DEPLOYMENTS,
 					TOOLS_MONITORING,
@@ -156,6 +151,17 @@ const DotcomPreviewPane = ( {
 					TOOLS_DATABASE,
 				],
 			},
+			{
+				label: (
+					<span>
+						{ __( 'Advanced Tools' ) }
+						<HostingFeaturesIcon />
+					</span>
+				),
+				enabled:
+					! areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ),
+				featureIds: [ TOOLS ],
+			},
 			{
 				label: __( 'Settings' ),
 				enabled: config.isEnabled( 'untangling/hosting-menu' ),

diff --git a/client/sites/tools/controller.tsx b/client/sites/tools/controller.tsx
@@ -51,7 +51,7 @@ export function ToolsSidebar() {
 	);
 }
 
-export function advancedTools( context: PageJSContext, next: () => void ) {
+export function tools( context: PageJSContext, next: () => void ) {
 	context.primary = <HostingFeatures showAsTools />;
 	next();
 }

diff --git a/client/sites/tools/index.tsx b/client/sites/tools/index.tsx
@@ -23,7 +23,7 @@ import {
 	deploymentCreation,
 	deploymentManagement,
 	deploymentRunLogs,
-	advancedTools,
+	tools,
 } from './controller';
 
 export default function () {
@@ -32,7 +32,7 @@ export default function () {
 		'/sites/tools/:site',
 		siteSelection,
 		navigation,
-		advancedTools,
+		tools,
 		siteDashboard( TOOLS ),
 		makeLayout,
 		clientRender
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ export function ToolsSidebar() { @@
     	);
     }
-    export function advancedTools( context: PageJSContext, next: () => void ) {
+    export function tools( context: PageJSContext, next: () => void ) {
     	context.primary = <HostingFeatures showAsTools />;
     	next();
     }
@@ Expand Down @@