Merge pull request #2939 from 10up/fix/2938

Fix incorrect sync being triggered by URL parameter.
10up · Aug 11, 2022 · 7d04537 · 7d04537
2 parents 435563a + adc6afb
commit 7d04537
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 30 deletions.
diff --git a/assets/js/sync/index.js b/assets/js/sync/index.js
@@ -189,10 +189,15 @@ const App = () => {
 		(indexMeta) => {
 			const isInitialSync = stateRef.current.lastSyncDateTime === null;
 
+			/**
+			 * We should not appear to be deleting if this is the first sync.
+			 */
+			const isDeleting = isInitialSync ? false : indexMeta.put_mapping;
+
 			updateState({
 				isCli: indexMeta.method === 'cli',
 				isComplete: false,
-				isDeleting: isInitialSync ? false : indexMeta.put_mapping,
+				isDeleting,
 				isSyncing: true,
 				itemsProcessed: getItemsProcessedFromIndexMeta(indexMeta),
 				itemsTotal: getItemsTotalFromIndexMeta(indexMeta),
@@ -287,13 +292,13 @@ const App = () => {
 
 	const doIndex = useCallback(
 		/**
-		 * Start or continues a sync.
+		 * Start or continue a sync.
 		 *
-		 * @param {boolean} isDeleting Whether to delete and sync.
+		 * @param {boolean} putMapping Whether to send mapping.
 		 * @returns {void}
 		 */
-		(isDeleting) => {
-			index(isDeleting)
+		(putMapping) => {
+			index(putMapping)
 				.then(updateSyncState)
 				.then(
 					/**
@@ -306,7 +311,7 @@ const App = () => {
 						if (method === 'cli') {
 							doIndexStatus();
 						} else {
-							doIndex(isDeleting);
+							doIndex(putMapping);
 						}
 					},
 				)
@@ -350,8 +355,14 @@ const App = () => {
 			const { isDeleting, lastSyncDateTime } = stateRef.current;
 			const isInitialSync = lastSyncDateTime === null;
 
+			/**
+			 * Send mapping if we are deleting and syncing or if this is the
+			 * first sync.
+			 */
+			const putMapping = isInitialSync || isDeleting;
+
 			updateState({ isComplete: false, isPaused: false, isSyncing: true });
-			doIndex(isInitialSync ? true : isDeleting);
+			doIndex(putMapping);
 		},
 		[doIndex],
 	);
@@ -360,16 +371,27 @@ const App = () => {
 		/**
 		 * Start syncing.
 		 *
-		 * @param {boolean} isDeleting Whether to delete and sync.
+		 * @param {boolean} deleteAndSync Whether to delete and sync.
 		 * @returns {void}
 		 */
-		(isDeleting) => {
+		(deleteAndSync) => {
 			const { lastSyncDateTime } = stateRef.current;
 			const isInitialSync = lastSyncDateTime === null;
 
+			/**
+			 * We should not appear to be deleting if this is the first sync.
+			 */
+			const isDeleting = isInitialSync ? false : deleteAndSync;
+
+			/**
+			 * Send mapping if we are deleting and syncing or if this is the
+			 * first sync.
+			 */
+			const putMapping = isInitialSync || deleteAndSync;
+
 			updateState({ isComplete: false, isDeleting, isPaused: false, isSyncing: true });
 			updateState({ itemsProcessed: 0, syncStartDateTime: Date.now() });
-			doIndex(isInitialSync ? true : isDeleting);
+			doIndex(putMapping);
 		},
 		[doIndex],
 	);
@@ -460,8 +482,8 @@ const App = () => {
 		 * Start an initial index.
 		 */
 		if (autoIndex) {
-			startSync(false);
-			logMessage(__('Starting sync…', 'elasticpress'), 'info');
+			startSync(true);
+			logMessage(__('Starting delete and sync…', 'elasticpress'), 'info');
 		}
 	};
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/tests/cypress/integration/dashboard-sync.spec.js b/tests/cypress/integration/dashboard-sync.spec.js
@@ -57,15 +57,16 @@ describe('Dashboard Sync', () => {
 		 * Perform an initial sync.
 		 */
 		cy.get('@syncPanel').find('.ep-sync-button').click();
-		cy.get('.ep-sync-progress__details', {
-			timeout: Cypress.config('elasticPressIndexTimeout'),
-		}).should('contain.text', 'Sync complete');
 
 		/**
-		 * The sync log should indicate that mapping was sent.
+		 * The sync log should indicate that the sync completed and that
+		 * mapping was sent.
 		 */
 		cy.get('@syncPanel').find('.components-form-toggle').click();
-		cy.get('@syncPanel').find('.ep-sync-messages').should('contain.text', 'Mapping sent');
+		cy.get('@syncPanel')
+			.find('.ep-sync-messages', { timeout: Cypress.config('elasticPressIndexTimeout') })
+			.should('contain.text', 'Mapping sent')
+			.should('contain.text', 'Sync complete');
 
 		/**
 		 * After the initial sync is complete there should be 2 sync panels

diff --git a/tests/cypress/integration/features/protected-content.spec.js b/tests/cypress/integration/features/protected-content.spec.js
@@ -10,9 +10,12 @@ describe('Protected Content Feature', () => {
 			return true;
 		});
 
-		cy.get('.ep-sync-progress strong', {
-			timeout: Cypress.config('elasticPressIndexTimeout'),
-		}).should('contain.text', 'Sync complete');
+		cy.get('.ep-sync-panel').last().as('syncPanel');
+		cy.get('@syncPanel').find('.components-form-toggle').click();
+		cy.get('@syncPanel')
+			.find('.ep-sync-messages', { timeout: Cypress.config('elasticPressIndexTimeout') })
+			.should('contain.text', 'Mapping sent')
+			.should('contain.text', 'Sync complete');
 
 		cy.wpCli('elasticpress list-features').its('stdout').should('contain', 'protected_content');
 	});

diff --git a/tests/cypress/integration/features/woocommerce.spec.js b/tests/cypress/integration/features/woocommerce.spec.js
@@ -29,9 +29,12 @@ describe('WooCommerce Feature', () => {
 			return true;
 		});
 
-		cy.get('.ep-sync-progress strong', {
-			timeout: Cypress.config('elasticPressIndexTimeout'),
-		}).should('contain.text', 'Sync complete');
+		cy.get('.ep-sync-panel').last().as('syncPanel');
+		cy.get('@syncPanel').find('.components-form-toggle').click();
+		cy.get('@syncPanel')
+			.find('.ep-sync-messages', { timeout: Cypress.config('elasticPressIndexTimeout') })
+			.should('contain.text', 'Mapping sent')
+			.should('contain.text', 'Sync complete');
 
 		cy.wpCli('elasticpress list-features').its('stdout').should('contain', 'woocommerce');
 	});