♻️ Adjust “webhooks” property in Redux state

modules/ppcp-settings/resources/js/data/common/hooks.js

@@ -42,7 +42,6 @@ const useHooks = () => {
 	// Persistent accessors.
 	const isSandboxMode = usePersistent( 'useSandbox' );
 	const isManualConnectionMode = usePersistent( 'useManualConnection' );
-	const webhooks = usePersistent( 'webhooks' );
 	const merchant = useSelect(
 		( select ) => select( STORE_NAME ).merchant(),
 		[]
@@ -57,6 +56,10 @@ const useHooks = () => {
 		( select ) => select( STORE_NAME ).features(),
 		[]
 	);
+	const webhooks = useSelect(
+		( select ) => select( STORE_NAME ).webhooks(),
+		[]
+	);
 
 	const savePersistent = async ( setter, value ) => {
 		setter( value );

modules/ppcp-settings/resources/js/data/common/reducer.js

@@ -45,12 +45,13 @@ const defaultTransient = Object.freeze( {
 			enabled: false,
 		},
 	} ),
+
+	webhooks: Object.freeze( [] ),
 } );
 
 const defaultPersistent = Object.freeze( {
 	useSandbox: false,
 	useManualConnection: false,
-	webhooks: [],
 } );
 
 // Reducer logic.
@@ -105,16 +106,18 @@ const commonReducer = createReducer( defaultTransient, defaultPersistent, {
 		const newState = setPersistent( state, payload.data );
 
 		// Populate read-only properties.
-		[ 'wooSettings', 'merchant', 'features' ].forEach( ( key ) => {
-			if ( ! payload[ key ] ) {
-				return;
-			}
+		[ 'wooSettings', 'merchant', 'features', 'webhooks' ].forEach(
+			( key ) => {
+				if ( ! payload[ key ] ) {
+					return;
+				}
 
-			newState[ key ] = Object.freeze( {
-				...newState[ key ],
-				...payload[ key ],
-			} );
-		} );
+				newState[ key ] = Object.freeze( {
+					...newState[ key ],
+					...payload[ key ],
+				} );
+			}
+		);
 
 		return newState;
 	},

modules/ppcp-settings/resources/js/data/common/selectors.js

@@ -16,8 +16,14 @@ export const persistentData = ( state ) => {
 };
 
 export const transientData = ( state ) => {
-	const { data, merchant, features, wooSettings, ...transientState } =
-		getState( state );
+	const {
+		data,
+		merchant,
+		features,
+		wooSettings,
+		webhooks,
+		...transientState
+	} = getState( state );
 	return transientState || EMPTY_OBJ;
 };
 

modules/ppcp-settings/src/Endpoint/WebhookSettingsEndpoint.php

@@ -118,7 +118,7 @@ class WebhookSettingsEndpoint extends RestEndpoint {
 		try {
 			$webhook_list   = ( $this->webhook_endpoint->list() )[0];
 			$webhook_events = array_map(
-				function ( stdClass $webhook ) {
+				static function ( stdClass $webhook ) {
 					return strtolower( $webhook->name );
 				},
 				$webhook_list->event_types()