mirror of
https://github.com/woocommerce/woocommerce-paypal-payments.git
synced 2025-09-06 14:57:26 +08:00
♻️ Rename reducer methods for better clarity
This commit is contained in:
parent
4b90f84536
commit
4de4e05829
7 changed files with 49 additions and 49 deletions
|
@ -7,7 +7,7 @@
|
||||||
* @file
|
* @file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createReducer, createSetters } from '../utils';
|
import { createReducer, createReducerSetters } from '../utils';
|
||||||
import ACTION_TYPES from './action-types';
|
import ACTION_TYPES from './action-types';
|
||||||
|
|
||||||
// Store structure.
|
// Store structure.
|
||||||
|
@ -25,21 +25,21 @@ const defaultPersistent = Object.freeze( {
|
||||||
|
|
||||||
// Reducer logic.
|
// Reducer logic.
|
||||||
|
|
||||||
const [ setTransient, setPersistent ] = createSetters(
|
const [ changeTransient, changePersistent ] = createReducerSetters(
|
||||||
defaultTransient,
|
defaultTransient,
|
||||||
defaultPersistent
|
defaultPersistent
|
||||||
);
|
);
|
||||||
|
|
||||||
const reducer = createReducer( defaultTransient, defaultPersistent, {
|
const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
||||||
setTransient( state, payload ),
|
changeTransient( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload ),
|
changePersistent( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.RESET ]: ( state ) => {
|
[ ACTION_TYPES.RESET ]: ( state ) => {
|
||||||
const cleanState = setTransient(
|
const cleanState = changeTransient(
|
||||||
setPersistent( state, defaultPersistent ),
|
changePersistent( state, defaultPersistent ),
|
||||||
defaultTransient
|
defaultTransient
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
},
|
},
|
||||||
|
|
||||||
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) =>
|
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload.data ),
|
changePersistent( state, payload.data ),
|
||||||
} );
|
} );
|
||||||
|
|
||||||
export default reducer;
|
export default reducer;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* @file
|
* @file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createReducer, createSetters } from '../utils';
|
import { createReducer, createReducerSetters } from '../utils';
|
||||||
import ACTION_TYPES from './action-types';
|
import ACTION_TYPES from './action-types';
|
||||||
|
|
||||||
// Store structure.
|
// Store structure.
|
||||||
|
@ -57,21 +57,21 @@ const defaultPersistent = Object.freeze( {
|
||||||
|
|
||||||
// Reducer logic.
|
// Reducer logic.
|
||||||
|
|
||||||
const [ setTransient, setPersistent ] = createSetters(
|
const [ changeTransient, changePersistent ] = createReducerSetters(
|
||||||
defaultTransient,
|
defaultTransient,
|
||||||
defaultPersistent
|
defaultPersistent
|
||||||
);
|
);
|
||||||
|
|
||||||
const commonReducer = createReducer( defaultTransient, defaultPersistent, {
|
const commonReducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, action ) =>
|
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, action ) =>
|
||||||
setTransient( state, action ),
|
changeTransient( state, action ),
|
||||||
|
|
||||||
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, action ) =>
|
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, action ) =>
|
||||||
setPersistent( state, action ),
|
changePersistent( state, action ),
|
||||||
|
|
||||||
[ ACTION_TYPES.RESET ]: ( state ) => {
|
[ ACTION_TYPES.RESET ]: ( state ) => {
|
||||||
const cleanState = setTransient(
|
const cleanState = changeTransient(
|
||||||
setPersistent( state, defaultPersistent ),
|
changePersistent( state, defaultPersistent ),
|
||||||
defaultTransient
|
defaultTransient
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ const commonReducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
},
|
},
|
||||||
|
|
||||||
[ ACTION_TYPES.START_ACTIVITY ]: ( state, payload ) => {
|
[ ACTION_TYPES.START_ACTIVITY ]: ( state, payload ) => {
|
||||||
return setTransient( state, {
|
return changeTransient( state, {
|
||||||
activities: new Map( state.activities ).set(
|
activities: new Map( state.activities ).set(
|
||||||
payload.id,
|
payload.id,
|
||||||
payload.description
|
payload.description
|
||||||
|
@ -96,7 +96,7 @@ const commonReducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
[ ACTION_TYPES.STOP_ACTIVITY ]: ( state, payload ) => {
|
[ ACTION_TYPES.STOP_ACTIVITY ]: ( state, payload ) => {
|
||||||
const newActivities = new Map( state.activities );
|
const newActivities = new Map( state.activities );
|
||||||
newActivities.delete( payload.id );
|
newActivities.delete( payload.id );
|
||||||
return setTransient( state, { activities: newActivities } );
|
return changeTransient( state, { activities: newActivities } );
|
||||||
},
|
},
|
||||||
|
|
||||||
[ ACTION_TYPES.DO_REFRESH_MERCHANT ]: ( state ) => ( {
|
[ ACTION_TYPES.DO_REFRESH_MERCHANT ]: ( state ) => ( {
|
||||||
|
@ -106,7 +106,7 @@ const commonReducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
} ),
|
} ),
|
||||||
|
|
||||||
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) => {
|
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) => {
|
||||||
const newState = setPersistent( state, payload.data );
|
const newState = changePersistent( state, payload.data );
|
||||||
|
|
||||||
// Populate read-only properties.
|
// Populate read-only properties.
|
||||||
[ 'wooSettings', 'merchant', 'features', 'webhooks' ].forEach(
|
[ 'wooSettings', 'merchant', 'features', 'webhooks' ].forEach(
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* @file
|
* @file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createReducer, createSetters } from '../utils';
|
import { createReducer, createReducerSetters } from '../utils';
|
||||||
import ACTION_TYPES from './action-types';
|
import ACTION_TYPES from './action-types';
|
||||||
|
|
||||||
// Store structure.
|
// Store structure.
|
||||||
|
@ -36,21 +36,21 @@ const defaultPersistent = Object.freeze( {
|
||||||
|
|
||||||
// Reducer logic.
|
// Reducer logic.
|
||||||
|
|
||||||
const [ setTransient, setPersistent ] = createSetters(
|
const [ changeTransient, changePersistent ] = createReducerSetters(
|
||||||
defaultTransient,
|
defaultTransient,
|
||||||
defaultPersistent
|
defaultPersistent
|
||||||
);
|
);
|
||||||
|
|
||||||
const onboardingReducer = createReducer( defaultTransient, defaultPersistent, {
|
const onboardingReducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
||||||
setTransient( state, payload ),
|
changeTransient( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload ),
|
changePersistent( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.RESET ]: ( state ) => {
|
[ ACTION_TYPES.RESET ]: ( state ) => {
|
||||||
const cleanState = setTransient(
|
const cleanState = changeTransient(
|
||||||
setPersistent( state, defaultPersistent ),
|
changePersistent( state, defaultPersistent ),
|
||||||
defaultTransient
|
defaultTransient
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -62,9 +62,9 @@ const onboardingReducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
},
|
},
|
||||||
|
|
||||||
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) => {
|
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) => {
|
||||||
const newState = setPersistent( state, payload.data );
|
const newState = changePersistent( state, payload.data );
|
||||||
|
|
||||||
// Flags are not updated by `setPersistent()`.
|
// Flags are not updated by `changePersistent()`.
|
||||||
if ( payload.flags ) {
|
if ( payload.flags ) {
|
||||||
newState.flags = Object.freeze( {
|
newState.flags = Object.freeze( {
|
||||||
...newState.flags,
|
...newState.flags,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* @file
|
* @file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createReducer, createSetters } from '../utils';
|
import { createReducer, createReducerSetters } from '../utils';
|
||||||
import ACTION_TYPES from './action-types';
|
import ACTION_TYPES from './action-types';
|
||||||
|
|
||||||
// Store structure.
|
// Store structure.
|
||||||
|
@ -41,21 +41,21 @@ const defaultPersistent = Object.freeze( {
|
||||||
|
|
||||||
// Reducer logic.
|
// Reducer logic.
|
||||||
|
|
||||||
const [ setTransient, setPersistent ] = createSetters(
|
const [ changeTransient, changePersistent ] = createReducerSetters(
|
||||||
defaultTransient,
|
defaultTransient,
|
||||||
defaultPersistent
|
defaultPersistent
|
||||||
);
|
);
|
||||||
|
|
||||||
const reducer = createReducer( defaultTransient, defaultPersistent, {
|
const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
||||||
setTransient( state, payload ),
|
changeTransient( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload ),
|
changePersistent( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.RESET ]: ( state ) => {
|
[ ACTION_TYPES.RESET ]: ( state ) => {
|
||||||
const cleanState = setTransient(
|
const cleanState = changeTransient(
|
||||||
setPersistent( state, defaultPersistent ),
|
changePersistent( state, defaultPersistent ),
|
||||||
defaultTransient
|
defaultTransient
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
},
|
},
|
||||||
|
|
||||||
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) =>
|
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload.data ),
|
changePersistent( state, payload.data ),
|
||||||
} );
|
} );
|
||||||
|
|
||||||
export default reducer;
|
export default reducer;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* @file
|
* @file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createReducer, createSetters } from '../utils';
|
import { createReducer, createReducerSetters } from '../utils';
|
||||||
import ACTION_TYPES from './action-types';
|
import ACTION_TYPES from './action-types';
|
||||||
|
|
||||||
// Store structure.
|
// Store structure.
|
||||||
|
@ -47,7 +47,7 @@ const defaultPersistent = Object.freeze( {
|
||||||
|
|
||||||
// Reducer logic.
|
// Reducer logic.
|
||||||
|
|
||||||
const [ setTransient, setPersistent ] = createSetters(
|
const [ changeTransient, changePersistent ] = createReducerSetters(
|
||||||
defaultTransient,
|
defaultTransient,
|
||||||
defaultPersistent
|
defaultPersistent
|
||||||
);
|
);
|
||||||
|
@ -64,7 +64,7 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
* @return {Object} Updated state
|
* @return {Object} Updated state
|
||||||
*/
|
*/
|
||||||
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) => {
|
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) => {
|
||||||
return setTransient( state, payload );
|
return changeTransient( state, payload );
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -75,7 +75,7 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
* @return {Object} Updated state
|
* @return {Object} Updated state
|
||||||
*/
|
*/
|
||||||
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload ),
|
changePersistent( state, payload ),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resets state to defaults while maintaining initialization status
|
* Resets state to defaults while maintaining initialization status
|
||||||
|
@ -84,8 +84,8 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
* @return {Object} Reset state
|
* @return {Object} Reset state
|
||||||
*/
|
*/
|
||||||
[ ACTION_TYPES.RESET ]: ( state ) => {
|
[ ACTION_TYPES.RESET ]: ( state ) => {
|
||||||
const cleanState = setTransient(
|
const cleanState = changeTransient(
|
||||||
setPersistent( state, defaultPersistent ),
|
changePersistent( state, defaultPersistent ),
|
||||||
defaultTransient
|
defaultTransient
|
||||||
);
|
);
|
||||||
cleanState.isReady = true; // Keep initialization flag
|
cleanState.isReady = true; // Keep initialization flag
|
||||||
|
@ -101,7 +101,7 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
* @return {Object} Hydrated state
|
* @return {Object} Hydrated state
|
||||||
*/
|
*/
|
||||||
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) =>
|
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload.data ),
|
changePersistent( state, payload.data ),
|
||||||
} );
|
} );
|
||||||
|
|
||||||
export default reducer;
|
export default reducer;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* @file
|
* @file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createReducer, createSetters } from '../utils';
|
import { createReducer, createReducerSetters } from '../utils';
|
||||||
import ACTION_TYPES from './action-types';
|
import ACTION_TYPES from './action-types';
|
||||||
import {
|
import {
|
||||||
STYLING_COLORS,
|
STYLING_COLORS,
|
||||||
|
@ -85,21 +85,21 @@ const sanitizeLocation = ( oldDetails, newDetails ) => {
|
||||||
|
|
||||||
// Reducer logic.
|
// Reducer logic.
|
||||||
|
|
||||||
const [ setTransient, setPersistent ] = createSetters(
|
const [ changeTransient, changePersistent ] = createReducerSetters(
|
||||||
defaultTransient,
|
defaultTransient,
|
||||||
defaultPersistent
|
defaultPersistent
|
||||||
);
|
);
|
||||||
|
|
||||||
const reducer = createReducer( defaultTransient, defaultPersistent, {
|
const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_TRANSIENT ]: ( state, payload ) =>
|
||||||
setTransient( state, payload ),
|
changeTransient( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
[ ACTION_TYPES.SET_PERSISTENT ]: ( state, payload ) =>
|
||||||
setPersistent( state, payload ),
|
changePersistent( state, payload ),
|
||||||
|
|
||||||
[ ACTION_TYPES.RESET ]: ( state ) => {
|
[ ACTION_TYPES.RESET ]: ( state ) => {
|
||||||
const cleanState = setTransient(
|
const cleanState = changeTransient(
|
||||||
setPersistent( state, defaultPersistent ),
|
changePersistent( state, defaultPersistent ),
|
||||||
defaultTransient
|
defaultTransient
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -121,7 +121,7 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
{}
|
{}
|
||||||
);
|
);
|
||||||
|
|
||||||
return setPersistent( state, validData );
|
return changePersistent( state, validData );
|
||||||
},
|
},
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
|
|
@ -36,16 +36,16 @@ const updateObject = ( oldObject, newValues, allowedKeys = {} ) => ( {
|
||||||
* @param {Object} defaultPersistent Object defining initial persistent values.
|
* @param {Object} defaultPersistent Object defining initial persistent values.
|
||||||
* @return {[Function, Function]} An array containing setTransient and setPersistent functions.
|
* @return {[Function, Function]} An array containing setTransient and setPersistent functions.
|
||||||
*/
|
*/
|
||||||
export const createSetters = ( defaultTransient, defaultPersistent ) => {
|
export const createReducerSetters = ( defaultTransient, defaultPersistent ) => {
|
||||||
const setTransient = ( oldState, newValues = {} ) =>
|
const changeTransient = ( oldState, newValues = {} ) =>
|
||||||
updateObject( oldState, newValues, defaultTransient );
|
updateObject( oldState, newValues, defaultTransient );
|
||||||
|
|
||||||
const setPersistent = ( oldState, newValues = {} ) => ( {
|
const changePersistent = ( oldState, newValues = {} ) => ( {
|
||||||
...oldState,
|
...oldState,
|
||||||
data: updateObject( oldState.data, newValues, defaultPersistent ),
|
data: updateObject( oldState.data, newValues, defaultPersistent ),
|
||||||
} );
|
} );
|
||||||
|
|
||||||
return [ setTransient, setPersistent ];
|
return [ changeTransient, changePersistent ];
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue