Implemented table building functions
Change-Id: Ie4003080b13725561df22de41ec85f8c3f31c794
diff --git a/web/gui2/src/main/webapp/app/fw/remote/websocket.service.ts b/web/gui2/src/main/webapp/app/fw/remote/websocket.service.ts
index e470ec1..34a8ea9 100644
--- a/web/gui2/src/main/webapp/app/fw/remote/websocket.service.ts
+++ b/web/gui2/src/main/webapp/app/fw/remote/websocket.service.ts
@@ -90,7 +90,6 @@
* built-in handler for the 'boostrap' event
*/
private bootstrap(data: Bootstrap) {
- this.log.debug('bootstrap data', data);
this.loggedInUser = data.user;
this.clusterNodes = data.clusterNodes;
@@ -332,6 +331,13 @@
return this.url;
}
+ /**
+ * Tell the WebSocket to close - this should call the handleClose() method
+ */
+ closeWebSocket() {
+ this.ws.close();
+ }
+
/**
* Binds the message handlers to their message type (event type) as
@@ -369,12 +375,12 @@
* Unbinds the specified message handlers.
* Expected that the same map will be used, but we only care about keys
*/
- unbindHandlers(handlerMap: Map<string, (data) => void>): void {
- if (this.noHandlersWarn(handlerMap, 'unbindHandlers')) {
+ unbindHandlers(handlerIds: string[]): void {
+ if ( handlerIds.length === 0 ) {
+ this.log.warn('WSS.unbindHandlers(): no event handlers');
return null;
}
-
- for (const [eventId, api] of handlerMap) {
+ for (const eventId of handlerIds) {
this.handlers.delete(eventId);
}
}
@@ -448,4 +454,7 @@
this.lcd = ld;
}
+ isConnected(): boolean {
+ return this.wsUp;
+ }
}