DNS: more consistent and realistic handling of DNS events

Previously, we optimistically deleted the DNS record. Now, we wait for the response from the API. Same for adding DNS records. The DNS_*_COMPLETED events are now only fired when there's no error, making reducer implementation more straightforward.
Automattic · Dec 16, 2015 · 6742f49 · 6742f49
1 parent b30c0b3
commit 6742f49
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/client/lib/domains/dns/reducer.js b/client/lib/domains/dns/reducer.js
@@ -50,16 +50,11 @@ function reducer( state, payload ) {
 	const { action } = payload;
 
 	switch ( action.type ) {
-		case ActionTypes.DNS_DELETE:
-			if ( ! action.error ) {
-				state = deleteDns( state, action.domainName, action.record );
-			}
-			break;
-
 		case ActionTypes.DNS_ADD_COMPLETED:
-			if ( ! action.error ) {
-				state = addDns( state, action.domainName, action.record );
-			}
+			state = addDns( state, action.domainName, action.record );
+			break;
+		case ActionTypes.DNS_DELETE_COMPLETED:
+			state = deleteDns( state, action.domainName, action.record );
 			break;
 		case ActionTypes.DNS_FETCH:
 			if ( ! state[ action.domainName ] ) {

diff --git a/client/lib/domains/dns/test/reducer-test.js b/client/lib/domains/dns/test/reducer-test.js
@@ -20,7 +20,7 @@ describe( 'Domains: DNS reducer', () => {
 			},
 			payload = {
 				action: {
-					type: ActionTypes.DNS_DELETE,
+					type: ActionTypes.DNS_DELETE_COMPLETED,
 					domainName: DOMAIN_NAME,
 					record: RECORD_TXT
 				}
@@ -39,7 +39,7 @@ describe( 'Domains: DNS reducer', () => {
 			},
 			payload = {
 				action: {
-					type: ActionTypes.DNS_DELETE,
+					type: ActionTypes.DNS_DELETE_COMPLETED,
 					domainName: DOMAIN_NAME,
 					record: RECORD_TXT
 				}
@@ -59,7 +59,7 @@ describe( 'Domains: DNS reducer', () => {
 			},
 			payload = {
 				action: {
-					type: ActionTypes.DNS_DELETE,
+					type: ActionTypes.DNS_DELETE_COMPLETED,
 					domainName: DOMAIN_NAME,
 					record: RECORD_TXT_WITHOUT_ID
 				}

diff --git a/client/lib/upgrades/actions/domain-management.js b/client/lib/upgrades/actions/domain-management.js
@@ -209,25 +209,30 @@ function fetchDns( domainName ) {
 
 function addDns( domainName, record, onComplete ) {
 	wpcom.addDns( domainName, record, ( error ) => {
-		Dispatcher.handleServerAction( {
-			type: ActionTypes.DNS_ADD_COMPLETED,
-			domainName,
-			record,
-			error
-		} );
+		if ( ! error ) {
+			Dispatcher.handleServerAction( {
+				type: ActionTypes.DNS_ADD_COMPLETED,
+				domainName,
+				record,
+			} );
+		}
 
 		onComplete( error );
 	} );
 }
 
 function deleteDns( domainName, record, onComplete ) {
-	Dispatcher.handleViewAction( {
-		type: ActionTypes.DNS_DELETE,
-		domainName,
-		record
-	} );
+	wpcom.deleteDns( domainName, record, ( error ) => {
+		if ( ! error ) {
+			Dispatcher.handleServerAction( {
+				type: ActionTypes.DNS_DELETE_COMPLETED,
+				domainName,
+				record,
+			} );
+		}
 
-	wpcom.deleteDns( domainName, record, onComplete );
+		onComplete( error );
+	} );
 }
 
 function fetchNameservers( domainName ) {

diff --git a/client/lib/upgrades/constants.js b/client/lib/upgrades/constants.js
@@ -9,7 +9,7 @@ module.exports.action = keyMirror( {
 	CART_PRIVACY_PROTECTION_ADD: null,
 	CART_PRIVACY_PROTECTION_REMOVE: null,
 	DNS_ADD_COMPLETED: null,
-	DNS_DELETE: null,
+	DNS_DELETE_COMPLETED: null,
 	DNS_FETCH: null,
 	DNS_FETCH_COMPLETED: null,
 	DOMAIN_LOCKING_ENABLE_COMPLETED: null,