Merge pull request #1363 from Automattic/remove/themes-flux-stores

Themes: Remove Flux stores

shared/lib/themes/README.md

@@ -1,11 +1,9 @@
 Theme Data
 ==========
 
-Contains stores and action creators for themes, and the theme showcase.
+Contains reducers and action creators for themes, and the theme showcase.
 
-## Stores
-
-We're transitioning to a more `redux`-like architecture, so our Flux `./stores` are created from `./reducers`, using our own `createReducerStore()`.
+## Reducers
 
 ### current-theme
 

shared/lib/themes/reducers/current-theme.js

@@ -8,13 +8,13 @@ import { fromJS } from 'immutable';
  */
 import ThemeConstants from 'lib/themes/constants';
 
-export const initialState = fromJS( {
+const initialState = fromJS( {
 	isActivating: false,
 	hasActivated: false,
 	currentThemes: {}
 } );
 
-export const reducer = ( state = initialState, action ) => {
+export default ( state = initialState, action ) => {
 	switch ( action.type ) {
 		case ThemeConstants.RECEIVE_CURRENT_THEME:
 			return state.setIn( [ 'currentThemes', action.site.ID ], {
@@ -33,7 +33,3 @@ export const reducer = ( state = initialState, action ) => {
 	}
 	return state;
 };
-
-export function getCurrentTheme( state, siteId ) {
-	return state.get( 'currentThemes' ).get( siteId );
-}

shared/lib/themes/reducers/index.js

@@ -6,10 +6,10 @@ import { combineReducers } from 'redux';
 /**
  * Internal dependencies
  */
-import { reducer as themes } from './themes';
-import { reducer as themesList } from './themes-list';
-import { reducer as themesLastQuery } from './themes-last-query';
-import { reducer as currentTheme } from './current-theme';
+import themes from './themes';
+import themesList from './themes-list';
+import themesLastQuery from './themes-last-query';
+import currentTheme from './current-theme';
 
 export default combineReducers( {
 	themes,

shared/lib/themes/reducers/themes-last-query.js

@@ -8,14 +8,14 @@ import { fromJS } from 'immutable';
  */
 import ThemeConstants from '../constants';
 
-export const initialState = fromJS( {
+const initialState = fromJS( {
 	previousSiteId: 0,
 	currentSiteId: null,
 	isJetpack: null,
 	lastParams: null,
 } );
 
-export const reducer = ( state = initialState, action ) => {
+export default ( state = initialState, action ) => {
 	switch ( action.type ) {
 		case ThemeConstants.QUERY_THEMES:
 			return state.set( 'lastParams', action.params );
@@ -29,11 +29,3 @@ export const reducer = ( state = initialState, action ) => {
 
 	return state;
 };
-
-export function hasSiteChanged( state ) {
-	return state.get( 'previousSiteId' ) !== state.get( 'currentSiteId' );
-};
-
-export function hasParams( state ) {
-	return !! state.get( 'lastParams' );
-}

shared/lib/themes/reducers/themes-list.js

@@ -21,7 +21,7 @@ const defaultQueryState = fromJS( {
 	isFetchingNextPage: false
 } );
 
-export const initialState = query( fromJS( {
+const initialState = query( fromJS( {
 	list: [],
 	nextId: 0,
 	query: {},
@@ -54,7 +54,7 @@ function isActionForLastPage( list, action ) {
 		action.themes.length === 0;
 }
 
-export const reducer = ( state = initialState, action ) => {
+export default ( state = initialState, action ) => {
 	switch ( action.type ) {
 		case ThemeConstants.QUERY_THEMES:
 			return query( state, action.params );

shared/lib/themes/reducers/themes.js

@@ -9,7 +9,7 @@ import transform from 'lodash/object/transform';
  */
 import ThemeConstants from 'lib/themes/constants';
 
-export const initialState = fromJS( {
+const initialState = fromJS( {
 	themes: {},
 	currentSiteId: 0
 } );
@@ -26,7 +26,7 @@ function setActiveTheme( themeId, themes ) {
 		.setIn( [ themeId, 'active' ], true );
 }
 
-export const reducer = ( state = initialState, action ) => {
+export default( state = initialState, action ) => {
 	switch ( action.type ) {
 		case ThemeConstants.RECEIVE_THEMES:
 			const isNewSite = action.isJetpack && ( action.siteId !== state.get( 'currentSiteId' ) );
@@ -40,8 +40,3 @@ export const reducer = ( state = initialState, action ) => {
 	}
 	return state;
 };
-
-export function getThemeById( state, id ) {
-	const theme = state.getIn( [ 'themes', id ] );
-	return theme ? theme.toJS() : undefined;
-}

shared/lib/themes/test/current-theme.js

@@ -0,0 +1,39 @@
+import { expect } from 'chai';
+import { createStore } from 'redux';
+
+import ThemeConstants from '../constants';
+import reducer from '../reducers/current-theme';
+
+describe( 'current-theme', () => {
+	const SITE = { ID: 77203074 }; // dummy id
+
+	const actionReceiveCurrentTheme = {
+		type: ThemeConstants.RECEIVE_CURRENT_THEME,
+		themeId: 'twentyfifteen',
+		themeName: 'Twenty Fifteen',
+		site: SITE
+	};
+
+	let store;
+
+	function getCurrentTheme( siteId ) {
+		return store.getState().get( 'currentThemes' ).get( siteId );
+	}
+
+	beforeEach( () => {
+		store = createStore( reducer );
+	} );
+
+	describe( 'get()', () => {
+		beforeEach( () => {
+			store.dispatch( actionReceiveCurrentTheme );
+		} );
+
+		it( 'returns the current theme for the supplied site id', () => {
+			const currentTheme = getCurrentTheme( SITE.ID );
+
+			expect( currentTheme.id ).to.equal( 'twentyfifteen' );
+			expect( currentTheme.name ).to.equal( 'Twenty Fifteen' );
+		} );
+	} );
+} );