Update UI + store functions

Automattic · Nov 14, 2023 · 012eb2c · 012eb2c
1 parent d00d07e
commit 012eb2c
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 18 deletions.
diff --git a/projects/js-packages/publicize-components/src/components/auto-conversion/toggle/index.tsx b/projects/js-packages/publicize-components/src/components/auto-conversion/toggle/index.tsx
@@ -52,7 +52,7 @@ const AutoConversionToggle: React.FC< AutoConversionToggleProps > = ( {
 
 	const toggleStatus = useCallback( () => {
 		const newOption = {
-			image: ! isEnabled,
+			enabled: ! isEnabled,
 		};
 		updateOptions( newOption );
 	}, [ isEnabled, updateOptions ] );

diff --git a/...blicize-components/src/components/social-image-generator/template-picker/button/index.tsx b/...blicize-components/src/components/social-image-generator/template-picker/button/index.tsx
@@ -22,7 +22,7 @@ const TemplatePickerButton: React.FC = () => {
 
 	useEffect( () => {
 		if ( currentTemplate ) {
-			const newOption = { defaults: { template: currentTemplate } };
+			const newOption = { template: currentTemplate };
 			updateOptions( newOption );
 		}
 	}, [ currentTemplate, updateOptions ] );

diff --git a/...cts/js-packages/publicize-components/src/social-store/actions/auto-conversion-settings.js b/...cts/js-packages/publicize-components/src/social-store/actions/auto-conversion-settings.js
@@ -20,7 +20,7 @@ export function* updateAutoConversionSettings( settings ) {
 		yield setAutoConversionSettings( settings );
 		yield updateAutoConversionSettingsControl( settings );
 		const updatedSettings = yield fetchAutoConversionSettings();
-		yield setAutoConversionSettings( updatedSettings );
+		yield setAutoConversionSettings( updatedSettings.jetpack_social_autoconvert_images );
 		return true;
 	} catch ( e ) {
 		const oldSettings = select( SOCIAL_STORE_ID ).getAutoConversionSettings();
@@ -41,7 +41,7 @@ export function* refreshAutoConversionSettings() {
 	try {
 		yield setUpdatingAutoConversionSettings();
 		const updatedSettings = yield fetchAutoConversionSettings();
-		yield setAutoConversionSettings( updatedSettings );
+		yield setAutoConversionSettings( updatedSettings.jetpack_social_autoconvert_images );
 		return true;
 	} catch ( e ) {
 		return false;

diff --git a/...packages/publicize-components/src/social-store/actions/social-image-generator-settings.js b/...packages/publicize-components/src/social-store/actions/social-image-generator-settings.js
@@ -20,7 +20,9 @@ export function* updateSocialImageGeneratorSettings( settings ) {
 		yield setSocialImageGeneratorSettings( settings );
 		yield updateSocialImageGeneratorSettingsControl( settings );
 		const updatedSettings = yield fetchSocialImageGeneratorSettings();
-		yield setSocialImageGeneratorSettings( updatedSettings );
+		yield setSocialImageGeneratorSettings(
+			updatedSettings.jetpack_social_image_generator_settings
+		);
 		return true;
 	} catch ( e ) {
 		const oldSettings = select( SOCIAL_STORE_ID ).getSocialImageGeneratorSettings();
@@ -69,7 +71,9 @@ export function* refreshSocialImageGeneratorSettings() {
 	try {
 		yield setUpdatingSocialImageGeneratorSettings();
 		const updatedSettings = yield fetchSocialImageGeneratorSettings();
-		yield setSocialImageGeneratorSettings( updatedSettings );
+		yield setSocialImageGeneratorSettings(
+			updatedSettings.jetpack_social_image_generator_settings
+		);
 		return true;
 	} catch ( e ) {
 		return false;

diff --git a/projects/js-packages/publicize-components/src/social-store/controls.js b/projects/js-packages/publicize-components/src/social-store/controls.js
@@ -92,23 +92,31 @@ export default {
 		} );
 	},
 	[ FETCH_SOCIAL_IMAGE_GENERATOR_SETTINGS ]: function () {
-		return apiFetch( { path: '/jetpack/v4/social-image-generator/settings' } );
+		return apiFetch( {
+			path: '/wp/v2/settings?_fields=jetpack_social_image_generator_settings',
+		} );
 	},
 	[ UPDATE_SOCIAL_IMAGE_GENERATOR_SETTINGS ]: function ( action ) {
 		return apiFetch( {
-			path: '/jetpack/v4/social-image-generator/settings',
+			path: '/wp/v2/settings',
 			method: 'POST',
-			data: action.settings,
+			data: {
+				jetpack_social_image_generator_settings: action.settings,
+			},
 		} );
 	},
 	[ FETCH_AUTO_CONVERSION_SETTINGS ]: function () {
-		return apiFetch( { path: '/jetpack/v4/auto-conversion/settings' } );
+		return apiFetch( {
+			path: '/wp/v2/settings?_fields=jetpack_social_autoconvert_images',
+		} );
 	},
 	[ UPDATE_AUTO_CONVERSION_SETTINGS ]: function ( action ) {
 		return apiFetch( {
-			path: '/jetpack/v4/auto-conversion/settings',
+			path: '/wp/v2/settings',
 			method: 'POST',
-			data: action.settings,
+			data: {
+				jetpack_social_autoconvert_images: action.settings,
+			},
 		} );
 	},
 };
diff --git a/projects/js-packages/publicize-components/src/social-store/resolvers.js b/projects/js-packages/publicize-components/src/social-store/resolvers.js
@@ -38,7 +38,7 @@ export function* getSocialImageGeneratorSettings() {
 	try {
 		const settings = yield fetchSocialImageGeneratorSettings();
 		if ( settings ) {
-			return setSocialImageGeneratorSettings( settings );
+			return setSocialImageGeneratorSettings( settings.jetpack_social_image_generator_settings );
 		}
 	} catch ( e ) {
 		// TODO: Add proper error handling here
@@ -56,7 +56,7 @@ export function* getAutoConversionSettings() {
 	try {
 		const settings = yield fetchAutoConversionSettings();
 		if ( settings ) {
-			return setAutoConversionSettings( settings );
+			return setAutoConversionSettings( settings.jetpack_social_autoconvert_images );
 		}
 	} catch ( e ) {
 		// TODO: Add proper error handling here

diff --git a/...s/js-packages/publicize-components/src/social-store/selectors/auto-conversion-settings.js b/...s/js-packages/publicize-components/src/social-store/selectors/auto-conversion-settings.js
@@ -1,7 +1,7 @@
 const autoConversionSettingsSelectors = {
 	getAutoConversionSettings: state => state.autoConversionSettings,
 	isAutoConversionAvailable: state => state.autoConversionSettings.available,
-	isAutoConversionEnabled: state => state.autoConversionSettings.image,
+	isAutoConversionEnabled: state => state.autoConversionSettings.enabled,
 	isAutoConversionSettingsUpdating: state => state.autoConversionSettings.isUpdating,
 };
 

diff --git a/...ckages/publicize-components/src/social-store/selectors/social-image-generator-settings.js b/...ckages/publicize-components/src/social-store/selectors/social-image-generator-settings.js
@@ -3,8 +3,7 @@ const socialImageGeneratorSettingsSelectors = {
 	isSocialImageGeneratorAvailable: state => state.socialImageGeneratorSettings.available,
 	isSocialImageGeneratorEnabled: state => state.socialImageGeneratorSettings.enabled,
 	isUpdatingSocialImageGeneratorSettings: state => state.socialImageGeneratorSettings.isUpdating,
-	getSocialImageGeneratorDefaultTemplate: state =>
-		state.socialImageGeneratorSettings.defaultTemplate,
+	getSocialImageGeneratorDefaultTemplate: state => state.socialImageGeneratorSettings.template,
 };
 
 export default socialImageGeneratorSettingsSelectors;
diff --git a/projects/plugins/social/src/js/components/auto-conversion-toggle/index.tsx b/projects/plugins/social/src/js/components/auto-conversion-toggle/index.tsx
@@ -38,7 +38,7 @@ const AutoConversionToggle: React.FC< AutoConversionToggleProps > = ( {
 
 	const toggleStatus = useCallback( () => {
 		const newOption = {
-			image: ! isEnabled,
+			enabled: ! isEnabled,
 		};
 		updateOptions( newOption );
 	}, [ isEnabled, updateOptions ] );