From 7c145bbb3ceffc61064de6fd91c5b93c491597d2 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 5 Jun 2017 17:49:43 +0700
Subject: [PATCH] Refactor import order and framework initialization

---
 client/coral-admin/src/index.js                 |  3 ++-
 client/coral-admin/src/reducers/index.js        |  2 +-
 client/coral-admin/src/services/store.js        | 12 ++++++++----
 client/coral-embed-stream/src/index.js          |  8 ++++----
 client/coral-embed-stream/src/reducers/index.js |  2 +-
 client/coral-framework/helpers/plugins.js       | 16 ++++++++++------
 client/coral-framework/reducers/index.js        |  2 --
 7 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/client/coral-admin/src/index.js b/client/coral-admin/src/index.js
index d0dfc5f9a..8cd7685f0 100644
--- a/client/coral-admin/src/index.js
+++ b/client/coral-admin/src/index.js
@@ -9,9 +9,10 @@ import App from './components/App';
 
 import 'react-mdl/extra/material.js';
 import './graphql';
-import {loadPluginsTranslations} from 'coral-framework/helpers/plugins';
+import {loadPluginsTranslations, injectPluginsReducers} from 'coral-framework/helpers/plugins';
 
 loadPluginsTranslations();
+injectPluginsReducers();
 
 render(
   <ApolloProvider client={client} store={store}>
diff --git a/client/coral-admin/src/reducers/index.js b/client/coral-admin/src/reducers/index.js
index 3036d6271..04c8b6590 100644
--- a/client/coral-admin/src/reducers/index.js
+++ b/client/coral-admin/src/reducers/index.js
@@ -13,5 +13,5 @@ export default {
   community,
   moderation,
   install,
-  config
+  config,
 };
diff --git a/client/coral-admin/src/services/store.js b/client/coral-admin/src/services/store.js
index 2ab9d3750..9815a0f70 100644
--- a/client/coral-admin/src/services/store.js
+++ b/client/coral-admin/src/services/store.js
@@ -14,14 +14,18 @@ if (window.devToolsExtension) {
   middlewares.push(window.devToolsExtension());
 }
 
+const coralReducers = {
+  ...mainReducer,
+  apollo: client.reducer()
+};
+
 const store = createStore(
-  combineReducers({
-    ...mainReducer,
-    apollo: client.reducer()
-  }),
+  combineReducers(coralReducers),
   {},
   compose(...middlewares)
 );
 
+store.coralReducers = coralReducers;
+
 window.coralStore = store;
 export default store;
diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index 06d52649a..1b2d278b2 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -2,20 +2,20 @@ import React from 'react';
 import {render} from 'react-dom';
 import {ApolloProvider} from 'react-apollo';
 
-import {client} from 'coral-framework/services/client';
 import {checkLogin} from 'coral-framework/actions/auth';
 import './graphql';
 import {addExternalConfig} from 'coral-embed-stream/src/actions/config';
-
-import reducers from './reducers';
 import {getStore, injectReducers} from 'coral-framework/services/store';
+import {client} from 'coral-framework/services/client';
 import AppRouter from './AppRouter';
 import {pym} from 'coral-framework';
-import {loadPluginsTranslations} from 'coral-framework/helpers/plugins';
+import {loadPluginsTranslations, injectPluginsReducers} from 'coral-framework/helpers/plugins';
+import reducers from './reducers';
 
 const store = getStore();
 
 loadPluginsTranslations();
+injectPluginsReducers();
 injectReducers(reducers);
 
 // Don't run this in the popup.
diff --git a/client/coral-embed-stream/src/reducers/index.js b/client/coral-embed-stream/src/reducers/index.js
index 590b87eea..5ddac4567 100644
--- a/client/coral-embed-stream/src/reducers/index.js
+++ b/client/coral-embed-stream/src/reducers/index.js
@@ -5,5 +5,5 @@ import stream from './stream';
 export default {
   embed,
   stream,
-  config
+  config,
 };
diff --git a/client/coral-framework/helpers/plugins.js b/client/coral-framework/helpers/plugins.js
index 02ee8c3a7..0eaecbadd 100644
--- a/client/coral-framework/helpers/plugins.js
+++ b/client/coral-framework/helpers/plugins.js
@@ -7,12 +7,7 @@ import pick from 'lodash/pick';
 import plugins from 'pluginsConfig';
 import {getDefinitionName, mergeDocuments} from 'coral-framework/utils';
 import {loadTranslations} from 'coral-framework/services/i18n';
-
-export const pluginReducers = merge(
-  ...plugins
-    .filter((o) => o.module.reducer)
-    .map((o) => ({...o.module.reducer}))
-);
+import {injectReducers} from 'coral-framework/services/store';
 
 /**
  * Returns React Elements for given slot.
@@ -98,3 +93,12 @@ function getTranslations() {
 export function loadPluginsTranslations() {
   getTranslations().forEach((t) => loadTranslations(t));
 }
+
+export function injectPluginsReducers() {
+  const reducers = merge(
+    ...plugins
+      .filter((o) => o.module.reducer)
+      .map((o) => ({...o.module.reducer}))
+  );
+  injectReducers(reducers);
+}
diff --git a/client/coral-framework/reducers/index.js b/client/coral-framework/reducers/index.js
index d5b66bbae..8928cae93 100644
--- a/client/coral-framework/reducers/index.js
+++ b/client/coral-framework/reducers/index.js
@@ -2,12 +2,10 @@ import auth from './auth';
 import user from './user';
 import asset from './asset';
 import {reducer as commentBox} from '../../coral-plugin-commentbox';
-import {pluginReducers} from '../helpers/plugins';
 
 export default {
   auth,
   user,
   asset,
   commentBox,
-  ...pluginReducers
 };