Themes: Add current-theme query component

Replaces the old-style fetcher component.

client/components/data/query-current-theme/index.jsx

@@ -0,0 +1,52 @@
+/** @ssr-ready **/
+
+/**
+ * External dependencies
+ */
+import { Component, PropTypes } from 'react';
+import { connect } from 'react-redux';
+
+/**
+ * Internal dependencies
+ */
+import { fetchCurrentTheme } from 'state/themes/actions';
+import { isRequestingCurrentTheme } from 'state/themes/current-theme/selectors';
+
+class QueryCurrentTheme extends Component {
+
+	componentDidMount() {
+		const { requestingCurrentTheme, site } = this.props;
+		this.refresh( requestingCurrentTheme, site );
+	}
+
+	componentWillReceiveProps( nextProps ) {
+		if ( nextProps.site === this.props.site ) {
+			return;
+		}
+		const { requestingCurrentTheme, site } = nextProps;
+		this.refresh( requestingCurrentTheme, site );
+	}
+
+	refresh( requestingCurrentTheme, site ) {
+		if ( ! requestingCurrentTheme && site ) {
+			this.props.fetchCurrentTheme( site.ID );
+		}
+	}
+
+	render() {
+		return null;
+	}
+}
+
+QueryCurrentTheme.propTypes = {
+	site: PropTypes.oneOfType( [ PropTypes.object, PropTypes.bool ] ),
+	requestingCurrentTheme: PropTypes.bool,
+	fetchCurrentTheme: PropTypes.func,
+};
+
+export default connect(
+	( state, props ) => (
+		{ requestingCurrentTheme: isRequestingCurrentTheme( state, props.site && props.site.ID ) }
+	),
+	{ fetchCurrentTheme }
+)( QueryCurrentTheme );

client/my-sites/themes/current-theme/index.jsx

@@ -3,6 +3,7 @@
  */
 import React from 'react';
 import classNames from 'classnames';
+import { connect } from 'react-redux';
 
 /**
  * Internal dependencies
@@ -16,6 +17,8 @@ import {
 	isPremium,
 	trackClick
 } from '../helpers';
+import { getCurrentTheme } from 'state/themes/current-theme/selectors';
+import QueryCurrentTheme from 'components/data/query-current-theme';
 
 /**
  * Show current active theme for a site, with
@@ -37,11 +40,12 @@ const CurrentTheme = React.createClass( {
 	render() {
 		const { currentTheme, site } = this.props,
 			placeholderText = <span className="current-theme__placeholder">loading...</span>,
-			text = currentTheme ? currentTheme.name : placeholderText,
+			text = ( currentTheme && currentTheme.name ) ? currentTheme.name : placeholderText,
 			displaySupportButton = isPremium( currentTheme ) && ! site.jetpack;
 
 		return (
 			<Card className="current-theme">
+				<QueryCurrentTheme site={ site }/>
 				<div className="current-theme__info">
 					<span className="current-theme__label">
 						{ this.translate( 'Current Theme' ) }
@@ -75,4 +79,8 @@ const CurrentTheme = React.createClass( {
 	}
 } );
 
-export default CurrentTheme;
+export default connect(
+	( state, props ) => (
+		{ currentTheme: getCurrentTheme( state, props.site && props.site.ID ) }
+	)
+)( CurrentTheme );

client/my-sites/themes/single-site.jsx

@@ -11,7 +11,6 @@ import merge from 'lodash/merge';
  * Internal dependencies
  */
 import Main from 'components/main';
-import CurrentThemeData from 'components/data/current-theme';
 import ActivatingTheme from 'components/data/activating-theme';
 import { customize, purchase, activate, clearActivated } from 'state/themes/actions';
 import ThemePreview from './theme-preview';
@@ -154,11 +153,9 @@ const ThemesSingleSite = React.createClass( {
 						source={ 'list' }
 						clearActivated={ bindActionCreators( clearActivated, this.props.dispatch ) } />
 				</ActivatingTheme>
-				<CurrentThemeData site={ site }>
-					<CurrentTheme
-						site={ site }
-						canCustomize={ site && site.isCustomizable() } />
-				</CurrentThemeData>
+				<CurrentTheme
+					site={ site }
+					canCustomize={ site && site.isCustomizable() } />
 				<UpgradeNudge
 					title={ this.translate( 'Get Custom Design with Premium' ) }
 					message={ this.translate( 'Customize your theme using premium fonts, color palettes, and the CSS editor.' ) }

client/state/action-types.js

@@ -196,6 +196,8 @@ export const THEME_CUSTOMIZE = 'THEME_CUSTOMIZE';
 export const THEME_DETAILS_RECEIVE = 'THEME_DETAILS_RECEIVE';
 export const THEME_PURCHASE = 'THEME_PURCHASE';
 export const THEME_RECEIVE_CURRENT = 'THEMES_RECEIVE_CURRENT';
+export const THEME_REQUEST_CURRENT = 'THEME_REQUEST_CURRENT';
+export const THEME_REQUEST_CURRENT_FAILURE = 'THEME_REQUEST_CURRENT_FAILURE';
 export const THEME_SIGNUP_WITH = 'THEME_SIGNUP_WITH';
 export const THEMES_INCREMENT_PAGE = 'THEMES_INCREMENT_PAGE';
 export const THEMES_QUERY = 'THEMES_QUERY';

client/state/themes/actions.js

@@ -21,6 +21,8 @@ import {
 	THEME_DETAILS_RECEIVE,
 	THEME_PURCHASE,
 	THEME_RECEIVE_CURRENT,
+	THEME_REQUEST_CURRENT,
+	THEME_REQUEST_CURRENT_FAILURE,
 	THEME_SIGNUP_WITH,
 	THEMES_INCREMENT_PAGE,
 	THEMES_QUERY,
@@ -75,19 +77,30 @@ export function incrementThemesPage( site ) {
 	};
 }
 
-export function fetchCurrentTheme( site ) {
+export function fetchCurrentTheme( siteId ) {
 	return dispatch => {
-		wpcom.undocumented().activeTheme( site.ID )
+		dispatch( {
+			type: THEME_REQUEST_CURRENT,
+			siteId,
+		} );
+
+		wpcom.undocumented().activeTheme( siteId )
 			.then( theme => {
 				debug( 'Received current theme', theme );
 				dispatch( {
 					type: THEME_RECEIVE_CURRENT,
-					site: site,
+					siteId,
 					themeId: theme.id,
 					themeName: theme.name,
 					themeCost: theme.cost
 				} );
-			} ); // TODO: add .catch() error handler
+			} ).catch( error => {
+				dispatch( {
+					type: THEME_REQUEST_CURRENT_FAILURE,
+					siteId,
+					error,
+				} );
+			} );
 	};
 }
 

client/state/themes/current-theme/reducer.js

@@ -13,30 +13,39 @@ import {
 	THEME_ACTIVATE,
 	THEME_ACTIVATED,
 	THEME_CLEAR_ACTIVATED,
-	THEME_RECEIVE_CURRENT
+	THEME_RECEIVE_CURRENT,
+	THEME_REQUEST_CURRENT,
+	THEME_REQUEST_CURRENT_FAILURE,
 } from 'state/action-types';
 
 export const initialState = fromJS( {
 	isActivating: false,
 	hasActivated: false,
-	currentThemes: {}
+	currentThemes: {},
+	requesting: {},
 } );
 
 export default ( state = initialState, action ) => {
 	switch ( action.type ) {
 		case THEME_RECEIVE_CURRENT:
-			return state.setIn( [ 'currentThemes', action.site.ID ], {
+			return state.setIn( [ 'currentThemes', action.siteId ], {
 				name: action.themeName,
 				id: action.themeId,
-				cost: action.themeCost
-			} );
+				cost: action.themeCost,
+			} )
+			.setIn( [ 'requesting', action.siteId ], false );
+		case THEME_REQUEST_CURRENT:
+			return state.setIn( [ 'requesting', action.siteId ], true );
+		case THEME_REQUEST_CURRENT_FAILURE:
+			//TODO: show notification
+			return state.setIn( [ 'requesting', action.siteId ], false );
 		case THEME_ACTIVATE:
 			return state.set( 'isActivating', true );
 		case THEME_ACTIVATED:
 			return state
 				.set( 'isActivating', false )
 				.set( 'hasActivated', true )
-				.setIn( [ 'currentThemes', action.site.ID ], action.theme );
+				.setIn( [ 'currentThemes', action.siteId ], action.theme );
 		case THEME_CLEAR_ACTIVATED:
 			return state.set( 'hasActivated', false );
 		case DESERIALIZE:

client/state/themes/current-theme/selectors.js

@@ -11,3 +11,7 @@ export function isActivating( state ) {
 export function hasActivated( state ) {
 	return state.themes.currentTheme.get( 'hasActivated' );
 }
+
+export function isRequestingCurrentTheme( state, siteId ) {
+	return !! state.themes.currentTheme.get( 'requesting' ).get( siteId );
+}