From 2301e62e5e5379142a86a8b19958c977d445aab1 Mon Sep 17 00:00:00 2001 From: Oleg Date: Tue, 20 Feb 2018 00:23:41 +0200 Subject: [PATCH] to merge --- src/core/services/MqttClient.service.js | 8 +------- src/core/store/Browser.store.js | 7 ++++++- src/core/store/Configure.dev.store.js | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/core/services/MqttClient.service.js b/src/core/services/MqttClient.service.js index c418c79b5..205c06002 100644 --- a/src/core/services/MqttClient.service.js +++ b/src/core/services/MqttClient.service.js @@ -23,12 +23,6 @@ const setPrefix = (id) => { const getProvider = () => client ? client : null; const setProvider = c => client = c; -const generateClientId = () => { - return Math.random().toString(36).substring(2) - + (new Date()).getTime().toString(36); -}; - - const initProvider = () => { let config = { clientId: setupClientEntry(), @@ -58,4 +52,4 @@ const initProvider = () => { return xtendedClient; }; -export { generateClientId, initProvider, getProvider}; \ No newline at end of file +export { initProvider, getProvider}; \ No newline at end of file diff --git a/src/core/store/Browser.store.js b/src/core/store/Browser.store.js index 55326a380..a8e3b1b22 100644 --- a/src/core/store/Browser.store.js +++ b/src/core/store/Browser.store.js @@ -1,7 +1,12 @@ import { browserStorage } from './index'; -import { generateClientId } from '../services'; import { DEV_KEY, CLIENT} from '../configs/BrowserStorage.config'; + +const generateClientId = () => { + return Math.random().toString(36).substring(2) + + (new Date()).getTime().toString(36); +}; + const setupDevEntry = () => { let devKey = browserStorage.getItem(DEV_KEY) || generateClientId(); diff --git a/src/core/store/Configure.dev.store.js b/src/core/store/Configure.dev.store.js index c34f2c2e5..00e64542e 100644 --- a/src/core/store/Configure.dev.store.js +++ b/src/core/store/Configure.dev.store.js @@ -21,8 +21,8 @@ const configureStore = () => { //loadingBarMiddleware({ scope: 'page' }) ]; - //const composeExtenders = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; - const store = createStore(rootReducer, {}, compose( + const composeExtenders = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; + const store = createStore(rootReducer, {}, composeExtenders( applyMiddleware(...middlewares) ) ); -- GitLab