community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/wso2/product-iots/issues/1659 (#1177)

Browse Source
This commit is contained in:
Rasika Perera 2018-02-06 15:11:32 +05:30 committed by Madhawa Perera
parent 0b4882e667
commit afe66f237a
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.realtime.analytics-view/analytics-view.hbs
View File

@ -37,6 +37,9 @@
<i class="fw fw-statistics fw-stack-1x"></i> <i class="fw fw-statistics fw-stack-1x"></i>
</span> View Device Analytics </span> View Device Analytics
</a> </a>
<div class="hide" id="websocker-onerror">
Realtime Analytics is not available. Failed to connect to the websocket. Please make sure; '<a style="color: white" href="$webSocketURL">$webSocketURL</a>' is available and re-try again.
</div>
<!-- /statistics --> <!-- /statistics -->
{{#zone "bottomJs"}} {{#zone "bottomJs"}}
{{js "js/moment.min.js"}} {{js "js/moment.min.js"}}

9
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.realtime.analytics-view/public/js/device-stats.js
View File

@ -48,6 +48,15 @@ function connect(target) {
} }
$("#time-mode").text("Real Time Mode"); $("#time-mode").text("Real Time Mode");
}; };
ws.onerror = function (webSocketData) {
var websocketURL = webSocketData.currentTarget.url;
websocketURL = websocketURL.replace("wss://","https://");
var uriParts = websocketURL.split("/");
websocketURL = uriParts[0] + "//" + uriParts[2];
var errorMsg = $("#websocker-onerror").html();
errorMsg = errorMsg.replace(new RegExp('\\$webSocketURL', 'g'), websocketURL);
$("#div-chart").html("<div class='alert alert-danger'>" + errorMsg + "</div>");
};
} }
} }

12
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js
View File

@ -571,7 +571,11 @@ var webSocketOnAlertClose = function (e) {
}; };
var webSocketOnAlertError = function (e) { var webSocketOnAlertError = function (e) {
noty({text: 'Something went wrong when trying to connect to <b>' + alertWebSocketURL + '<b/>', type: 'error'}); var wsURL = alertWebSocketURL;
wsURL = wsURL.replace("wss://","https://");
var uriParts = wsURL.split("/");
wsURL = uriParts[0] + "//" + uriParts[2];
noty({text: 'Something went wrong when trying to connect to <b>' + wsURL + '<b/>', type: 'error'});
}; };
var webSocketSpatialOnOpen = function () { var webSocketSpatialOnOpen = function () {
@ -598,7 +602,11 @@ var webSocketSpatialOnClose = function (e) {
}; };
var webSocketSpatialOnError = function (err) { var webSocketSpatialOnError = function (err) {
noty({text: 'Something went wrong when trying to connect to <b>' + webSocketURL + '<b/>', type: 'error'}); var wsURL = webSocketURL;
wsURL = wsURL.replace("wss://","https://");
var uriParts = wsURL.split("/");
wsURL = uriParts[0] + "//" + uriParts[2];
noty({text: 'Something went wrong when trying to connect to <b>' + wsURL + '<b/>', type: 'error'});
}; };