Removes various production-enabled feature flags.

Automattic · Jan 14, 2025 · 6f892c4 · 6f892c4
1 parent 5da4ed7
commit 6f892c4
Show file tree

Hide file tree

Showing 22 changed files with 59 additions and 149 deletions.
diff --git a/client/components/jetpack/sidebar/menu-items/jetpack-cloud.jsx b/client/components/jetpack/sidebar/menu-items/jetpack-cloud.jsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import { WPCOM_FEATURES_BACKUPS, WPCOM_FEATURES_SCAN } from '@automattic/calypso-products';
 import { Icon, plugins } from '@wordpress/icons';
 import { useTranslate } from 'i18n-calypso';
@@ -48,8 +47,6 @@ export default ( { path } ) => {
 		isSectionNameEnabled( 'site-purchases' ) &&
 		useSelector( ( state ) => canCurrentUser( state, siteId, 'own_site' ) );
 
-	const isPluginManagementEnabled = config.isEnabled( 'jetpack/plugin-management' );
-
 	return (
 		<>
 			<QuerySiteFeatures siteIds={ [ siteId ] } />
@@ -64,7 +61,7 @@ export default ( { path } ) => {
 					socialClicked: 'calypso_jetpack_sidebar_social_clicked',
 				} }
 			/>
-			{ isPluginManagementEnabled && isAgency && (
+			{ isAgency && (
 				<SidebarItem
 					// eslint-disable-next-line wpcalypso/jsx-classname-namespace
 					customIcon={ <Icon className="sidebar__menu-icon" size={ 28 } icon={ plugins } /> }

diff --git a/client/hosting/performance/controller.tsx b/client/hosting/performance/controller.tsx
@@ -1,15 +1,8 @@
-import config from '@automattic/calypso-config';
-import page from '@automattic/calypso-router';
 import PageViewTracker from 'calypso/lib/analytics/page-view-tracker';
 import { SitePerformance } from './site-performance';
 import type { Context as PageJSContext } from '@automattic/calypso-router';
 
 export function sitePerformance( context: PageJSContext, next: () => void ) {
-	if ( ! config.isEnabled( 'performance-profiler/logged-in' ) ) {
-		page.redirect( '/' );
-		return;
-	}
-
 	context.primary = (
 		<>
 			<PageViewTracker path="/sites/performance/:site" title="Site Performance" />

diff --git a/client/jetpack-cloud/sections/agency-dashboard/controller.tsx b/client/jetpack-cloud/sections/agency-dashboard/controller.tsx
@@ -1,5 +1,4 @@
 import { recordTracksEvent } from '@automattic/calypso-analytics';
-import config from '@automattic/calypso-config';
 import page, { type Callback } from '@automattic/calypso-router';
 import JetpackManageSidebar from 'calypso/jetpack-cloud/sections/sidebar-navigation/jetpack-manage';
 import SitesSidebar from 'calypso/jetpack-cloud/sections/sidebar-navigation/sites';
@@ -31,8 +30,7 @@ export const agencyDashboardContext: Callback = ( context, next ) => {
 	};
 	const state = context.store.getState();
 	const isAgency = isAgencyUser( state );
-	const isAgencyEnabled = config.isEnabled( 'jetpack/agency-dashboard' );
-	if ( ! isAgency || ! isAgencyEnabled ) {
+	if ( ! isAgency ) {
 		// Redirect to Jetpack.com if the user is not an agency user & the origin is wp-admin
 		if ( origin === 'wp-admin' ) {
 			recordTracksEvent( 'calypso_jetpack_manage_redirect_to_manage_in_jetpack_dot_com' );

diff --git a/...tpack-cloud/sections/agency-dashboard/sites-overview/site-status-content/lib/get-links.ts b/...tpack-cloud/sections/agency-dashboard/sites-overview/site-status-content/lib/get-links.ts
@@ -1,4 +1,4 @@
-import config, { isEnabled } from '@automattic/calypso-config';
+import { isEnabled } from '@automattic/calypso-config';
 import { urlToSlug } from 'calypso/lib/url/http-utils';
 import { AllowedTypes } from '../../types';
 
@@ -67,8 +67,7 @@ const getLinks = (
 		case 'plugin': {
 			link = `${ siteUrlWithScheme }/wp-admin/plugins.php`;
 			isExternalLink = true;
-			// FIXME: Remove this condition when we enable plugin management in production
-			if ( config.isEnabled( 'jetpack/plugin-management' ) && ! isAtomicSite ) {
+			if ( ! isAtomicSite ) {
 				link =
 					status === 'warning'
 						? `/plugins/updates/${ siteUrlWithMultiSiteSupport }`

diff --git a/client/jetpack-cloud/sections/landing/controller.tsx b/client/jetpack-cloud/sections/landing/controller.tsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import page, { type Callback, type Context } from '@automattic/calypso-router';
 import debugModule from 'debug';
 import { dashboardPath } from 'calypso/lib/jetpack/paths';
@@ -50,10 +49,9 @@ export const landForPrimarySite: Callback = ( context, next ) => {
 
 	const state = context.store.getState();
 
-	const isAgencyEnabled = config.isEnabled( 'jetpack/agency-dashboard' );
 	const isAgency = isAgencyUser( state );
 	const dashboardRedirectLink = dashboardPath();
-	if ( isAgencyEnabled && isAgency ) {
+	if ( isAgency ) {
 		debug( '[landForPrimarySite]: redirecting to agency dashboard' );
 
 		page.redirect( dashboardRedirectLink );

diff --git a/client/jetpack-cloud/sections/plugin-management/controller.tsx b/client/jetpack-cloud/sections/plugin-management/controller.tsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import page, { type Callback, type Context } from '@automattic/calypso-router';
 import JetpackManageSidebar from 'calypso/jetpack-cloud/sections/sidebar-navigation/jetpack-manage';
 import { isAgencyUser } from 'calypso/state/partner-portal/partner/selectors';
@@ -8,10 +7,8 @@ import PluginsOverview from './plugins-overview';
 const redirectIfHasNoAccess = ( context: Context ) => {
 	const state = context.store.getState();
 	const isAgency = isAgencyUser( state );
-	const isAgencyEnabled = config.isEnabled( 'jetpack/agency-dashboard' );
-	const isPluginManagementEnabled = config.isEnabled( 'jetpack/plugin-management' );
 
-	if ( ! isAgency || ! isAgencyEnabled || ! isPluginManagementEnabled ) {
+	if ( ! isAgency ) {
 		page.redirect( '/' );
 		return;
 	}

diff --git a/client/jetpack-cloud/sections/sidebar-navigation/manage-selected-site.tsx b/client/jetpack-cloud/sections/sidebar-navigation/manage-selected-site.tsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import { WPCOM_FEATURES_BACKUPS, WPCOM_FEATURES_SCAN } from '@automattic/calypso-products';
 import page from '@automattic/calypso-router';
 import {
@@ -81,8 +80,6 @@ const useMenuItems = ( {
 		useSelector( ( state ) => canCurrentUser( state, siteId, 'own_site' ) ) &&
 		isSectionNameEnabled( 'site-purchases' );
 
-	const isPluginManagementEnabled = config.isEnabled( 'jetpack/plugin-management' );
-
 	return useMemo(
 		() =>
 			[
@@ -101,7 +98,7 @@ const useMenuItems = ( {
 					link: pluginsPath( siteSlug ),
 					title: translate( 'Plugins' ),
 					trackEventName: 'calypso_jetpack_sidebar_plugins_clicked',
-					enabled: isPluginManagementEnabled && isAgency,
+					enabled: isAgency,
 					isSelected: itemLinkMatches( path, pluginsPath( siteSlug ) ),
 				},
 				{
@@ -190,7 +187,7 @@ const useMenuItems = ( {
 		[
 			isAdmin,
 			isAgency,
-			isPluginManagementEnabled,
+			showScanHistory,
 			isWPCOM,
 			isWPForTeamsSite,
 			path,

diff --git a/client/my-sites/plugins/index.node.js b/client/my-sites/plugins/index.node.js
@@ -3,7 +3,6 @@ import { JSDOM } from 'jsdom';
 import { makeLayout, ssrSetupLocale } from 'calypso/controller';
 import { setHrefLangLinks, setLocalizedCanonicalUrl } from 'calypso/controller/localized-links';
 import { overrideSanitizeSectionRoot } from 'calypso/lib/plugins/sanitize-section-content';
-import { isEnabled } from 'calypso/server/config';
 import { browsePlugins, browsePluginsOrPlugin } from './controller';
 import {
 	fetchPlugins,
@@ -16,47 +15,41 @@ import {
 export default function ( router ) {
 	const langParam = getLanguageRouteParam();
 
-	if ( isEnabled( 'plugins/ssr-landing' ) ) {
-		overrideSanitizeSectionRoot( new JSDOM().window );
+	overrideSanitizeSectionRoot( new JSDOM().window );
 
-		router(
-			[ `/${ langParam }/plugins` ],
-			skipIfLoggedIn,
-			ssrSetupLocale,
-			fetchPlugins,
-			setHrefLangLinks,
-			setLocalizedCanonicalUrl,
-			browsePlugins,
-			makeLayout
-		);
-	}
+	router(
+		[ `/${ langParam }/plugins` ],
+		skipIfLoggedIn,
+		ssrSetupLocale,
+		fetchPlugins,
+		setHrefLangLinks,
+		setLocalizedCanonicalUrl,
+		browsePlugins,
+		makeLayout
+	);
 
-	if ( isEnabled( 'plugins/ssr-categories' ) ) {
-		router(
-			`/${ langParam }/plugins/browse/:category`,
-			skipIfLoggedIn,
-			ssrSetupLocale,
-			fetchCategoryPlugins,
-			setHrefLangLinks,
-			setLocalizedCanonicalUrl,
-			browsePlugins,
-			makeLayout
-		);
-	}
+	router(
+		`/${ langParam }/plugins/browse/:category`,
+		skipIfLoggedIn,
+		ssrSetupLocale,
+		fetchCategoryPlugins,
+		setHrefLangLinks,
+		setLocalizedCanonicalUrl,
+		browsePlugins,
+		makeLayout
+	);
 
-	if ( isEnabled( 'plugins/ssr-details' ) ) {
-		router(
-			`/${ langParam }/plugins/:plugin`,
-			skipIfLoggedIn,
-			validatePlugin,
-			ssrSetupLocale,
-			fetchPlugin,
-			setHrefLangLinks,
-			setLocalizedCanonicalUrl,
-			browsePluginsOrPlugin,
-			makeLayout
-		);
-	}
+	router(
+		`/${ langParam }/plugins/:plugin`,
+		skipIfLoggedIn,
+		validatePlugin,
+		ssrSetupLocale,
+		fetchPlugin,
+		setHrefLangLinks,
+		setLocalizedCanonicalUrl,
+		browsePluginsOrPlugin,
+		makeLayout
+	);
 
 	router( [ `/${ langParam }/plugins`, `/${ langParam }/plugins/*` ], ssrSetupLocale );
 }
diff --git a/client/my-sites/plugins/index.web.js b/client/my-sites/plugins/index.web.js
@@ -1,4 +1,3 @@
-import { isEnabled } from '@automattic/calypso-config';
 import { getLanguageRouteParam } from '@automattic/i18n-utils';
 import {
 	makeLayout,
@@ -176,21 +175,19 @@ export default function ( router ) {
 		clientRender
 	);
 
-	if ( isEnabled( 'plugins/multisite-scheduled-updates' ) ) {
-		router(
-			[
-				`/${ langParam }/plugins/scheduled-updates`,
-				`/${ langParam }/plugins/scheduled-updates/:action(create)`,
-				`/${ langParam }/plugins/scheduled-updates/:action(edit)/:id`,
-			],
-			redirectLoggedOut,
-			navigation,
-			renderPluginsSidebar,
-			scheduledUpdatesMultisite,
-			makeLayout,
-			clientRender
-		);
-	}
+	router(
+		[
+			`/${ langParam }/plugins/scheduled-updates`,
+			`/${ langParam }/plugins/scheduled-updates/:action(create)`,
+			`/${ langParam }/plugins/scheduled-updates/:action(edit)/:id`,
+		],
+		redirectLoggedOut,
+		navigation,
+		renderPluginsSidebar,
+		scheduledUpdatesMultisite,
+		makeLayout,
+		clientRender
+	);
 
 	router(
 		[

diff --git a/client/performance-profiler/components/metrics-insight/index.tsx b/client/performance-profiler/components/metrics-insight/index.tsx
@@ -1,4 +1,3 @@
-import { isEnabled } from '@automattic/calypso-config';
 import { FoldableCard } from '@automattic/components';
 import styled from '@emotion/styled';
 import { useTranslate } from 'i18n-calypso';
@@ -112,7 +111,7 @@ export const MetricsInsight: React.FC< MetricsInsightProps > = ( props ) => {
 		insight,
 		hash,
 		isWpcom,
-		isEnabled( 'performance-profiler/llm' ) && retrieveInsight,
+		retrieveInsight,
 		translate.localeSlug,
 		activeTab
 	);
@@ -162,14 +161,12 @@ export const MetricsInsight: React.FC< MetricsInsightProps > = ( props ) => {
 					fullPageScreenshot={ fullPageScreenshot }
 					data={ {
 						...insight,
-						...( isEnabled( 'performance-profiler/llm' )
-							? { description: llmAnswer?.messages }
-							: {} ),
+						description: llmAnswer?.messages,
 					} }
 					secondaryArea={ tip && <Tip { ...tip } /> }
-					isLoading={ isEnabled( 'performance-profiler/llm' ) && isLoadingLlmAnswer }
+					isLoading={ isLoadingLlmAnswer }
 					isWpscanLoading={ isWpscanLoading }
-					AIGenerated={ isEnabled( 'performance-profiler/llm' ) }
+					AIGenerated
 					hash={ hash }
 					url={ props.url }
 					chatId={ llmAnswer?.chatId }

diff --git a/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx b/client/sites/components/site-preview-pane/dotcom-preview-pane.tsx
@@ -119,7 +119,7 @@ const DotcomPreviewPane = ( {
 			},
 			{
 				label: __( 'Performance' ),
-				enabled: isActiveAtomicSite && config.isEnabled( 'performance-profiler/logged-in' ),
+				enabled: isActiveAtomicSite,
 				featureIds: [ DOTCOM_SITE_PERFORMANCE ],
 			},
 			{

diff --git a/client/state/partner-portal/partner/selectors.ts b/client/state/partner-portal/partner/selectors.ts
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import find from 'lodash/find';
 import { getCurrentUser } from 'calypso/state/current-user/selectors';
 import type {
@@ -68,7 +67,7 @@ export function isA4AUser( state: PartnerPortalStore | IAppState ): boolean {
 }
 
 export function showAgencyDashboard( state: PartnerPortalStore ): boolean {
-	return config.isEnabled( 'jetpack/agency-dashboard' ) && isAgencyUser( state );
+	return isAgencyUser( state );
 }
 
 export function hasValidPaymentMethod( state: PartnerPortalStore ): boolean {

diff --git a/config/development.json b/config/development.json
@@ -41,7 +41,6 @@
 		"calypso/all-domain-management": false,
 		"calypso/big-sky": true,
 		"calypso/help-center": true,
-		"calypsoify/plugins": true,
 		"cancellation-offers": true,
 		"checkout/ebanx-pix": true,
 		"checkout/google-pay": true,
@@ -87,7 +86,6 @@
 		"importers/newsletter": true,
 		"importers/substack": true,
 		"individual-subscriber-stats": true,
-		"jetpack/agency-dashboard": true,
 		"jetpack/ai-assistant-request-limit": true,
 		"jetpack/ai-logo-generator": true,
 		"jetpack/api-cache": true,
@@ -104,7 +102,6 @@
 		"jetpack/golden-token": true,
 		"jetpack/magic-link-signup": true,
 		"jetpack/manage-simple-sites": true,
-		"jetpack/plugin-management": true,
 		"jetpack/pricing-add-boost-social": true,
 		"jetpack/pricing-page-annual-only": true,
 		"jetpack/sharing-buttons-block-enabled": true,
@@ -168,19 +165,13 @@
 		"p2/p2-plus": true,
 		"p2-enabled": false,
 		"page/export": true,
-		"performance-profiler/llm": true,
-		"performance-profiler/logged-in": true,
 		"plans/hosting-trial": true,
 		"plans/migration-trial": true,
 		"plans/personal-plan": true,
 		"plans/pro-plan": false,
 		"plans/starter-plan": false,
 		"plans/updated-storage-labels": true,
 		"plans/upgradeable-storage": true,
-		"plugins/multisite-scheduled-updates": true,
-		"plugins/ssr-categories": true,
-		"plugins/ssr-details": true,
-		"plugins/ssr-landing": true,
 		"post-editor/checkout-overlay": true,
 		"post-list/qr-code-link": true,
 		"press-this": true,

diff --git a/config/horizon.json b/config/horizon.json
@@ -19,7 +19,6 @@
 		"calypso/all-domain-management": false,
 		"calypso/big-sky": true,
 		"calypso/help-center": true,
-		"calypsoify/plugins": true,
 		"cancellation-offers": true,
 		"catch-js-errors": true,
 		"checkout/ebanx-pix": true,
@@ -107,10 +106,6 @@
 		"plans/starter-plan": false,
 		"plans/updated-storage-labels": true,
 		"plans/upgradeable-storage": true,
-		"plugins/multisite-scheduled-updates": true,
-		"plugins/ssr-categories": true,
-		"plugins/ssr-details": true,
-		"plugins/ssr-landing": true,
 		"post-editor/checkout-overlay": true,
 		"post-list/qr-code-link": false,
 		"press-this": true,

diff --git a/config/jetpack-cloud-development.json b/config/jetpack-cloud-development.json
@@ -44,14 +44,12 @@
 		"individual-subscriber-stats": true,
 		"jetpack-cloud": true,
 		"jetpack/activity-log-sharing": true,
-		"jetpack/agency-dashboard": true,
 		"jetpack/backup-messaging-i3": true,
 		"jetpack/backup-restore-preflight-checks": true,
 		"jetpack/backup-retention-settings": true,
 		"jetpack/backup-schedule-setting": true,
 		"jetpack/card-addition-improvements": true,
 		"jetpack/golden-token": true,
-		"jetpack/plugin-management": true,
 		"jetpack/pricing-add-boost-social": true,
 		"jetpack/pricing-page": true,
 		"jetpack/pricing-page-annual-only": true,