diff --git a/client/lib/cart/store/cart-synchronizer.js b/client/lib/cart/store/cart-synchronizer.js index 06c01aa90c67c..118bac492ceaf 100644 --- a/client/lib/cart/store/cart-synchronizer.js +++ b/client/lib/cart/store/cart-synchronizer.js @@ -80,7 +80,7 @@ CartSynchronizer.prototype.handleDispatch = function( payload ) { var action = payload.action, step; - if ( action.type !== upgradesActionTypes.TRANSACTION_STEP ) { + if ( action.type !== upgradesActionTypes.TRANSACTION_STEP_SET ) { return; } diff --git a/client/lib/cart/store/index.js b/client/lib/cart/store/index.js index 542c544617d3d..63912c8a71280 100644 --- a/client/lib/cart/store/index.js +++ b/client/lib/cart/store/index.js @@ -110,23 +110,23 @@ CartStore.dispatchToken = Dispatcher.register( function( payload ) { } switch ( action.type ) { - case UpgradesActionTypes.ADD_PRIVACY_TO_ALL_DOMAIN_CART_ITEMS: + case UpgradesActionTypes.CART_PRIVACY_PROTECTION_ADD: update( cartItems.addPrivacyToAllDomains( CartStore.get() ) ); break; - case UpgradesActionTypes.REMOVE_PRIVACY_FROM_ALL_DOMAIN_CART_ITEMS: + case UpgradesActionTypes.CART_PRIVACY_PROTECTION_REMOVE: update( cartItems.removePrivacyFromAllDomains( CartStore.get() ) ); break; - case UpgradesActionTypes.ADD_CART_ITEM: + case UpgradesActionTypes.CART_ITEM_ADD: update( cartItems.add( cartItem ) ); break; - case UpgradesActionTypes.APPLY_CART_COUPON: + case UpgradesActionTypes.CART_COUPON_APPLY: update( applyCoupon( action.coupon ) ); break; - case UpgradesActionTypes.REMOVE_CART_ITEM: + case UpgradesActionTypes.CART_ITEM_REMOVE: update( cartItems.removeItemAndDependencies( cartItem, CartStore.get() ) ); break; } diff --git a/client/lib/domains/dns/reducer.js b/client/lib/domains/dns/reducer.js index 1bfe7d5b5bb18..5cf9fcc7302a4 100644 --- a/client/lib/domains/dns/reducer.js +++ b/client/lib/domains/dns/reducer.js @@ -44,25 +44,25 @@ function reducer( state, payload ) { const { action } = payload; switch ( action.type ) { - case ActionTypes.DELETING_DNS: + case ActionTypes.DNS_DELETE: if ( ! action.error ) { state = deleteDns( state, action.domainName, action.record ); } break; - case ActionTypes.ADD_DNS: + case ActionTypes.DNS_ADD_COMPLETED: if ( ! action.error ) { state = addDns( state, action.domainName, action.record ); } break; - case ActionTypes.FETCH_DNS: + case ActionTypes.DNS_FETCH: if ( ! state[ action.domainName ] ) { state = updateDomainState( state, action.domainName, { hasLoadedFromServer: false } ); } break; - case ActionTypes.RECEIVE_DNS: + case ActionTypes.DNS_FETCH_COMPLETED: state = updateDomainState( state, action.domainName, { records: action.records, hasLoadedFromServer: true diff --git a/client/lib/domains/google-apps-users/reducer.js b/client/lib/domains/google-apps-users/reducer.js index 20dc8c044eb42..a8004cad0f6c3 100644 --- a/client/lib/domains/google-apps-users/reducer.js +++ b/client/lib/domains/google-apps-users/reducer.js @@ -29,7 +29,7 @@ function reducer( state, payload ) { const { action } = payload; switch ( action.type ) { - case ActionTypes.RECEIVE_GOOGLE_APPS_USERS: + case ActionTypes.GOOGLE_APPS_USERS_FETCH_COMPLETED: state = updateState( state, action.domainName, { hasLoadedFromServer: true, value: action.users diff --git a/client/lib/domains/reducer.js b/client/lib/domains/reducer.js index 3e8d0caf36b40..9b7708d4eb7ab 100644 --- a/client/lib/domains/reducer.js +++ b/client/lib/domains/reducer.js @@ -87,7 +87,7 @@ function reducer( state, payload ) { settingPrimaryDomain: false } ); - case UpgradesActionTypes.DOMAIN_ENABLE_PRIVACY_PROTECTION_COMPLETED: + case UpgradesActionTypes.PRIVACY_PROTECTION_ENABLE_COMPLETED: return updateDomainState( state, action.siteId, action.domainName, { privateDomain: true } ); diff --git a/client/lib/domains/wapi-domain-info/reducer.js b/client/lib/domains/wapi-domain-info/reducer.js index 450c6b3c499eb..66fbdc17f0133 100644 --- a/client/lib/domains/wapi-domain-info/reducer.js +++ b/client/lib/domains/wapi-domain-info/reducer.js @@ -47,7 +47,7 @@ function reducer( state, payload ) { needsUpdate: true } ); - case UpgradesActionTypes.DOMAIN_ENABLE_LOCKING_COMPLETED: + case UpgradesActionTypes.DOMAIN_LOCKING_ENABLE_COMPLETED: return updateDomainState( state, action.domainName, { data: Object.assign( {}, state[ action.domainName ].data, { locked: true, @@ -55,7 +55,7 @@ function reducer( state, payload ) { } ) } ); - case UpgradesActionTypes.DOMAIN_ENABLE_PRIVACY_PROTECTION_COMPLETED: + case UpgradesActionTypes.PRIVACY_PROTECTION_ENABLE_COMPLETED: return updateDomainState( state, action.domainName, { data: Object.assign( {}, state[ action.domainName ].data, { pendingTransfer: false diff --git a/client/lib/purchases/store.js b/client/lib/purchases/store.js index 884967eab60e6..fd8c70d0c6fe6 100644 --- a/client/lib/purchases/store.js +++ b/client/lib/purchases/store.js @@ -61,10 +61,10 @@ const PurchasesStore = createReducerStore( ( state, payload ) => { case ActionTypes.PURCHASES_USER_FETCH_FAILED: return assign( {}, state, { error: action.error } ); - case ActionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL_COMPLETED: + case ActionTypes.PRIVACY_PROTECTION_CANCEL_COMPLETED: return updatePurchaseById( state, action.purchase.id, action.purchase ); - case ActionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL_FAILED: + case ActionTypes.PRIVACY_PROTECTION_CANCEL_FAILED: return updatePurchaseById( state, action.purchaseId, { error: action.error } ); diff --git a/client/lib/purchases/test/store-test.js b/client/lib/purchases/test/store-test.js index 7f719993dccbf..3c649e58db961 100644 --- a/client/lib/purchases/test/store-test.js +++ b/client/lib/purchases/test/store-test.js @@ -64,7 +64,7 @@ describe( 'Purchases Store', () => { it( 'should return an object with original purchase when cancelation of private registration is triggered', () => { Dispatcher.handleServerAction( { - type: actionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL, + type: actionTypes.PRIVACY_PROTECTION_CANCEL, purchaseId: 2 } ); @@ -80,7 +80,7 @@ describe( 'Purchases Store', () => { it( 'should return an object with original purchase and error message when cancelation of private registration failed', () => { Dispatcher.handleServerAction( { - type: actionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL_FAILED, + type: actionTypes.PRIVACY_PROTECTION_CANCEL_FAILED, error: 'Unable to fetch stored cards', purchaseId: 2 } ); @@ -98,7 +98,7 @@ describe( 'Purchases Store', () => { it( 'should return an object with updated purchase when cancelation of private registration completed', () => { Dispatcher.handleServerAction( { - type: actionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL_COMPLETED, + type: actionTypes.PRIVACY_PROTECTION_CANCEL_COMPLETED, purchase: { amount: 2200, error: null, diff --git a/client/lib/transaction/store.js b/client/lib/transaction/store.js index 81f5d17b9b980..b040f09539644 100644 --- a/client/lib/transaction/store.js +++ b/client/lib/transaction/store.js @@ -76,30 +76,30 @@ TransactionStore.dispatchToken = Dispatcher.register( function( payload ) { var action = payload.action; switch ( action.type ) { - case UpgradesActionTypes.SET_TRANSACTION_DOMAIN_DETAILS: + case UpgradesActionTypes.TRANSACTION_DOMAIN_DETAILS_SET: setDomainDetails( action.domainDetails ); break; - case UpgradesActionTypes.SET_TRANSACTION_PAYMENT: + case UpgradesActionTypes.TRANSACTION_PAYMENT_SET: setPayment( action.payment ); break; - case UpgradesActionTypes.SET_TRANSACTION_NEW_CREDIT_CARD_DETAILS: + case UpgradesActionTypes.TRANSACTION_NEW_CREDIT_CARD_DETAILS_SET: setNewCreditCardDetails( { rawDetails: action.rawDetails, maskedDetails: action.maskedDetails } ); break; - case UpgradesActionTypes.TRANSACTION_STEP: + case UpgradesActionTypes.TRANSACTION_STEP_SET: setStep( action.step ); break; - case UpgradesActionTypes.RESET_TRANSACTION: + case UpgradesActionTypes.TRANSACTION_RESET: reset(); break; - case UpgradesActionTypes.REMOVE_CART_ITEM: + case UpgradesActionTypes.CART_ITEM_REMOVE: Dispatcher.waitFor( [ CartStore.dispatchToken ] ); if ( ! cartItems.hasDomainRegistration( CartStore.get() ) && hasDomainDetails( TransactionStore.get() ) ) { diff --git a/client/lib/upgrades/actions/cart.js b/client/lib/upgrades/actions/cart.js index 6d845ef30ebda..8921fb58493ae 100644 --- a/client/lib/upgrades/actions/cart.js +++ b/client/lib/upgrades/actions/cart.js @@ -16,26 +16,26 @@ import 'lib/cart/store'; function openCartPopup( options ) { Dispatcher.handleViewAction( { - type: ActionTypes.OPEN_CART_POPUP, + type: ActionTypes.CART_POPUP_OPEN, options: options || {} } ); } function closeCartPopup() { Dispatcher.handleViewAction( { - type: ActionTypes.CLOSE_CART_POPUP + type: ActionTypes.CART_POPUP_CLOSE } ); } function addPrivacyToAllDomains() { Dispatcher.handleViewAction( { - type: ActionTypes.ADD_PRIVACY_TO_ALL_DOMAIN_CART_ITEMS + type: ActionTypes.CART_PRIVACY_PROTECTION_ADD } ); } function removePrivacyFromAllDomains() { Dispatcher.handleViewAction( { - type: ActionTypes.REMOVE_PRIVACY_FROM_ALL_DOMAIN_CART_ITEMS + type: ActionTypes.CART_PRIVACY_PROTECTION_REMOVE } ); } @@ -46,14 +46,14 @@ function addItem( cartItem ) { newCartItem = assign( {}, cartItem, { extra } ); Dispatcher.handleViewAction( { - type: ActionTypes.ADD_CART_ITEM, + type: ActionTypes.CART_ITEM_ADD, cartItem: newCartItem } ); } function removeItem( cartItem ) { Dispatcher.handleViewAction( { - type: ActionTypes.REMOVE_CART_ITEM, + type: ActionTypes.CART_ITEM_REMOVE, cartItem } ); } @@ -74,7 +74,7 @@ function removeDomainFromCart( domainSuggestion ) { function applyCoupon( coupon ) { Dispatcher.handleViewAction( { - type: ActionTypes.APPLY_CART_COUPON, + type: ActionTypes.CART_COUPON_APPLY, coupon } ); } diff --git a/client/lib/upgrades/actions/checkout.js b/client/lib/upgrades/actions/checkout.js index a74438b75dc5c..f96d2f77fb5b0 100644 --- a/client/lib/upgrades/actions/checkout.js +++ b/client/lib/upgrades/actions/checkout.js @@ -7,14 +7,14 @@ import storeTransactions from 'lib/store-transactions'; function setDomainDetails( domainDetails ) { Dispatcher.handleViewAction( { - type: ActionTypes.SET_TRANSACTION_DOMAIN_DETAILS, + type: ActionTypes.TRANSACTION_DOMAIN_DETAILS_SET, domainDetails } ); } function setPayment( payment ) { Dispatcher.handleViewAction( { - type: ActionTypes.SET_TRANSACTION_PAYMENT, + type: ActionTypes.TRANSACTION_PAYMENT_SET, payment } ); } @@ -23,7 +23,7 @@ function setNewCreditCardDetails( options ) { const { rawDetails, maskedDetails } = options; Dispatcher.handleViewAction( { - type: ActionTypes.SET_TRANSACTION_NEW_CREDIT_CARD_DETAILS, + type: ActionTypes.TRANSACTION_NEW_CREDIT_CARD_DETAILS_SET, rawDetails, maskedDetails } ); @@ -38,7 +38,7 @@ function submitTransaction( { cart, transaction } ) { steps.on( 'data', ( step ) => { Dispatcher.handleViewAction( { - type: ActionTypes.TRANSACTION_STEP, + type: ActionTypes.TRANSACTION_STEP_SET, step } ); } ); @@ -46,7 +46,7 @@ function submitTransaction( { cart, transaction } ) { function resetTransaction() { Dispatcher.handleViewAction( { - type: ActionTypes.RESET_TRANSACTION + type: ActionTypes.TRANSACTION_RESET } ); } diff --git a/client/lib/upgrades/actions/domain-management.js b/client/lib/upgrades/actions/domain-management.js index 3958904602c6b..ff896fa9fdfe1 100644 --- a/client/lib/upgrades/actions/domain-management.js +++ b/client/lib/upgrades/actions/domain-management.js @@ -193,13 +193,13 @@ function updateWhois( domainName, contactInformation, onComplete ) { function fetchDns( domainName ) { Dispatcher.handleViewAction( { - type: ActionTypes.FETCH_DNS, + type: ActionTypes.DNS_FETCH, domainName } ); wpcom.fetchDns( domainName, ( error, data ) => { Dispatcher.handleServerAction( { - type: ActionTypes.RECEIVE_DNS, + type: ActionTypes.DNS_FETCH_COMPLETED, records: data && data.records, domainName, error @@ -210,7 +210,7 @@ function fetchDns( domainName ) { function addDns( domainName, record, onComplete ) { wpcom.addDns( domainName, record, ( error ) => { Dispatcher.handleServerAction( { - type: ActionTypes.ADD_DNS, + type: ActionTypes.DNS_ADD_COMPLETED, domainName, record, error @@ -222,7 +222,7 @@ function addDns( domainName, record, onComplete ) { function deleteDns( domainName, record, onComplete ) { Dispatcher.handleViewAction( { - type: ActionTypes.DELETING_DNS, + type: ActionTypes.DNS_DELETE, domainName, record } ); @@ -282,7 +282,7 @@ function resendIcannVerification( domainName, onComplete ) { wpcom.resendIcannVerification( domainName, ( error ) => { if ( ! error ) { Dispatcher.handleServerAction( { - type: ActionTypes.RESEND_ICANN_VERIFICATION, + type: ActionTypes.ICANN_VERIFICATION_RESEND_COMPLETED, domainName } ); } @@ -293,7 +293,7 @@ function resendIcannVerification( domainName, onComplete ) { function fetchGoogleAppsUsers( domainName ) { Dispatcher.handleViewAction( { - type: ActionTypes.FETCH_GOOGLE_APPS_USERS, + type: ActionTypes.GOOGLE_APPS_USERS_FETCH, domainName } ); @@ -304,7 +304,7 @@ function fetchGoogleAppsUsers( domainName ) { } Dispatcher.handleServerAction( { - type: ActionTypes.RECEIVE_GOOGLE_APPS_USERS, + type: ActionTypes.GOOGLE_APPS_USERS_FETCH_COMPLETED, domainName, users: googleAppsUsersAssembler.createDomainObject( data ) } ); @@ -443,7 +443,7 @@ function enableDomainLocking( domainName, onComplete ) { } Dispatcher.handleServerAction( { - type: ActionTypes.DOMAIN_ENABLE_LOCKING_COMPLETED, + type: ActionTypes.DOMAIN_LOCKING_ENABLE_COMPLETED, domainName } ); @@ -459,7 +459,7 @@ function enablePrivacyProtection( { siteId, domainName }, onComplete ) { } Dispatcher.handleServerAction( { - type: ActionTypes.DOMAIN_ENABLE_PRIVACY_PROTECTION_COMPLETED, + type: ActionTypes.PRIVACY_PROTECTION_ENABLE_COMPLETED, siteId, domainName } ); diff --git a/client/lib/upgrades/actions/purchases.js b/client/lib/upgrades/actions/purchases.js index 0544e2b556104..7babeb491403d 100644 --- a/client/lib/upgrades/actions/purchases.js +++ b/client/lib/upgrades/actions/purchases.js @@ -29,7 +29,7 @@ function cancelPurchase( purchaseId, onComplete ) { function cancelPrivateRegistration( purchaseId, onComplete ) { Dispatcher.handleViewAction( { - type: ActionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL, + type: ActionTypes.PRIVACY_PROTECTION_CANCEL, purchaseId } ); @@ -40,12 +40,12 @@ function cancelPrivateRegistration( purchaseId, onComplete ) { if ( success ) { Dispatcher.handleServerAction( { - type: ActionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL_COMPLETED, + type: ActionTypes.PRIVACY_PROTECTION_CANCEL_COMPLETED, purchase: purchasesAssembler.createPurchaseObject( data.upgrade ) } ); } else { Dispatcher.handleServerAction( { - type: ActionTypes.PURCHASES_PRIVATE_REGISTRATION_CANCEL_FAILED, + type: ActionTypes.PRIVACY_PROTECTION_CANCEL_FAILED, purchaseId, error: error.message || i18n.translate( 'There was a problem canceling this private registration. Please try again later or contact support.' ) } ); diff --git a/client/lib/upgrades/constants.js b/client/lib/upgrades/constants.js index ccaacbdd841d2..2e8fae6f99162 100644 --- a/client/lib/upgrades/constants.js +++ b/client/lib/upgrades/constants.js @@ -1,12 +1,21 @@ const keyMirror = require( 'key-mirror' ); module.exports.action = keyMirror( { - ADD_CART_ITEM: null, - ADD_DNS: null, - ADD_PRIVACY_TO_ALL_DOMAIN_CART_ITEMS: null, - APPLY_CART_COUPON: null, - CLOSE_CART_POPUP: null, - DELETING_DNS: null, + CART_COUPON_APPLY: null, + CART_ITEM_ADD: null, + CART_ITEM_REMOVE: null, + CART_POPUP_CLOSE: null, + CART_POPUP_OPEN: null, + CART_PRIVACY_PROTECTION_ADD: null, + CART_PRIVACY_PROTECTION_REMOVE: null, + DNS_ADD_COMPLETED: null, + DNS_DELETE: null, + DNS_FETCH: null, + DNS_FETCH_COMPLETED: null, + DOMAIN_LOCKING_ENABLE_COMPLETED: null, + DOMAIN_TRANSFER_ACCEPT_COMPLETED: null, + DOMAIN_TRANSFER_CODE_REQUEST_COMPLETED: null, + DOMAIN_TRANSFER_DECLINE_COMPLETED: null, DOMAINS_FETCH: null, DOMAINS_FETCH_COMPLETED: null, DOMAINS_FETCH_FAILED: null, @@ -16,40 +25,26 @@ module.exports.action = keyMirror( { EMAIL_FORWARDING_FETCH: null, EMAIL_FORWARDING_FETCH_COMPLETED: null, EMAIL_FORWARDING_FETCH_FAILED: null, - DOMAIN_ENABLE_LOCKING_COMPLETED: null, - DOMAIN_ENABLE_PRIVACY_PROTECTION_COMPLETED: null, - DOMAIN_TRANSFER_ACCEPT_COMPLETED: null, - DOMAIN_TRANSFER_CODE_REQUEST_COMPLETED: null, - DOMAIN_TRANSFER_DECLINE_COMPLETED: null, - FETCH_DNS: null, - FETCH_GOOGLE_APPS_USERS: null, + GOOGLE_APPS_USERS_FETCH: null, + GOOGLE_APPS_USERS_FETCH_COMPLETED: null, + ICANN_VERIFICATION_RESEND_COMPLETED: null, NAMESERVERS_FETCH: null, NAMESERVERS_FETCH_COMPLETED: null, NAMESERVERS_FETCH_FAILED: null, NAMESERVERS_UPDATE_COMPLETED: null, - OPEN_CART_POPUP: null, PRIMARY_DOMAIN_SET: null, PRIMARY_DOMAIN_SET_COMPLETED: null, PRIMARY_DOMAIN_SET_FAILED: null, - PURCHASES_PRIVATE_REGISTRATION_CANCEL: null, - PURCHASES_PRIVATE_REGISTRATION_CANCEL_COMPLETED: null, - PURCHASES_PRIVATE_REGISTRATION_CANCEL_FAILED: null, + PRIVACY_PROTECTION_CANCEL: null, + PRIVACY_PROTECTION_CANCEL_COMPLETED: null, + PRIVACY_PROTECTION_CANCEL_FAILED: null, + PRIVACY_PROTECTION_ENABLE_COMPLETED: null, PURCHASES_SITE_FETCH: null, PURCHASES_SITE_FETCH_COMPLETED: null, PURCHASES_SITE_FETCH_FAILED: null, PURCHASES_USER_FETCH: null, PURCHASES_USER_FETCH_COMPLETED: null, PURCHASES_USER_FETCH_FAILED: null, - RECEIVE_DNS: null, - RECEIVE_GOOGLE_APPS_USERS: null, - RECEIVE_SITE_UPGRADES: null, - REMOVE_CART_ITEM: null, - REMOVE_PRIVACY_FROM_ALL_DOMAIN_CART_ITEMS: null, - RESEND_ICANN_VERIFICATION: null, - RESET_TRANSACTION: null, - SET_TRANSACTION_DOMAIN_DETAILS: null, - SET_TRANSACTION_NEW_CREDIT_CARD_DETAILS: null, - SET_TRANSACTION_PAYMENT: null, SITE_REDIRECT_FETCH: null, SITE_REDIRECT_FETCH_COMPLETED: null, SITE_REDIRECT_FETCH_FAILED: null, @@ -63,7 +58,11 @@ module.exports.action = keyMirror( { STORED_CARDS_FETCH: null, STORED_CARDS_FETCH_COMPLETED: null, STORED_CARDS_FETCH_FAILED: null, - TRANSACTION_STEP: null, + TRANSACTION_DOMAIN_DETAILS_SET: null, + TRANSACTION_NEW_CREDIT_CARD_DETAILS_SET: null, + TRANSACTION_PAYMENT_SET: null, + TRANSACTION_RESET: null, + TRANSACTION_STEP_SET: null, WAPI_DOMAIN_INFO_FETCH: null, WAPI_DOMAIN_INFO_FETCH_COMPLETED: null, WAPI_DOMAIN_INFO_FETCH_FAILED: null, diff --git a/client/my-sites/upgrades/navigation.jsx b/client/my-sites/upgrades/navigation.jsx index 8ffd5c114a5d0..3f9d702a27cde 100644 --- a/client/my-sites/upgrades/navigation.jsx +++ b/client/my-sites/upgrades/navigation.jsx @@ -84,9 +84,9 @@ var UpgradesNavigation = React.createClass( { componentWillMount: function() { this.dispatchToken = Dispatcher.register( function( payload ) { - if ( payload.action.type === upgradesActionTypes.OPEN_CART_POPUP ) { + if ( payload.action.type === upgradesActionTypes.CART_POPUP_OPEN ) { this.setState( { cartVisible: true, cartShowKeepSearching: payload.action.options.showKeepSearching } ); - } else if ( payload.action.type === upgradesActionTypes.CLOSE_CART_POPUP ) { + } else if ( payload.action.type === upgradesActionTypes.CART_POPUP_CLOSE ) { this.setState( { cartVisible: false } ); } }.bind( this ) );