From fde8fc3b7c5f8f97d5f6eaebef58e49ca1635392 Mon Sep 17 00:00:00 2001 From: madhusudhand Date: Thu, 21 Nov 2024 14:16:34 +0530 Subject: [PATCH 1/6] add hosting features content to advanced tools tab --- .../components/site-preview-pane/constants.ts | 2 ++ .../site-preview-pane/dotcom-preview-pane.tsx | 9 ++++++++- client/sites/tools/controller.tsx | 6 ++++++ client/sites/tools/index.tsx | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/client/sites/components/site-preview-pane/constants.ts b/client/sites/components/site-preview-pane/constants.ts index 0254c28cd8c85..67e6b896ea126 100644 --- a/client/sites/components/site-preview-pane/constants.ts +++ b/client/sites/components/site-preview-pane/constants.ts @@ -20,6 +20,7 @@ export const TOOLS_LOGS_PHP = 'tools-logs-php'; export const TOOLS_LOGS_WEB = 'tools-logs-web'; export const TOOLS_SFTP_SSH = 'tools-sftp-ssh'; export const TOOLS_DATABASE = 'tools-database'; +export const ADVANCED_TOOLS = 'advanced-tools'; export const SETTINGS_SITE = 'settings-site'; export const SETTINGS_ADMINISTRATION = 'settings-administration'; @@ -55,6 +56,7 @@ export const FEATURE_TO_ROUTE_MAP: { [ feature: string ]: string } = { [ TOOLS_LOGS_WEB ]: 'sites/tools/logs/:site/web', [ TOOLS_SFTP_SSH ]: 'sites/tools/sftp-ssh/:site', [ TOOLS_DATABASE ]: 'sites/tools/database/:site', + [ ADVANCED_TOOLS ]: 'sites/tools/:site', [ SETTINGS_SITE ]: 'sites/settings/site/:site', [ SETTINGS_ADMINISTRATION ]: 'sites/settings/administration/:site', [ SETTINGS_ADMINISTRATION_RESET_SITE ]: 'sites/settings/administration/:site/reset-site', diff --git a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx index c71f41f192569..e6a46a287008f 100644 --- a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx +++ b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx @@ -43,6 +43,7 @@ import { FEATURE_TO_ROUTE_MAP, MARKETING_TRAFFIC, MARKETING_SHARING, + ADVANCED_TOOLS, } from './constants'; import PreviewPaneHeaderButtons from './preview-pane-header-buttons'; import SiteEnvironmentSwitcher from './site-environment-switcher'; @@ -136,10 +137,16 @@ const DotcomPreviewPane = ( { ], }, { - label: __( 'Advanced Tools' ), + label: ( + + { __( 'Advanced Tools' ) } + + + ), enabled: areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ), featureIds: [ + ADVANCED_TOOLS, TOOLS_STAGING_SITE, TOOLS_DEPLOYMENTS, TOOLS_MONITORING, diff --git a/client/sites/tools/controller.tsx b/client/sites/tools/controller.tsx index 74ec3f49facea..95c79d958bdce 100644 --- a/client/sites/tools/controller.tsx +++ b/client/sites/tools/controller.tsx @@ -1,5 +1,6 @@ import { __ } from '@wordpress/i18n'; import { useSelector } from 'react-redux'; +import HostingFeatures from 'calypso/hosting/hosting-features/components/hosting-features'; import { getSelectedSiteSlug } from 'calypso/state/ui/selectors'; import { SidebarItem, Sidebar, PanelWithSidebar } from '../components/panel-sidebar'; import { useAreAdvancedHostingFeaturesSupported } from '../hosting-features/features'; @@ -50,6 +51,11 @@ export function ToolsSidebar() { ); } +export function advancedTools( context: PageJSContext, next: () => void ) { + context.primary = ; + next(); +} + export function stagingSite( context: PageJSContext, next: () => void ) { context.primary = ( diff --git a/client/sites/tools/index.tsx b/client/sites/tools/index.tsx index 290adce686094..6f3a5aebce003 100644 --- a/client/sites/tools/index.tsx +++ b/client/sites/tools/index.tsx @@ -9,6 +9,7 @@ import { TOOLS_STAGING_SITE, TOOLS_SFTP_SSH, TOOLS_DATABASE, + ADVANCED_TOOLS, } from 'calypso/sites/components/site-preview-pane/constants'; import { redirectToHostingFeaturesIfNotAtomic, siteDashboard } from 'calypso/sites/controller'; import { @@ -22,9 +23,22 @@ import { deploymentCreation, deploymentManagement, deploymentRunLogs, + advancedTools, } from './controller'; export default function () { + page( '/sites/tools', siteSelection, sites, makeLayout, clientRender ); + page( + '/sites/tools/:site', + siteSelection, + redirectToHostingFeaturesIfNotAtomic, + navigation, + advancedTools, + siteDashboard( ADVANCED_TOOLS ), + makeLayout, + clientRender + ); + page( '/sites/tools/staging-site', siteSelection, sites, makeLayout, clientRender ); page( '/sites/tools/staging-site/:site', From 15b2218be14ab7b5f391fb8a748d7097b6877863 Mon Sep 17 00:00:00 2001 From: madhusudhand Date: Thu, 21 Nov 2024 14:48:03 +0530 Subject: [PATCH 2/6] update route conditions --- .../components/site-preview-pane/dotcom-preview-pane.tsx | 4 ++-- client/sites/controller.tsx | 2 +- client/sites/tools/index.tsx | 1 - 3 files changed, 3 insertions(+), 4 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 index e6a46a287008f..ff2b3daa8ab5b 100644 --- a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx +++ b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx @@ -98,7 +98,7 @@ const DotcomPreviewPane = ( { ), - enabled: isSimpleSite || isPlanExpired, + enabled: areHostingFeaturesSupported( site ), featureIds: [ DOTCOM_HOSTING_FEATURES ], }, { @@ -144,7 +144,7 @@ const DotcomPreviewPane = ( { ), enabled: - areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ), + ! areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ), featureIds: [ ADVANCED_TOOLS, TOOLS_STAGING_SITE, diff --git a/client/sites/controller.tsx b/client/sites/controller.tsx index e63f7e6291d7b..39c0629cf5503 100644 --- a/client/sites/controller.tsx +++ b/client/sites/controller.tsx @@ -152,7 +152,7 @@ export function redirectToHostingFeaturesIfNotAtomic( context: PageJSContext, ne const site = getSelectedSite( state ); if ( ! areHostingFeaturesSupported( site ) ) { - return page.redirect( `/hosting-features/${ site?.slug }` ); + return page.redirect( `/sites/tools/${ site?.slug }` ); } next(); diff --git a/client/sites/tools/index.tsx b/client/sites/tools/index.tsx index 6f3a5aebce003..4045884a0644a 100644 --- a/client/sites/tools/index.tsx +++ b/client/sites/tools/index.tsx @@ -31,7 +31,6 @@ export default function () { page( '/sites/tools/:site', siteSelection, - redirectToHostingFeaturesIfNotAtomic, navigation, advancedTools, siteDashboard( ADVANCED_TOOLS ), From 4b81414e7ac359add9f011b128baf2e2cd753b74 Mon Sep 17 00:00:00 2001 From: madhusudhand Date: Thu, 21 Nov 2024 16:59:04 +0530 Subject: [PATCH 3/6] move hosting features components to sites/tools directory --- client/hosting/hosting-features/controller.tsx | 2 +- client/sites/components/site-preview-pane/constants.ts | 4 ++-- .../components/site-preview-pane/dotcom-preview-pane.tsx | 6 +++--- client/sites/tools/controller.tsx | 2 +- .../hosting-features/components/hosting-features-icon.jsx | 0 .../tools}/hosting-features/components/hosting-features.tsx | 0 .../tools}/hosting-features/components/style.scss | 0 client/sites/tools/index.tsx | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename client/{hosting => sites/tools}/hosting-features/components/hosting-features-icon.jsx (100%) rename client/{hosting => sites/tools}/hosting-features/components/hosting-features.tsx (100%) rename client/{hosting => sites/tools}/hosting-features/components/style.scss (100%) diff --git a/client/hosting/hosting-features/controller.tsx b/client/hosting/hosting-features/controller.tsx index 714dcb705a567..9b9bb1c4097d3 100644 --- a/client/hosting/hosting-features/controller.tsx +++ b/client/hosting/hosting-features/controller.tsx @@ -1,5 +1,5 @@ import { Context as PageJSContext } from '@automattic/calypso-router'; -import HostingFeatures from './components/hosting-features'; +import HostingFeatures from 'calypso/sites/tools/hosting-features/components/hosting-features'; export function hostingFeatures( context: PageJSContext, next: () => void ) { context.primary = ; diff --git a/client/sites/components/site-preview-pane/constants.ts b/client/sites/components/site-preview-pane/constants.ts index 67e6b896ea126..6f09dd49ff9b7 100644 --- a/client/sites/components/site-preview-pane/constants.ts +++ b/client/sites/components/site-preview-pane/constants.ts @@ -20,7 +20,7 @@ export const TOOLS_LOGS_PHP = 'tools-logs-php'; export const TOOLS_LOGS_WEB = 'tools-logs-web'; export const TOOLS_SFTP_SSH = 'tools-sftp-ssh'; export const TOOLS_DATABASE = 'tools-database'; -export const ADVANCED_TOOLS = 'advanced-tools'; +export const TOOLS = 'tools'; export const SETTINGS_SITE = 'settings-site'; export const SETTINGS_ADMINISTRATION = 'settings-administration'; @@ -56,7 +56,7 @@ export const FEATURE_TO_ROUTE_MAP: { [ feature: string ]: string } = { [ TOOLS_LOGS_WEB ]: 'sites/tools/logs/:site/web', [ TOOLS_SFTP_SSH ]: 'sites/tools/sftp-ssh/:site', [ TOOLS_DATABASE ]: 'sites/tools/database/:site', - [ ADVANCED_TOOLS ]: 'sites/tools/:site', + [ TOOLS ]: 'sites/tools/:site', [ SETTINGS_SITE ]: 'sites/settings/site/:site', [ SETTINGS_ADMINISTRATION ]: 'sites/settings/administration/:site', [ SETTINGS_ADMINISTRATION_RESET_SITE ]: 'sites/settings/administration/:site/reset-site', diff --git a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx index ff2b3daa8ab5b..a0e167f6bbe56 100644 --- a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx +++ b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx @@ -4,7 +4,7 @@ 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/hosting/hosting-features/components/hosting-features-icon'; +import HostingFeaturesIcon from 'calypso/sites/tools/hosting-features/components/hosting-features-icon'; import { areHostingFeaturesSupported } from 'calypso/sites/hosting-features/features'; import { useStagingSite } from 'calypso/sites/tools/staging-site/hooks/use-staging-site'; import { getMigrationStatus } from 'calypso/sites-dashboard/utils'; @@ -43,7 +43,7 @@ import { FEATURE_TO_ROUTE_MAP, MARKETING_TRAFFIC, MARKETING_SHARING, - ADVANCED_TOOLS, + TOOLS, } from './constants'; import PreviewPaneHeaderButtons from './preview-pane-header-buttons'; import SiteEnvironmentSwitcher from './site-environment-switcher'; @@ -146,7 +146,7 @@ const DotcomPreviewPane = ( { enabled: ! areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ), featureIds: [ - ADVANCED_TOOLS, + TOOLS, TOOLS_STAGING_SITE, TOOLS_DEPLOYMENTS, TOOLS_MONITORING, diff --git a/client/sites/tools/controller.tsx b/client/sites/tools/controller.tsx index 95c79d958bdce..5974220dabad4 100644 --- a/client/sites/tools/controller.tsx +++ b/client/sites/tools/controller.tsx @@ -1,6 +1,5 @@ import { __ } from '@wordpress/i18n'; import { useSelector } from 'react-redux'; -import HostingFeatures from 'calypso/hosting/hosting-features/components/hosting-features'; import { getSelectedSiteSlug } from 'calypso/state/ui/selectors'; import { SidebarItem, Sidebar, PanelWithSidebar } from '../components/panel-sidebar'; import { useAreAdvancedHostingFeaturesSupported } from '../hosting-features/features'; @@ -12,6 +11,7 @@ import { Deployments, } from './deployments'; import { indexPage } from './deployments/routes'; +import HostingFeatures from './hosting-features/components/hosting-features'; import Logs from './logs'; import Monitoring from './monitoring'; import useSftpSshSettingTitle from './sftp-ssh/hooks/use-sftp-ssh-setting-title'; diff --git a/client/hosting/hosting-features/components/hosting-features-icon.jsx b/client/sites/tools/hosting-features/components/hosting-features-icon.jsx similarity index 100% rename from client/hosting/hosting-features/components/hosting-features-icon.jsx rename to client/sites/tools/hosting-features/components/hosting-features-icon.jsx diff --git a/client/hosting/hosting-features/components/hosting-features.tsx b/client/sites/tools/hosting-features/components/hosting-features.tsx similarity index 100% rename from client/hosting/hosting-features/components/hosting-features.tsx rename to client/sites/tools/hosting-features/components/hosting-features.tsx diff --git a/client/hosting/hosting-features/components/style.scss b/client/sites/tools/hosting-features/components/style.scss similarity index 100% rename from client/hosting/hosting-features/components/style.scss rename to client/sites/tools/hosting-features/components/style.scss diff --git a/client/sites/tools/index.tsx b/client/sites/tools/index.tsx index 4045884a0644a..3d8c18000aabc 100644 --- a/client/sites/tools/index.tsx +++ b/client/sites/tools/index.tsx @@ -9,7 +9,7 @@ import { TOOLS_STAGING_SITE, TOOLS_SFTP_SSH, TOOLS_DATABASE, - ADVANCED_TOOLS, + TOOLS, } from 'calypso/sites/components/site-preview-pane/constants'; import { redirectToHostingFeaturesIfNotAtomic, siteDashboard } from 'calypso/sites/controller'; import { @@ -33,7 +33,7 @@ export default function () { siteSelection, navigation, advancedTools, - siteDashboard( ADVANCED_TOOLS ), + siteDashboard( TOOLS ), makeLayout, clientRender ); From bdd8a9501547a9c71078ab3bd4994650a45b05dc Mon Sep 17 00:00:00 2001 From: madhusudhand Date: Thu, 21 Nov 2024 17:16:01 +0530 Subject: [PATCH 4/6] add translations for advanced tools --- client/sites/tools/controller.tsx | 2 +- .../components/hosting-features.tsx | 56 +++++++++++++++---- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/client/sites/tools/controller.tsx b/client/sites/tools/controller.tsx index 5974220dabad4..81d836e1db6d4 100644 --- a/client/sites/tools/controller.tsx +++ b/client/sites/tools/controller.tsx @@ -52,7 +52,7 @@ export function ToolsSidebar() { } export function advancedTools( context: PageJSContext, next: () => void ) { - context.primary = ; + context.primary = ; next(); } diff --git a/client/sites/tools/hosting-features/components/hosting-features.tsx b/client/sites/tools/hosting-features/components/hosting-features.tsx index 72eb975af05b7..546f77258ac86 100644 --- a/client/sites/tools/hosting-features/components/hosting-features.tsx +++ b/client/sites/tools/hosting-features/components/hosting-features.tsx @@ -36,7 +36,11 @@ const PromoCard = ( { title, text, supportContext }: PromoCardProps ) => ( ); -const HostingFeatures = () => { +type HostingFeaturesProps = { + showAsTools?: boolean; +}; + +const HostingFeatures = ( { showAsTools }: HostingFeaturesProps ) => { const dispatch = useDispatch(); const { searchParams } = new URL( document.location.toString() ); const siteId = useSelector( getSelectedSiteId ); @@ -116,10 +120,30 @@ const HostingFeatures = () => { ? translate( 'Activate all hosting features' ) : translate( 'Activate all developer tools' ); + const activateTitleAsTools = hasEnTranslation( 'Activate all advanced tools' ); + + const activationStatusTitle = translate( 'Activating hosting features' ); + const activationStatusTitleAsTools = translate( 'Activating advanced tools' ); + + const activationStatusDescription = translate( + "The hosting features will appear here automatically when they're ready!", + { + comment: 'Description of the hosting features page when the features are being activated.', + } + ); + const activationStatusDescriptionAsTools = translate( + "The advanced tools will appear here automatically when they're ready!", + { + comment: 'Description of the advanced tools page when the features are being activated.', + } + ); + const unlockTitle = hasEnTranslation( 'Unlock all hosting features' ) ? translate( 'Unlock all hosting features' ) : translate( 'Unlock all developer tools' ); + const unlockTitleAsTools = translate( 'Unlock all advanced tools' ); + const activateDescription = hasEnTranslation( 'Your plan includes all the hosting features listed below. Click "Activate now" to begin.' ) @@ -130,6 +154,10 @@ const HostingFeatures = () => { 'Your plan includes all the developer tools listed below. Click "Activate now" to begin.' ); + const activateDescriptionAsTools = translate( + 'Your plan includes all the advanced tools listed below. Click "Activate now" to begin.' + ); + const unlockDescription = hasEnTranslation( 'Upgrade to the %(planName)s plan or higher to get access to all hosting features' ) @@ -152,24 +180,28 @@ const HostingFeatures = () => { } ); + const unlockDescriptionAsTools = translate( + 'Upgrade to the %(planName)s plan or higher to get access to all advanced tools', + { + args: { + planName: getPlan( PLAN_BUSINESS )?.getTitle() ?? '', + }, + } + ); + let title; let description; let buttons; if ( shouldRenderActivatingCopy ) { - title = translate( 'Activating hosting features' ); - description = translate( - "The hosting features will appear here automatically when they're ready!", - { - comment: 'Description of the hosting features page when the features are being activated.', - } - ); + title = showAsTools ? activationStatusTitleAsTools : activationStatusTitle; + description = showAsTools ? activationStatusDescriptionAsTools : activationStatusDescription; } else if ( showActivationButton ) { - title = activateTitle; - description = activateDescription; + title = showAsTools ? activateTitleAsTools : activateTitle; + description = showAsTools ? activateDescriptionAsTools : activateDescription; buttons = ; } else { - title = unlockTitle; - description = unlockDescription; + title = showAsTools ? unlockTitleAsTools : unlockTitle; + description = showAsTools ? unlockDescriptionAsTools : unlockDescription; buttons = ( Date: Mon, 25 Nov 2024 12:15:53 +0530 Subject: [PATCH 5/6] address feedback --- .../site-preview-pane/dotcom-preview-pane.tsx | 26 ++++++++++++------- client/sites/tools/controller.tsx | 2 +- client/sites/tools/index.tsx | 4 +-- 3 files changed, 19 insertions(+), 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 index a0e167f6bbe56..3d80842f5bcb5 100644 --- 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 = ( { ), - enabled: areHostingFeaturesSupported( site ), + enabled: + ( isSimpleSite || isPlanExpired ) && ! config.isEnabled( 'untangling/hosting-menu' ), featureIds: [ DOTCOM_HOSTING_FEATURES ], }, { @@ -137,16 +138,10 @@ const DotcomPreviewPane = ( { ], }, { - label: ( - - { __( 'Advanced Tools' ) } - - - ), + 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: ( + + { __( 'Advanced Tools' ) } + + + ), + 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 index 81d836e1db6d4..a2248af272f83 100644 --- 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 = ; next(); } diff --git a/client/sites/tools/index.tsx b/client/sites/tools/index.tsx index 3d8c18000aabc..e5cf49682021d 100644 --- 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 From 5d023b76f9e777ef2757adb410123ae5fe66eeee Mon Sep 17 00:00:00 2001 From: madhusudhand Date: Mon, 25 Nov 2024 12:54:44 +0530 Subject: [PATCH 6/6] move hosting-feature components one level up --- client/hosting/hosting-features/controller.tsx | 2 +- .../sites/components/site-preview-pane/dotcom-preview-pane.tsx | 2 +- .../hosting-features/components/hosting-features-icon.jsx | 0 .../hosting-features/components/hosting-features.tsx | 0 client/sites/{tools => }/hosting-features/components/style.scss | 0 client/sites/tools/controller.tsx | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename client/sites/{tools => }/hosting-features/components/hosting-features-icon.jsx (100%) rename client/sites/{tools => }/hosting-features/components/hosting-features.tsx (100%) rename client/sites/{tools => }/hosting-features/components/style.scss (100%) diff --git a/client/hosting/hosting-features/controller.tsx b/client/hosting/hosting-features/controller.tsx index 9b9bb1c4097d3..d7de63fd431d9 100644 --- a/client/hosting/hosting-features/controller.tsx +++ b/client/hosting/hosting-features/controller.tsx @@ -1,5 +1,5 @@ import { Context as PageJSContext } from '@automattic/calypso-router'; -import HostingFeatures from 'calypso/sites/tools/hosting-features/components/hosting-features'; +import HostingFeatures from 'calypso/sites/hosting-features/components/hosting-features'; export function hostingFeatures( context: PageJSContext, next: () => void ) { context.primary = ; diff --git a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx index 3d80842f5bcb5..02a456406b0e2 100644 --- 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/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'; diff --git a/client/sites/tools/hosting-features/components/hosting-features-icon.jsx b/client/sites/hosting-features/components/hosting-features-icon.jsx similarity index 100% rename from client/sites/tools/hosting-features/components/hosting-features-icon.jsx rename to client/sites/hosting-features/components/hosting-features-icon.jsx diff --git a/client/sites/tools/hosting-features/components/hosting-features.tsx b/client/sites/hosting-features/components/hosting-features.tsx similarity index 100% rename from client/sites/tools/hosting-features/components/hosting-features.tsx rename to client/sites/hosting-features/components/hosting-features.tsx diff --git a/client/sites/tools/hosting-features/components/style.scss b/client/sites/hosting-features/components/style.scss similarity index 100% rename from client/sites/tools/hosting-features/components/style.scss rename to client/sites/hosting-features/components/style.scss diff --git a/client/sites/tools/controller.tsx b/client/sites/tools/controller.tsx index a2248af272f83..f5cd574b962d1 100644 --- a/client/sites/tools/controller.tsx +++ b/client/sites/tools/controller.tsx @@ -1,5 +1,6 @@ import { __ } from '@wordpress/i18n'; import { useSelector } from 'react-redux'; +import HostingFeatures from 'calypso/sites/hosting-features/components/hosting-features'; import { getSelectedSiteSlug } from 'calypso/state/ui/selectors'; import { SidebarItem, Sidebar, PanelWithSidebar } from '../components/panel-sidebar'; import { useAreAdvancedHostingFeaturesSupported } from '../hosting-features/features'; @@ -11,7 +12,6 @@ import { Deployments, } from './deployments'; import { indexPage } from './deployments/routes'; -import HostingFeatures from './hosting-features/components/hosting-features'; import Logs from './logs'; import Monitoring from './monitoring'; import useSftpSshSettingTitle from './sftp-ssh/hooks/use-sftp-ssh-setting-title';