NOTICKET: Fix issues caused by merge
Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
diff --git a/skyquake/framework/core/api_utils/sockets.js b/skyquake/framework/core/api_utils/sockets.js
index 2e6779c..e2e4447 100644
--- a/skyquake/framework/core/api_utils/sockets.js
+++ b/skyquake/framework/core/api_utils/sockets.js
@@ -92,6 +92,7 @@
var a = url.resolve(origin, req.baseUrl);
var b = url.resolve(a, URL);
URL = b;
+ console.log('DEBUG URL IS', URL);
} else {
protocol = protocol[1]
}
diff --git a/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx b/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx
index 8b61f4b..05a42db 100644
--- a/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx
+++ b/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx
@@ -18,6 +18,7 @@
import React from 'react';
import AltContainer from 'alt-container';
import Alt from './skyquakeAltInstance.js';
+ import _cloneDeep from 'lodash/cloneDeep';
import SkyquakeNav from '../skyquake_nav/skyquakeNav.jsx';
import EventCenter from './eventCenter.jsx';
import SkyquakeContainerActions from './skyquakeContainerActions.js'
@@ -92,7 +93,7 @@
render() {
const {displayNotification, notificationMessage, displayScreenLoader, notificationType, ...state} = this.state;
var html;
- let nav = _.cloneDeep(this.state.nav);
+ let nav = _cloneDeep(this.state.nav);
if (this.matchesLoginUrl()) {
html = (
<AltContainer>