From bc9029fd2ee221ca19e795f65cb09eb7957ad054 Mon Sep 17 00:00:00 2001
From: Ondrej Prazak <oprazak@redhat.com>
Date: Mon, 17 Jul 2017 08:37:09 +0200
Subject: [PATCH] Fixes #21137 - Register reducers from plugins

---
 package.json                                           |  1 +
 webpack/assets/javascripts/react_app/redux/index.js    | 10 +++++-----
 .../react_app/redux/reducers/hosts/index.js            |  5 ++---
 .../react_app/redux/reducers/hosts/storage/index.js    |  5 +----
 .../javascripts/react_app/redux/reducers/index.js      |  5 ++---
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 4cd7476feec..34350111d36 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "redux": "^3.6.0",
     "redux-form": "^7.0.3",
     "redux-form-validators": "^2.0.1",
+    "redux-injector": "^0.1.0",
     "redux-logger": "^2.8.1",
     "redux-thunk": "^2.2.0",
     "seamless-immutable": "^7.0.1",
diff --git a/webpack/assets/javascripts/react_app/redux/index.js b/webpack/assets/javascripts/react_app/redux/index.js
index 961df3f87e6..c545cd0e818 100644
--- a/webpack/assets/javascripts/react_app/redux/index.js
+++ b/webpack/assets/javascripts/react_app/redux/index.js
@@ -1,8 +1,8 @@
 import createLogger from 'redux-logger';
 import thunk from 'redux-thunk';
-import { applyMiddleware, createStore } from 'redux';
-
-import reducer from './reducers';
+import { applyMiddleware } from 'redux';
+import { createInjectStore } from 'redux-injector';
+import rootState from './reducers';
 
 let middleware = [thunk];
 
@@ -10,8 +10,8 @@ if (process.env.NODE_ENV !== 'production' && !global.__testing__) {
   middleware = [...middleware, createLogger()];
 }
 
-const _getStore = () => createStore(
-  reducer,
+const _getStore = () => createInjectStore(
+  rootState,
   window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(),
   applyMiddleware(...middleware),
 );
diff --git a/webpack/assets/javascripts/react_app/redux/reducers/hosts/index.js b/webpack/assets/javascripts/react_app/redux/reducers/hosts/index.js
index 1fc739ef1d1..759bfa7feb5 100644
--- a/webpack/assets/javascripts/react_app/redux/reducers/hosts/index.js
+++ b/webpack/assets/javascripts/react_app/redux/reducers/hosts/index.js
@@ -1,8 +1,7 @@
-import { combineReducers } from 'redux';
 import storage from './storage';
 import powerStatus from './powerStatus';
 
-export default combineReducers({
+export default {
   storage,
   powerStatus,
-});
+};
diff --git a/webpack/assets/javascripts/react_app/redux/reducers/hosts/storage/index.js b/webpack/assets/javascripts/react_app/redux/reducers/hosts/storage/index.js
index ecbe0bdf3b3..f016a6486ad 100644
--- a/webpack/assets/javascripts/react_app/redux/reducers/hosts/storage/index.js
+++ b/webpack/assets/javascripts/react_app/redux/reducers/hosts/storage/index.js
@@ -1,6 +1,3 @@
-import { combineReducers } from 'redux';
 import vmware from './vmware';
 
-export default combineReducers({
-  vmware,
-});
+export default { vmware };
diff --git a/webpack/assets/javascripts/react_app/redux/reducers/index.js b/webpack/assets/javascripts/react_app/redux/reducers/index.js
index 0379a999f9b..351f741c5e0 100644
--- a/webpack/assets/javascripts/react_app/redux/reducers/index.js
+++ b/webpack/assets/javascripts/react_app/redux/reducers/index.js
@@ -1,12 +1,11 @@
-import { combineReducers } from 'redux';
 import statistics from './statistics';
 import hosts from './hosts';
 import notifications from './notifications/';
 import toasts from './toasts';
 
-export default combineReducers({
+export default {
   statistics,
   hosts,
   notifications,
   toasts,
-});
+};