Merge branch 'main' into publish

akaravi · Apr 29, 2024 · fddec90 · fddec90
2 parents 5ae66ab + 036c0a4
commit fddec90
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ntk-cms-web",
-  "version": "15.2.1130.1",
+  "version": "15.3.0210.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/src/app/core/services/cmsSignalr.service.ts b/src/app/core/services/cmsSignalr.service.ts
@@ -34,12 +34,12 @@ export class CmsSignalrService {
     this.hubConnection
       .start()
       .then(() => {
-        console.log('Connection started');
+        console.log('signalR Connection started');
         this.connected = true;
         //if (onActionConnected)
         // onActionConnected;
       })
-      .catch(err => console.log('Error while starting connection: ' + err));
+      .catch(err => console.log('Error while signalR starting connection: ' + err));
 
   }
   public login(token: string) {
@@ -75,12 +75,17 @@ export class CmsSignalrService {
       // web-push generate-vapid-keys --json
       //{"publicKey":"BKxkwx4CTSU2psDIs5LDX08P7hEwsbgDZa2hjJqLjUj_gmjg0cOD1vSkqMtBfBZ52RvFXl1R55FIVrj5eUMbx1Q","privateKey":"El0I7GEeskNmXn5qrPppzz80_LCEF0zkcCt76_R_SEo"}
       if (notification.contentJson?.length > 0) {
-        var actionConfig = JSON.parse(notification.contentJson);
-        if (actionConfig && actionConfig.action?.length > 0) {
-          if (actionConfig.action == 'UpadteOnlineList') {
+        try {
+          var actionConfig = JSON.parse(notification.contentJson);
+          if (actionConfig && actionConfig.action?.length > 0) {
+            if (actionConfig.action == 'UpadteOnlineList') {
 
+            }
           }
         }
+        catch {
+
+        }
       }
 
       if (!xFunc)