Merge pull request #2634 from woocommerce/revert-2596-update/2445-sna…

…ckbar Revert "Update to new Snackbar component and notice store"
woocommerce · Jul 11, 2019 · c5ccd0b · c5ccd0b
2 parents 9c287d7 + a047a97
commit c5ccd0b
Show file tree

Hide file tree

Showing 32 changed files with 438 additions and 339 deletions.
diff --git a/client/analytics/settings/historical-data/index.js b/client/analytics/settings/historical-data/index.js
@@ -51,13 +51,13 @@ class HistoricalData extends Component {
 	}
 
 	makeQuery( path, errorMessage ) {
-		const { createNotice } = this.props;
+		const { addNotice } = this.props;
 		apiFetch( { path, method: 'POST' } )
 			.then( response => {
 				if ( 'success' === response.status ) {
-					createNotice( 'success', response.message );
+					addNotice( { status: 'success', message: response.message } );
 				} else {
-					createNotice( 'error', errorMessage );
+					addNotice( { status: 'error', message: errorMessage } );
 					this.setState( {
 						activeImport: false,
 						lastImportStopTimestamp: Date.now(),
@@ -66,7 +66,7 @@ class HistoricalData extends Component {
 			} )
 			.catch( error => {
 				if ( error && error.message ) {
-					createNotice( 'error', error.message );
+					addNotice( { status: 'error', message: error.message } );
 					this.setState( {
 						activeImport: false,
 						lastImportStopTimestamp: Date.now(),

diff --git a/client/analytics/settings/index.js b/client/analytics/settings/index.js
@@ -84,22 +84,25 @@ class Settings extends Component {
 	};
 
 	componentDidUpdate() {
-		const { createNotice, isError, isRequesting } = this.props;
+		const { addNotice, isError, isRequesting } = this.props;
 		const { saving, isDirty } = this.state;
 		let newIsDirtyState = isDirty;
 
 		if ( saving && ! isRequesting ) {
 			if ( ! isError ) {
-				createNotice(
-					'success',
-					__( 'Your settings have been successfully saved.', 'woocommerce-admin' )
-				);
+				addNotice( {
+					status: 'success',
+					message: __( 'Your settings have been successfully saved.', 'woocommerce-admin' ),
+				} );
 				newIsDirtyState = false;
 			} else {
-				createNotice(
-					'error',
-					__( 'There was an error saving your settings.  Please try again.', 'woocommerce-admin' )
-				);
+				addNotice( {
+					status: 'error',
+					message: __(
+						'There was an error saving your settings.  Please try again.',
+						'woocommerce-admin'
+					),
+				} );
 			}
 			/* eslint-disable react/no-did-update-set-state */
 			this.setState( { saving: false, isDirty: newIsDirtyState } );
@@ -148,7 +151,7 @@ class Settings extends Component {
 	}
 
 	render() {
-		const { createNotice } = this.props;
+		const { addNotice } = this.props;
 		const { hasError } = this.state;
 		if ( hasError ) {
 			return null;
@@ -175,7 +178,7 @@ class Settings extends Component {
 						</Button>
 					</div>
 				</div>
-				<HistoricalData createNotice={ createNotice } />
+				<HistoricalData addNotice={ addNotice } />
 			</Fragment>
 		);
 	}
@@ -192,11 +195,11 @@ export default compose(
 		return { getSettings, isError, isRequesting, settings };
 	} ),
 	withDispatch( dispatch => {
-		const { createNotice } = dispatch( 'core/notices' );
+		const { addNotice } = dispatch( 'wc-admin' );
 		const { updateSettings } = dispatch( 'wc-api' );
 
 		return {
-			createNotice,
+			addNotice,
 			updateSettings,
 		};
 	} )

diff --git a/client/analytics/settings/setting.js b/client/analytics/settings/setting.js
@@ -74,15 +74,15 @@ class Setting extends Component {
 	};
 
 	handleInputCallback = () => {
-		const { createNotice, callback } = this.props;
+		const { addNotice, callback } = this.props;
 
 		if ( 'function' !== typeof callback ) {
 			return;
 		}
 
 		return new Promise( ( resolve, reject ) => {
 			this.setState( { disabled: true } );
-			callback( resolve, reject, createNotice );
+			callback( resolve, reject, addNotice );
 		} )
 			.then( () => {
 				this.setState( { disabled: false } );
@@ -197,7 +197,7 @@ Setting.propTypes = {
 
 export default compose(
 	withDispatch( dispatch => {
-		const { createNotice } = dispatch( 'core/notices' );
-		return { createNotice };
+		const { addNotice } = dispatch( 'wc-admin' );
+		return { addNotice };
 	} )
 )( Setting );
diff --git a/client/dashboard/profile-wizard/index.js b/client/dashboard/profile-wizard/index.js
@@ -93,7 +93,7 @@ class ProfileWizard extends Component {
 	}
 
 	async goToNextStep() {
-		const { createNotice, isError, updateProfileItems } = this.props;
+		const { addNotice, isError, updateProfileItems } = this.props;
 		const currentStep = this.getCurrentStep();
 		const currentStepIndex = getSteps().findIndex( s => s.key === currentStep.key );
 		const nextStep = getSteps()[ currentStepIndex + 1 ];
@@ -102,10 +102,10 @@ class ProfileWizard extends Component {
 			await updateProfileItems( { completed: true } );
 
 			if ( isError ) {
-				createNotice(
-					'error',
-					__( 'There was a problem completing the profiler.', 'woocommerce-admin' )
-				);
+				addNotice( {
+					status: 'error',
+					message: __( 'There was a problem completing the profiler.', 'woocommerce-admin' ),
+				} );
 			}
 			return;
 		}
@@ -142,11 +142,10 @@ export default compose(
 		return { isError };
 	} ),
 	withDispatch( dispatch => {
-		const { updateProfileItems } = dispatch( 'wc-api' );
-		const { createNotice } = dispatch( 'core/notices' );
+		const { addNotice, updateProfileItems } = dispatch( 'wc-api' );
 
 		return {
-			createNotice,
+			addNotice,
 			updateProfileItems,
 		};
 	} )

diff --git a/client/dashboard/profile-wizard/steps/business-details.js b/client/dashboard/profile-wizard/steps/business-details.js
@@ -40,7 +40,7 @@ class BusinessDetails extends Component {
 	}
 
 	async onContinue() {
-		const { createNotice, goToNextStep, isError, updateProfileItems } = this.props;
+		const { addNotice, goToNextStep, isError, updateProfileItems } = this.props;
 		const { other_platform, product_count, selling_venues } = this.state;
 		const extensions = keys( pickBy( this.state.extensions ) );
 
@@ -62,10 +62,10 @@ class BusinessDetails extends Component {
 		if ( ! isError ) {
 			goToNextStep();
 		} else {
-			createNotice(
-				'error',
-				__( 'There was a problem updating your business details.', 'woocommerce-admin' )
-			);
+			addNotice( {
+				status: 'error',
+				message: __( 'There was a problem updating your business details.', 'woocommerce-admin' ),
+			} );
 		}
 	}
 
@@ -316,11 +316,10 @@ export default compose(
 		return { isError };
 	} ),
 	withDispatch( dispatch => {
-		const { updateProfileItems } = dispatch( 'wc-api' );
-		const { createNotice } = dispatch( 'core/notices' );
+		const { addNotice, updateProfileItems } = dispatch( 'wc-api' );
 
 		return {
-			createNotice,
+			addNotice,
 			updateProfileItems,
 		};
 	} )

diff --git a/client/dashboard/profile-wizard/steps/industry.js b/client/dashboard/profile-wizard/steps/industry.js
@@ -27,18 +27,18 @@ class Industry extends Component {
 	}
 
 	async onContinue() {
-		const { createNotice, goToNextStep, isError, updateProfileItems } = this.props;
+		const { addNotice, goToNextStep, isError, updateProfileItems } = this.props;
 
 		recordEvent( 'storeprofiler_store_industry_continue', { store_industry: this.state.selected } );
 		await updateProfileItems( { industry: this.state.selected } );
 
 		if ( ! isError ) {
 			goToNextStep();
 		} else {
-			createNotice(
-				'error',
-				__( 'There was a problem updating your industries.', 'woocommerce-admin' )
-			);
+			addNotice( {
+				status: 'error',
+				message: __( 'There was a problem updating your industries.', 'woocommerce-admin' ),
+			} );
 		}
 	}
 
@@ -104,11 +104,10 @@ export default compose(
 		return { isError };
 	} ),
 	withDispatch( dispatch => {
-		const { updateProfileItems } = dispatch( 'wc-api' );
-		const { createNotice } = dispatch( 'core/notices' );
+		const { addNotice, updateProfileItems } = dispatch( 'wc-api' );
 
 		return {
-			createNotice,
+			addNotice,
 			updateProfileItems,
 		};
 	} )

diff --git a/client/dashboard/profile-wizard/steps/plugins.js b/client/dashboard/profile-wizard/steps/plugins.js
@@ -119,7 +119,10 @@ class Plugins extends Component {
 			} );
 			return pluginResponse;
 		} catch ( err ) {
-			this.props.createNotice( 'error', this.getErrorMessage( action, plugin ) );
+			this.props.addNotice( {
+				status: 'error',
+				message: this.getErrorMessage( action, plugin ),
+			} );
 			this.setState( {
 				isPending: false,
 				isError: true,
@@ -138,7 +141,10 @@ class Plugins extends Component {
 			}
 			throw new Error();
 		} catch ( err ) {
-			this.props.createNotice( 'error', this.getErrorMessage( 'activate', 'jetpack' ) );
+			this.props.addNotice( {
+				status: 'error',
+				message: this.getErrorMessage( 'activate', 'jetpack' ),
+			} );
 			this.setState( {
 				isPending: false,
 				isError: true,
@@ -202,9 +208,9 @@ class Plugins extends Component {
 
 export default compose(
 	withDispatch( dispatch => {
-		const { createNotice } = dispatch( 'core/notices' );
+		const { addNotice } = dispatch( 'wc-admin' );
 		return {
-			createNotice,
+			addNotice,
 		};
 	} )
 )( Plugins );
diff --git a/client/dashboard/profile-wizard/steps/product-types.js b/client/dashboard/profile-wizard/steps/product-types.js
@@ -30,7 +30,7 @@ class ProductTypes extends Component {
 	}
 
 	async onContinue() {
-		const { createNotice, goToNextStep, isError, updateProfileItems } = this.props;
+		const { addNotice, goToNextStep, isError, updateProfileItems } = this.props;
 
 		recordEvent( 'storeprofiler_store_product_type_continue', {
 			product_type: this.state.selected,
@@ -40,10 +40,10 @@ class ProductTypes extends Component {
 		if ( ! isError ) {
 			goToNextStep();
 		} else {
-			createNotice(
-				'error',
-				__( 'There was a problem updating your product types.', 'woocommerce-admin' )
-			);
+			addNotice( {
+				status: 'error',
+				message: __( 'There was a problem updating your product types.', 'woocommerce-admin' ),
+			} );
 		}
 	}
 
@@ -137,11 +137,10 @@ export default compose(
 		return { isError };
 	} ),
 	withDispatch( dispatch => {
-		const { updateProfileItems } = dispatch( 'wc-api' );
-		const { createNotice } = dispatch( 'core/notices' );
+		const { addNotice, updateProfileItems } = dispatch( 'wc-api' );
 
 		return {
-			createNotice,
+			addNotice,
 			updateProfileItems,
 		};
 	} )

diff --git a/client/dashboard/profile-wizard/steps/start/index.js b/client/dashboard/profile-wizard/steps/start/index.js
@@ -76,23 +76,23 @@ class Start extends Component {
 	}
 
 	async skipWizard() {
-		const { createNotice, isProfileItemsError, updateProfileItems, isSettingsError } = this.props;
+		const { addNotice, isProfileItemsError, updateProfileItems, isSettingsError } = this.props;
 
 		recordEvent( 'storeprofiler_welcome_clicked', { proceed_without_install: true } );
 
 		await updateProfileItems( { skipped: true } );
 		await this.updateTracking();
 
 		if ( isProfileItemsError || isSettingsError ) {
-			createNotice(
-				'error',
-				__( 'There was a problem updating your preferences.', 'woocommerce-admin' )
-			);
+			addNotice( {
+				status: 'error',
+				message: __( 'There was a problem updating your preferences.', 'woocommerce-admin' ),
+			} );
 		}
 	}
 
 	async startWizard() {
-		const { createNotice, isSettingsError } = this.props;
+		const { addNotice, isSettingsError } = this.props;
 
 		recordEvent( 'storeprofiler_welcome_clicked', { get_started: true } );
 
@@ -101,10 +101,10 @@ class Start extends Component {
 		if ( ! isSettingsError ) {
 			this.props.goToNextStep();
 		} else {
-			createNotice(
-				'error',
-				__( 'There was a problem updating your preferences.', 'woocommerce-admin' )
-			);
+			addNotice( {
+				status: 'error',
+				message: __( 'There was a problem updating your preferences.', 'woocommerce-admin' ),
+			} );
 		}
 	}
 
@@ -217,11 +217,10 @@ export default compose(
 		return { getSettings, isSettingsError, isProfileItemsError, isSettingsRequesting };
 	} ),
 	withDispatch( dispatch => {
-		const { updateProfileItems, updateSettings } = dispatch( 'wc-api' );
-		const { createNotice } = dispatch( 'core/notices' );
+		const { addNotice, updateProfileItems, updateSettings } = dispatch( 'wc-api' );
 
 		return {
-			createNotice,
+			addNotice,
 			updateProfileItems,
 			updateSettings,
 		};