@sumaris-net/ngx-components 2.2.9 → 2.3.1

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -14553,6 +14553,25 @@ StartableObservableService = __decorate([
     __param(0, Optional())
 ], StartableObservableService);
 
+function getConnectionType(type) {
+    switch (type) {
+        case Connection.NONE:
+            return 'none';
+        case Connection.ETHERNET:
+            return 'ethernet';
+        case Connection.WIFI:
+            return 'wifi';
+        case Connection.CELL:
+        case Connection.CELL_2G:
+        case Connection.CELL_3G:
+        case Connection.CELL_4G:
+            return 'cellular';
+        case Connection.UNKNOWN:
+        default:
+            return 'unknown';
+    }
+}
+
 // Base58 encoding/decoding
 // Originally written by Mike Hearn for BitcoinJ
 // Copyright (c) 2011 Google Inc
@@ -14735,25 +14754,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
             args: [{ providedIn: 'root' }]
         }] });
 
-function getConnectionType(type) {
-    switch (type) {
-        case Connection.NONE:
-            return 'none';
-        case Connection.ETHERNET:
-            return 'ethernet';
-        case Connection.WIFI:
-            return 'wifi';
-        case Connection.CELL:
-        case Connection.CELL_2G:
-        case Connection.CELL_3G:
-        case Connection.CELL_4G:
-            return 'cell';
-        case Connection.UNKNOWN:
-            return 'unknown';
-        default:
-            return 'ethernet';
-    }
-}
 const NetworkRefreshTimerPeriod = {
     MOBILE: 1000 * 60 * 10 /* every 10 min */,
     DESKTOP: 1000 * 60 * 5 /* every 5 min */
@@ -15226,9 +15226,7 @@ class NetworkService extends StartableObservableService {
         return uri;
     }
     onDeviceConnectionChanged(connectionType) {
-        connectionType = (connectionType || 'unknown').toLowerCase();
-        if (connectionType.startsWith('cell'))
-            connectionType = 'cell';
+        connectionType = getConnectionType(connectionType);
         if (connectionType !== this._deviceConnectionType) {
             this._deviceConnectionType = connectionType;
             // If NOT  already forced as offline, emit event
@@ -15616,7 +15614,7 @@ const NativeWebSocket = _global.WebSocket || _global.MozWebSocket;
  * With a hack on default Websocket, to avoid the use of protocol
  */
 const AppWebSocket = function (url, protocols) {
-    return new NativeWebSocket(url /*no protocols*/);
+    return new NativeWebSocket(url /*no protocols*/, protocols);
 };
 AppWebSocket.CLOSED = NativeWebSocket.CLOSED;
 AppWebSocket.CLOSING = NativeWebSocket.CLOSING;
@@ -21384,11 +21382,11 @@ class MenuComponent {
             .pipe(distinctUntilChanged())
             .subscribe((value) => value ? this.open() : this.close());
         // Update component when refresh is need (=login events or config changed)
-        let lastLoadedAccountUpdateDate;
+        let lastAccountUpdateDate;
         this._subscription.add(merge(merge(this.accountService.onLogin
             .pipe(
         // Filter on account changes
-        filter(account => !DateUtils.isSame(account?.updateDate, lastLoadedAccountUpdateDate))), this.configService.config
+        filter(account => !DateUtils.isSame(account?.updateDate, lastAccountUpdateDate))), this.configService.config
             .pipe(
         // Store the config
         tap(config => this._config = config)))
@@ -21401,10 +21399,11 @@ class MenuComponent {
         this.accountService.onLogout.pipe(mapTo(null)))
             .subscribe(account => {
             if (account?.updateDate) {
-                lastLoadedAccountUpdateDate = account.updateDate;
+                lastAccountUpdateDate = account.updateDate;
                 this.onLogin(account);
             }
             else {
+                lastAccountUpdateDate = null;
                 this.onLogout(true);
             }
         }));