@automattic/jetpack-shared-extension-utils 0.13.7 → 0.13.9

package/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.13.9] - 2024-01-18
+### Changed
+- Update dependencies.
+
+## [0.13.8] - 2024-01-08
+### Added
+- Remove unused logic from the modules store and cover store with tests. [#34835]
+
+### Changed
+- Updated useModuleStatus hook to use module_status redux store. [#34845]
+
 ## [0.13.7] - 2024-01-04
 ### Changed
 - Updated package dependencies. [#34815] [#34816]
@@ -313,6 +324,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Core: prepare utility for release
 
+[0.13.9]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.13.8...0.13.9
+[0.13.8]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.13.7...0.13.8
 [0.13.7]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.13.6...0.13.7
 [0.13.6]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.13.5...0.13.6
 [0.13.5]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.13.4...0.13.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-shared-extension-utils",
-	"version": "0.13.7",
+	"version": "0.13.9",
 	"description": "Utility functions used by the block editor extensions",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/shared-extension-utils/#readme",
 	"bugs": {
@@ -18,8 +18,8 @@
 	},
 	"dependencies": {
 		"@automattic/jetpack-analytics": "^0.1.29",
-		"@automattic/jetpack-components": "^0.45.10",
-		"@automattic/jetpack-connection": "^0.30.12",
+		"@automattic/jetpack-components": "^0.46.0",
+		"@automattic/jetpack-connection": "^0.31.0",
 		"@wordpress/api-fetch": "6.45.0",
 		"@wordpress/compose": "6.25.0",
 		"@wordpress/data": "9.18.0",

package/src/hooks/use-module-status/index.js

@@ -1,66 +1,6 @@
-import apiFetch from '@wordpress/api-fetch';
-import { useEffect, useState, useMemo, useCallback } from '@wordpress/element';
-import { isSimpleSite } from '../../site-type-utils';
-
-/**
- * Fetch information about all Jetpack modules.
- *
- * @returns {Promise<object>} Details about all available modules on the site.
- */
-async function fetchModules() {
-	try {
-		const result = await apiFetch( {
-			path: `/jetpack/v4/module/all`,
-			method: 'GET',
-		} );
-		return result;
-	} catch ( error ) {
-		return error.message;
-	}
-}
-
-/**
- * Update a Jetpack module's status.
- *
- * @param {*} name - The module's name.
- * @param {*} toggle - New module status.
- * @returns {Promise<boolean>} Promise that resolves to the new module status.
- */
-async function changeModuleStatus( name, toggle ) {
-	const result = await apiFetch( {
-		path: `/jetpack/v4/module/${ name }/active`,
-		method: 'POST',
-		data: {
-			active: toggle,
-		},
-	} );
-	return result;
-}
-
-/**
- * Determine whethher a Jetpack module is active.
- *
- * @param {string} name - The module's name
- * @returns {Promise<boolean>} Whether the module is active.
- */
-async function isJetpackModuleActive( name ) {
-	// On WordPress.com Simple sites, all modules are always active.
-	if ( isSimpleSite() ) {
-		return true;
-	}
-
-	// Fetch module info.
-	try {
-		// Check if module is active.
-		const modulesInfo = await fetchModules();
-		if ( ! modulesInfo || ! modulesInfo.hasOwnProperty( name ) ) {
-			return false;
-		}
-		return !! modulesInfo[ name ].activated;
-	} catch ( e ) {
-		return false;
-	}
-}
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useMemo, useCallback } from '@wordpress/element';
+import { JETPACK_MODULES_STORE_ID } from '../../modules-state';
 
 /**
  * Manage a Jetpack module's status (get and set).
@@ -69,40 +9,27 @@ async function isJetpackModuleActive( name ) {
  * @returns {boolean} Whether the module is active.
  */
 const useModuleStatus = name => {
-	const [ isLoadingModules, setIsLoadingModules ] = useState( Boolean( name ) );
-	const [ isChangingStatus, setIsChangingStatus ] = useState( false );
-	const [ isModuleActive, setModuleStatus ] = useState( false );
-
-	// Get module status.
-	useEffect( () => {
-		if ( ! name ) {
-			return;
-		}
-
-		setIsLoadingModules( true );
+	const { isModuleActive, isChangingStatus, isLoadingModules } = useSelect(
+		selectData => {
+			const data = selectData( JETPACK_MODULES_STORE_ID );
+			return {
+				isModuleActive: data.isModuleActive( name ),
+				isChangingStatus: data.isModuleUpdating( name ),
+				isLoadingModules: data.areModulesLoading( name ),
+			};
+		},
+		[ JETPACK_MODULES_STORE_ID ]
+	);
 
-		isJetpackModuleActive( name ).then( moduleStatus => {
-			setModuleStatus( moduleStatus );
-			setIsLoadingModules( false );
-		} );
-	}, [ name ] );
+	const { updateJetpackModuleStatus } = useDispatch( JETPACK_MODULES_STORE_ID );
 
 	const changeStatus = useCallback(
-		newModuleStatus => {
-			if ( ! name || isModuleActive === newModuleStatus ) {
-				return;
-			}
-			setIsChangingStatus( true );
-			changeModuleStatus( name, newModuleStatus )
-				.then( () => {
-					setModuleStatus( newModuleStatus );
-					setIsChangingStatus( false );
-				} )
-				.catch( () => {
-					setIsChangingStatus( false );
-				} );
-		},
-		[ name, isModuleActive ]
+		value =>
+			updateJetpackModuleStatus( {
+				name,
+				active: value,
+			} ),
+		[ name, updateJetpackModuleStatus ]
 	);
 
 	return useMemo(

package/src/modules-state/actions.js

@@ -20,11 +20,7 @@ export const SET_MODULE_UPDATING = 'SET_MODULE_UPDATING';
  */
 export function* updateJetpackModuleStatus( settings ) {
 	try {
-		const originalData = select( JETPACK_MODULES_STORE_ID ).getJetpackModules();
 		yield setIsUpdating( settings.name, true );
-		if ( originalData.data?.[ settings.name ]?.activated !== settings.active ) {
-			yield setJetpackModules( originalData );
-		}
 		yield updateJetpackModuleStatusControl( settings );
 		const data = yield fetchJetpackModules();
 		yield setJetpackModules( { data } );