@chat21/chat21-ionic 3.0.59-rc4 → 3.0.59

package/src/app/services/websocket/websocket-js.ts

@@ -78,10 +78,8 @@ export class WebSocketJs {
     this.callbacks.set(topic, { onCreate: onCreate, onUpdate: onUpdate, onData: onData });
     this.logger.log('[WEBSOCKET-JS] - CALLBACK-SET - callbacks', this.callbacks);
 
-    this.logger.log('[WEBSOCKET-JS] - REF - READY STATE ', this.ws.readyState);
-
     if (this.ws && this.ws.readyState == 1) {
-
+      this.logger.log('[WEBSOCKET-JS] - REF - READY STATE ', this.ws.readyState);
       this.logger.log('[WEBSOCKET-JS] - REF - READY STATE = 1 > SUBSCRIBE TO TOPICS ');
 
       this.subscribe(topic);
@@ -172,11 +170,11 @@ export class WebSocketJs {
     var str = JSON.stringify(message);
     this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE str " + str);
 
-    if (this.ws.readyState == 1) {
+    if (this.ws && this.ws.readyState == 1) {
       this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TO TOPIC - STRING TO SEND " + str, " FOR UNSUBSCRIBE TO TOPIC: ", topic);
       this.send(str, `UNSUSCRIBE from ${topic}`);
 
-    } else {
+    } else if (this.ws) {
       this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TRY 'SEND' BUT READY STASTE IS : ", this.ws.readyState);
     }
   }
@@ -196,7 +194,7 @@ export class WebSocketJs {
   // -----------------------------------------------------------------------------------------------------
   close() {
     this.topics = [];
-    this.callbacks = []; 
+    this.callbacks = [];
     this.logger.log("[WEBSOCKET-JS] - CALLED CLOSE - TOPICS ", this.topics, ' - CALLLBACKS ', this.callbacks);
 
     if (this.ws) {
@@ -277,13 +275,13 @@ export class WebSocketJs {
 
       // Qui viene inviato un battito cardiaco Dopo averlo ricevuto, viene restituito un messaggio di battito cardiaco.
       // onmessage Ottieni il battito cardiaco restituito per indicare che la connessione è normale
-      if (this.ws.readyState == 1) {
+      if (this.ws && this.ws.readyState == 1) {
 
         // this.logger.log("[WEBSOCKET-JS] - HEART-START - SEND PING-MSG");
 
         this.send(JSON.stringify(this.pingMsg), 'HEART-START')
 
-      } else {
+      } else if (this.ws) {
 
         this.logger.log("[WEBSOCKET-JS] - HEART-START - TRY TO SEND PING-MSG BUT READY STATE IS ", this.ws.readyState);
 
@@ -442,7 +440,7 @@ export class WebSocketJs {
             // @ send PONG
             // -------------------
             // that.logger.log('[WEBSOCKET-JS] -  RECEIVED PING -> SEND PONG MSG');
-         
+
             that.send(JSON.stringify(that.pongMsg), 'ON-MESSAGE')
 
           } else {
@@ -465,15 +463,15 @@ export class WebSocketJs {
         if (json && json.payload && json.payload.message && that.isArray(json.payload.message)) {
 
           json.payload.message.forEach(element => {
-  
+
             //let insUp = that.insertOrUpdate(element);
             let insUp = json.payload.method;
-          
+
             var object = { event: json.payload, data: element };
 
             var callbackObj = that.callbacks.get(object.event.topic);
 
-         
+
             if (insUp == "CREATE") {
               if (that.onCreate) {
                 that.onCreate(element, object);
@@ -499,10 +497,10 @@ export class WebSocketJs {
         } else {
           //let insUp = that.insertOrUpdate(json.payload.message);
           let insUp = json.payload.method;
-         
+
           var object = { event: json.payload, data: json };
           var callbackObj = that.callbacks.get(object.event.topic);
-        
+
 
           if (insUp == "CREATE") {
             if (that.onCreate) {

package/src/app/services/websocket/websocket.service.ts

@@ -84,14 +84,14 @@ export class WebsocketService {
   }
 
   subscriptionToWsConversations(project_id) {
-    this.logger.log("[WS-SERV] - CALLED SUBSC TO WS CONVS - PROJECT ID ", project_id);
+    // console.log("[WS-SERV] - CALLED SUBSC TO WS CONVS - PROJECT ID ", project_id);
     var self = this;
     this.wsRequestsList = [];
 
     this.webSocketJs.ref('/' + project_id + '/requests', 'getCurrentProjectAndSubscribeTo_WsRequests',
 
       function (data, notification) {
-        // self.logger.log("[WS-SERV] - CONVS - CREATE DATA ", data);
+        // console.log("[WS-SERV] - CONVS - CREATE DATA ", data);
         if (data) {
           // ------------------------------------------------
           // @ Agents - pass in data agents get from snapshot
@@ -167,14 +167,21 @@ export class WebsocketService {
 
         if (index === -1) {
           self.addWsRequests(data)
-          // self.logger.log("[WS-REQUESTS-SERV] - CREATE - ADD REQUESTS");
+          // console.log("[WS-REQUESTS-SERV] - CREATE - ADD REQUESTS");
         } else {
-          // self.logger.log("[WS-REQUESTS-SERV] - CREATE - REQUEST ALREADY EXIST - NOT ADD");
+          // console.log("[WS-REQUESTS-SERV] - CREATE - REQUEST ALREADY EXIST - NOT ADD AND NOT PUBLISH");
+          // if (data !== null && data !== undefined) {
+          //   self.wsRequestsList.push(data);
+          // }
+          // if (self.wsRequestsList) {
+          //   self.wsRequestsList$.next(self.wsRequestsList);
+          //     console.log("[WS-SERV] -  NOT ADD - BUT PUBLIC ANYWAY ", self.wsRequestsList);
+          // }
         }
 
       }, function (data, notification) {
 
-        // self.logger.log("[WS-SERV] - CONVS - UPDATE DATA ", data);
+        // console.log("[WS-SERV] - CONVS - UPDATE DATA ", data);
 
         // -------------------------------------------------------
         // @ Agents (UPDATE) pass in data agents get from snapshot
@@ -191,8 +198,18 @@ export class WebsocketService {
 
 
       }, function (data, notification) {
-        // self.logger.log("[WS-SERV] - CONVS  - ON-DATA - DATA ", data);
-
+        self.logger.log("[WS-SERV] CHAT - CONVS  - ON-DATA - DATA ", data);
+        self.logger.log("[WS-SERV] CHAT - CONVS  - ON-DATA - notification ", notification);
+
+        // console.log("[WS-SERV] CHAT - CONVS  - ON-DATA - DATA notification > event > method ", notification.event.method);
+        if (notification.event.method === 'CREATE') {
+          self.wsRequestsList = [];
+          self.wsRequestsList.push(data)
+          self.logger.log("[WS-SERV] CHAT - CONVS  - ON-DATA - DATA wsRequestsList ", self.wsRequestsList);
+          if (self.wsRequestsList) {
+            self.wsRequestsList$.next(self.wsRequestsList);
+          }
+        }
       }
     );
   }
@@ -211,7 +228,8 @@ export class WebsocketService {
       // -----------------------------------------------------------------------------------------------------
       // publish all REQUESTS 
       // -----------------------------------------------------------------------------------------------------
-        this.wsRequestsList$.next(this.wsRequestsList);
+      this.wsRequestsList$.next(this.wsRequestsList);
+      // this.logger.log("[WS-SERV] -  ADD REQUESTS CONVS LIST ", this.wsRequestsList);
     }
   }
 

package/src/assets/i18n/en.json

@@ -186,5 +186,6 @@
   "YouAreAboutToJoinThisChat":"You are about to join this chat",
   "Cancel": "Cancel",
   "AreYouSure":"Are you sure?",
-  "UnassignedConversations":"Unassigned Conversations"
+  "UnassignedConversations":"Unassigned Conversations",
+  "NewConversations": "Nuove conversazioni"
 }

package/src/assets/i18n/it.json

@@ -194,5 +194,6 @@
     "YouAreAboutToJoinThisChat":"Stai per entrare in questa chat",
     "Cancel": "Annulla",
     "AreYouSure":"Sei sicuro?",
-    "UnassignedConversations":"Conversazioni non assegnate"
+    "UnassignedConversations":"Conversazioni non assegnate",
+    "NewConversations": "New conversations"
 }