DRY plugin fetching

Automattic · Nov 16, 2017 · 4dc1307 · 4dc1307
1 parent 8d4fab1
commit 4dc1307
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/client/extensions/woocommerce/app/settings/taxes/index.js b/client/extensions/woocommerce/app/settings/taxes/index.js
@@ -33,20 +33,20 @@ class SettingsTaxes extends Component {
 		taxJarPluginActive: PropTypes.bool,
 	};
 
-	componentDidMount = () => {
-		const { isRequestingSitePlugins, siteId, sitePluginsLoaded } = this.props;
+	maybeFetchPlugins = props => {
+		const { isRequestingSitePlugins, siteId, sitePluginsLoaded } = props;
 
 		if ( siteId && ! isRequestingSitePlugins && ! sitePluginsLoaded ) {
 			this.props.fetchPlugins( [ siteId ] );
 		}
 	};
 
-	componentWillReceiveProps = newProps => {
-		const { isRequestingSitePlugins, siteId, sitePluginsLoaded } = newProps;
+	componentDidMount = () => {
+		this.maybeFetchPlugins( this.props );
+	};
 
-		if ( siteId && ! isRequestingSitePlugins && ! sitePluginsLoaded ) {
-			this.props.fetchPlugins( [ siteId ] );
-		}
+	componentWillReceiveProps = newProps => {
+		this.maybeFetchPlugins( newProps );
 	};
 
 	render = () => {

diff --git a/client/extensions/woocommerce/app/settings/taxes/taxes-rates.js b/client/extensions/woocommerce/app/settings/taxes/taxes-rates.js
@@ -44,20 +44,20 @@ class TaxesRates extends Component {
 		siteId: PropTypes.number.isRequired,
 	};
 
-	componentDidMount = () => {
-		const { address, loadedSettingsGeneral, loadedTaxRates, siteId } = this.props;
+	maybeFetchRates = props => {
+		const { address, loadedSettingsGeneral, loadedTaxRates, siteId } = props;
 
 		if ( loadedSettingsGeneral && ! loadedTaxRates ) {
 			this.props.fetchTaxRates( siteId, address );
 		}
 	};
 
+	componentDidMount = () => {
+		this.maybeFetchRates( this.props );
+	};
+
 	componentWillReceiveProps = nextProps => {
-		if ( nextProps.loadedSettingsGeneral ) {
-			if ( ! nextProps.loadedTaxRates ) {
-				this.props.fetchTaxRates( nextProps.siteId, nextProps.address );
-			}
-		}
+		this.maybeFetchRates( nextProps );
 	};
 
 	renderInfo = () => {