Clean up hosting-overview-refinements feature flag (#94050)

Automattic · Sep 6, 2024 · 43dc289 · 43dc289
1 parent e02a0a3
commit 43dc289
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 100 deletions.
diff --git a/...-agencies/components/items-dashboard/item-preview-pane/item-preview-pane-header/index.tsx b/...-agencies/components/items-dashboard/item-preview-pane/item-preview-pane-header/index.tsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import { Gridicon } from '@automattic/components';
 import { Button } from '@wordpress/components';
 import { useMediaQuery } from '@wordpress/compose';
@@ -64,10 +63,7 @@ export default function ItemPreviewPaneHeader( {
 		extraProps?.siteIconFallback ?? ( itemData.isDotcomSite ? 'wordpress-logo' : 'color' );
 
 	const shouldDisplayVersionNumbers =
-		config.isEnabled( 'hosting-overview-refinements' ) &&
-		! itemData.hideEnvDataInHeader &&
-		isAtomic &&
-		( wpVersion || phpVersion );
+		! itemData.hideEnvDataInHeader && isAtomic && ( wpVersion || phpVersion );
 
 	const handlePhpVersionClick = () => {
 		dispatch( recordTracksEvent( 'calypso_hosting_php_version_click' ) );

diff --git a/client/hosting/hosting-features/components/hosting-features.tsx b/client/hosting/hosting-features/components/hosting-features.tsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import { FEATURE_SFTP, getPlan, PLAN_BUSINESS } from '@automattic/calypso-products';
 import page from '@automattic/calypso-router';
 import { Dialog } from '@automattic/components';
@@ -186,7 +185,7 @@ const HostingFeatures = () => {
 	let title;
 	let description;
 	let buttons;
-	if ( isTransferInProgress && config.isEnabled( 'hosting-overview-refinements' ) ) {
+	if ( isTransferInProgress ) {
 		title = translate( 'Activating hosting features' );
 		description = translate(
 			"The hosting features will appear here automatically when they're ready!",

diff --git a/client/hosting/overview/components/plan-card.tsx b/client/hosting/overview/components/plan-card.tsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import {
 	getPlan,
 	PlanSlug,
@@ -210,9 +209,6 @@ const PlanCard: FC = () => {
 		}
 	};
 
-	const shouldRenderPlanData =
-		! isStaging || ( isStaging && config.isEnabled( 'hosting-overview-refinements' ) );
-
 	return (
 		<>
 			<QuerySitePlans siteId={ site?.ID } />
@@ -229,60 +225,60 @@ const PlanCard: FC = () => {
 						</>
 					) }
 				</div>
-				{ shouldRenderPlanData && (
-					<>
-						{ isAgencyPurchase && (
-							<div className="hosting-overview__plan-agency-purchase">
-								<p>
-									{ translate( 'This site is managed through {{a}}Automattic for Agencies{{/a}}.', {
-										components: {
-											a: isA4A ? (
-												<a
-													href={ `https://agencies.automattic.com/sites/overview/${ site?.slug }` }
-												></a>
-											) : (
-												<strong></strong>
-											),
-										},
-									} ) }
-								</p>
-							</div>
-						) }
-						{ ! isAgencyPurchase && ! isStaging && <PricingSection /> }
-						{ ! isLoading && (
-							<div className="hosting-overview__site-metrics">
-								<PlanStorage
-									className="hosting-overview__plan-storage"
-									hideWhenNoStorage
-									siteId={ site?.ID }
-									StorageBarComponent={ PlanStorageBar }
-								>
-									{ storageAddons.length > 0 && ! isAgencyPurchase && (
-										<div className="hosting-overview__plan-storage-footer">
-											<Button
-												className="hosting-overview__link-button"
-												plain
-												href={ `/add-ons/${ site?.slug }` }
-												onClick={ () => {
-													dispatch(
-														recordTracksEvent( 'calypso_hosting_overview_need_more_storage_click' )
-													);
-												} }
-											>
-												{ translate( 'Need more storage?' ) }
-											</Button>
-										</div>
-									) }
-								</PlanStorage>
-								{ config.isEnabled( 'hosting-overview-refinements' ) && site && (
-									<div className="hosting-overview__site-metrics-footer">
-										<PlanBandwidth siteId={ site.ID } />
-										<PlanSiteVisits siteId={ site.ID } />
-									</div>
-								) }
+
+				{ isAgencyPurchase && (
+					<div className="hosting-overview__plan-agency-purchase">
+						<p>
+							{ translate( 'This site is managed through {{a}}Automattic for Agencies{{/a}}.', {
+								components: {
+									a: isA4A ? (
+										<a
+											href={ `https://agencies.automattic.com/sites/overview/${ site?.slug }` }
+										></a>
+									) : (
+										<strong></strong>
+									),
+								},
+							} ) }
+						</p>
+					</div>
+				) }
+
+				{ ! isAgencyPurchase && ! isStaging && <PricingSection /> }
+
+				{ ! isLoading && (
+					<div className="hosting-overview__site-metrics">
+						<PlanStorage
+							className="hosting-overview__plan-storage"
+							hideWhenNoStorage
+							siteId={ site?.ID }
+							StorageBarComponent={ PlanStorageBar }
+						>
+							{ storageAddons.length > 0 && ! isAgencyPurchase && (
+								<div className="hosting-overview__plan-storage-footer">
+									<Button
+										className="hosting-overview__link-button"
+										plain
+										href={ `/add-ons/${ site?.slug }` }
+										onClick={ () => {
+											dispatch(
+												recordTracksEvent( 'calypso_hosting_overview_need_more_storage_click' )
+											);
+										} }
+									>
+										{ translate( 'Need more storage?' ) }
+									</Button>
+								</div>
+							) }
+						</PlanStorage>
+
+						{ site && (
+							<div className="hosting-overview__site-metrics-footer">
+								<PlanBandwidth siteId={ site.ID } />
+								<PlanSiteVisits siteId={ site.ID } />
 							</div>
 						) }
-					</>
+					</div>
 				) }
 			</HostingCard>
 		</>

diff --git a/config/a8c-for-agencies-development.json b/config/a8c-for-agencies-development.json
@@ -42,8 +42,7 @@
 		"a4a-partner-directory": false,
 		"a4a-hosting-page-redesign": true,
 		"a4a-dev-sites": true,
-		"a4a-multi-user-support": true,
-		"hosting-overview-refinements": true
+		"a4a-multi-user-support": true
 	},
 	"enable_all_sections": false,
 	"sections": {

diff --git a/config/a8c-for-agencies-horizon.json b/config/a8c-for-agencies-horizon.json
@@ -35,8 +35,7 @@
 		"a4a-partner-directory": false,
 		"a4a-hosting-page-redesign": true,
 		"a4a-dev-sites": false,
-		"a4a-multi-user-support": true,
-		"hosting-overview-refinements": true
+		"a4a-multi-user-support": true
 	},
 	"enable_all_sections": false,
 	"sections": {

diff --git a/config/a8c-for-agencies-production.json b/config/a8c-for-agencies-production.json
@@ -35,8 +35,7 @@
 		"a4a-partner-directory": false,
 		"a4a-hosting-page-redesign": true,
 		"a4a-dev-sites": false,
-		"a4a-multi-user-support": false,
-		"hosting-overview-refinements": true
+		"a4a-multi-user-support": false
 	},
 	"enable_all_sections": false,
 	"sections": {

diff --git a/config/a8c-for-agencies-stage.json b/config/a8c-for-agencies-stage.json
@@ -38,8 +38,7 @@
 		"a4a-partner-directory": false,
 		"a4a-hosting-page-redesign": true,
 		"a4a-dev-sites": false,
-		"a4a-multi-user-support": false,
-		"hosting-overview-refinements": true
+		"a4a-multi-user-support": false
 	},
 	"enable_all_sections": false,
 	"sections": {

diff --git a/config/development.json b/config/development.json
@@ -77,7 +77,6 @@
 		"help/gpt-response": true,
 		"home/layout-dev": true,
 		"hosting/datacenter-picker": true,
-		"hosting-overview-refinements": true,
 		"i18n/community-translator": false,
 		"i18n/empathy-mode": true,
 		"i18n/translation-scanner": true,

diff --git a/config/horizon.json b/config/horizon.json
@@ -43,7 +43,6 @@
 		"google-my-business": false,
 		"help": true,
 		"home/layout-dev": true,
-		"hosting-overview-refinements": true,
 		"i18n/empathy-mode": false,
 		"i18n/translation-scanner": true,
 		"importer/site-backups": true,

diff --git a/config/production.json b/config/production.json
@@ -53,7 +53,6 @@
 		"google-my-business": true,
 		"help": true,
 		"help/gpt-response": true,
-		"hosting-overview-refinements": true,
 		"i18n/empathy-mode": false,
 		"i18n/translation-scanner": true,
 		"importer/site-backups": true,

diff --git a/config/stage.json b/config/stage.json
@@ -52,7 +52,6 @@
 		"google-my-business": true,
 		"help": true,
 		"help/gpt-response": true,
-		"hosting-overview-refinements": true,
 		"i18n/empathy-mode": true,
 		"importer/site-backups": true,
 		"importer/unified": true,

diff --git a/config/test.json b/config/test.json
@@ -44,7 +44,6 @@
 		"cookie-banner": false,
 		"google-my-business": false,
 		"help": true,
-		"hosting-overview-refinements": true,
 		"importers/newsletter": true,
 		"importers/substack": true,
 		"individual-subscriber-stats": false,

diff --git a/config/wpcalypso.json b/config/wpcalypso.json
@@ -61,7 +61,6 @@
 		"help/gpt-response": true,
 		"home/layout-dev": true,
 		"hosting/datacenter-picker": true,
-		"hosting-overview-refinements": true,
 		"i18n/translation-scanner": true,
 		"importer/site-backups": true,
 		"importer/unified": true,

diff --git a/packages/domains-table/src/domains-table-header/columns.ts b/packages/domains-table/src/domains-table-header/columns.ts
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import { DomainData, PartialDomainData } from '@automattic/data-stores';
 import { __, _n, sprintf } from '@wordpress/i18n';
 import { I18N } from 'i18n-calypso';
@@ -59,6 +58,14 @@ export const allSitesViewColumns = (
 			supportsOrderSwitching: true,
 			sortFunctions: [ getSimpleSortFunctionBy( 'blog_name' ) ],
 		},
+		{
+			name: 'ssl',
+			label: __( 'SSL', __i18n_text_domain__ ),
+			isSortable: true,
+			initialSortDirection: 'asc',
+			supportsOrderSwitching: true,
+			sortFunctions: [ getSimpleSortFunctionBy( 'ssl_status' ) ],
+		},
 		{
 			name: 'expire_renew',
 			label: __( 'Expires / renews on', __i18n_text_domain__ ),
@@ -86,17 +93,6 @@ export const allSitesViewColumns = (
 		},
 	];
 
-	if ( config.isEnabled( 'hosting-overview-refinements' ) ) {
-		columns.splice( 3, 0, {
-			name: 'ssl',
-			label: __( 'SSL', __i18n_text_domain__ ),
-			isSortable: true,
-			initialSortDirection: 'asc',
-			supportsOrderSwitching: true,
-			sortFunctions: [ getSimpleSortFunctionBy( 'ssl_status' ) ],
-		} );
-	}
-
 	return columns;
 };
 
@@ -127,6 +123,14 @@ export const siteSpecificViewColumns = (
 			label: __( 'Email', __i18n_text_domain__ ),
 			isSortable: false,
 		},
+		{
+			name: 'ssl',
+			label: __( 'SSL', __i18n_text_domain__ ),
+			isSortable: true,
+			initialSortDirection: 'asc',
+			supportsOrderSwitching: true,
+			sortFunctions: [ getSimpleSortFunctionBy( 'ssl_status' ) ],
+		},
 		{
 			name: 'expire_renew',
 			label: __( 'Expires / renews on', __i18n_text_domain__ ),
@@ -154,17 +158,6 @@ export const siteSpecificViewColumns = (
 		},
 	];
 
-	if ( config.isEnabled( 'hosting-overview-refinements' ) ) {
-		columns.splice( 3, 0, {
-			name: 'ssl',
-			label: __( 'SSL', __i18n_text_domain__ ),
-			isSortable: true,
-			initialSortDirection: 'asc',
-			supportsOrderSwitching: true,
-			sortFunctions: [ getSimpleSortFunctionBy( 'ssl_status' ) ],
-		} );
-	}
-
 	return columns;
 };
 export const applyColumnSort = (