Get rid of refreshJetpackSocialSettings action

Automattic · Oct 31, 2024 · 532ab86 · 532ab86
1 parent bd937f3
commit 532ab86
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 74 deletions.
diff --git a/projects/js-packages/publicize-components/index.ts b/projects/js-packages/publicize-components/index.ts
@@ -17,7 +17,6 @@ export { default as TemplatePickerButton } from './src/components/social-image-g
 export { default as PublicizePanel } from './src/components/panel';
 export { default as ReviewPrompt } from './src/components/review-prompt';
 export { default as PostPublishPanels } from './src/components/post-publish-panels';
-export { default as RefreshJetpackSocialSettingsWrapper } from './src/components/refresh-jetpack-social-settings';
 export { default as ConnectionManagement } from './src/components/connection-management';
 
 export { default as useSocialMediaConnections } from './src/hooks/use-social-media-connections';

diff --git a/.../js-packages/publicize-components/src/components/refresh-jetpack-social-settings/index.js b/.../js-packages/publicize-components/src/components/refresh-jetpack-social-settings/index.js
diff --git a/projects/js-packages/publicize-components/src/social-store/actions/index.js b/projects/js-packages/publicize-components/src/social-store/actions/index.js
@@ -1,13 +1,11 @@
 import * as connectionData from './connection-data';
 import siteSettingActions from './jetpack-settings';
-import jetpackSocialSettings from './jetpack-social-settings';
 import * as shareStatus from './share-status';
 import socialNotesSettings from './social-notes-settings';
 
 const actions = {
 	...shareStatus,
 	...siteSettingActions,
-	...jetpackSocialSettings,
 	...connectionData,
 	...socialNotesSettings,
 };

diff --git a/...ects/js-packages/publicize-components/src/social-store/actions/jetpack-social-settings.js b/...ects/js-packages/publicize-components/src/social-store/actions/jetpack-social-settings.js
diff --git a/projects/plugins/jetpack/_inc/client/sharing/publicize.jsx b/projects/plugins/jetpack/_inc/client/sharing/publicize.jsx
@@ -1,9 +1,5 @@
 import { getRedirectUrl } from '@automattic/jetpack-components';
-import {
-	ConnectionManagement,
-	RefreshJetpackSocialSettingsWrapper,
-	features,
-} from '@automattic/jetpack-publicize-components';
+import { ConnectionManagement, features } from '@automattic/jetpack-publicize-components';
 import { siteHasFeature } from '@automattic/jetpack-script-data';
 import { createInterpolateElement } from '@wordpress/element';
 import { __, _x } from '@wordpress/i18n';
@@ -151,21 +147,17 @@ export const Publicize = withModuleSettingsFormHelpers(
 									{ __( 'Automatically share your posts to social networks', 'jetpack' ) }
 								</span>
 							</ModuleToggle>
-							<RefreshJetpackSocialSettingsWrapper
-								shouldRefresh={ ! isActive && this.props.isSavingAnyOption( 'publicize' ) }
-							>
-								{ shouldShowChildElements && hasSocialImageGenerator && (
-									<SocialImageGeneratorSection />
-								) }
-								{ isActive &&
-								isLinked &&
-								useAdminUiV1 &&
-								! this.props.isSavingAnyOption( 'publicize' ) ? (
-									<FormFieldset className="jp-settings__connection-management">
-										<ConnectionManagement />
-									</FormFieldset>
-								) : null }
-							</RefreshJetpackSocialSettingsWrapper>
+							{ shouldShowChildElements && hasSocialImageGenerator && (
+								<SocialImageGeneratorSection />
+							) }
+							{ isActive &&
+							isLinked &&
+							useAdminUiV1 &&
+							! this.props.isSavingAnyOption( 'publicize' ) ? (
+								<FormFieldset className="jp-settings__connection-management">
+									<ConnectionManagement />
+								</FormFieldset>
+							) : null }
 						</SettingsGroup>
 					) }
 					{ isActive && ! useAdminUiV1 && configCard() }

diff --git a/projects/plugins/social/src/js/components/admin-page/index.jsx b/projects/plugins/social/src/js/components/admin-page/index.jsx
@@ -13,8 +13,8 @@ import {
 	features,
 } from '@automattic/jetpack-publicize-components';
 import { siteHasFeature } from '@automattic/jetpack-script-data';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useState, useCallback, useEffect, useRef } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
+import { useState, useCallback } from '@wordpress/element';
 import React from 'react';
 import PricingPage from '../pricing-page';
 import SocialImageGeneratorToggle from '../social-image-generator-toggle';
@@ -32,8 +32,6 @@ const Admin = () => {
 	const showConnectionCard = ! isRegistered || ! isUserConnected;
 	const [ forceDisplayPricingPage, setForceDisplayPricingPage ] = useState( false );
 
-	const refreshJetpackSocialSettings = useDispatch( socialStore ).refreshJetpackSocialSettings;
-
 	const onPricingPageDismiss = useCallback( () => setForceDisplayPricingPage( false ), [] );
 
 	const { isModuleEnabled, showPricingPage, pluginVersion, isUpdatingJetpackSettings } = useSelect(
@@ -48,19 +46,6 @@ const Admin = () => {
 		}
 	);
 
-	const hasEnabledModule = useRef( isModuleEnabled );
-
-	useEffect( () => {
-		if (
-			isModuleEnabled &&
-			! hasEnabledModule.current &&
-			siteHasFeature( features.IMAGE_GENERATOR )
-		) {
-			hasEnabledModule.current = true;
-			refreshJetpackSocialSettings();
-		}
-	}, [ isModuleEnabled, refreshJetpackSocialSettings ] );
-
 	const moduleName = `Jetpack Social ${ pluginVersion }`;
 
 	if ( showConnectionCard ) {