community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1660 from rasika/fix-1659

Browse Source 
Adding notification for the user on a Websocket handshake failure
This commit is contained in:
Milan Perera 2018-02-06 15:16:08 +05:30 committed by GitHub
commit 6d88fd86bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs
View File

@ -52,6 +52,10 @@
</span> </span>
</span> View Device Analytics </span> View Device Analytics
</a> </a>
<div class="hide" id="websocker-onerror">
Realtime Analytics for $sensorType 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"}}

11
modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js
View File

@ -114,6 +114,17 @@ function connect(wsConnection, target, chartData, graph, sensorType) {
chartData.shift(); chartData.shift();
graph.update(); graph.update();
}; };
wsConnection.onerror = function (event) {
var websocketURL = event.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('\\$sensorType', 'g'), sensorType);
errorMsg = errorMsg.replace(new RegExp('\\$webSocketURL', 'g'), websocketURL);
$(graph.element).parent().html("<div class='alert alert-danger'>" + errorMsg + "</div>");
$(graph.element).hide();
};
} }
if (sensorType == "temperature") { if (sensorType == "temperature") {
wsConnectionTemperature = wsConnection; wsConnectionTemperature = wsConnection;

3
modules/distribution/src/core/samples/sampledevice/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.sampledevice.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"}}

10
modules/distribution/src/core/samples/sampledevice/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.sampledevice.realtime.analytics-view/public/js/device-stats.js
View File

@ -104,6 +104,16 @@ function connect(wsConnection, target, chartData, graph) {
chartData.shift(); chartData.shift();
graph.update(); graph.update();
}; };
wsConnection.onerror = function (event) {
var websocketURL = event.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);
$(graph.element).parent().html("<div class='alert alert-danger'>" + errorMsg + "</div>");
$(graph.element).hide();
};
} }
} }