@chat21/chat21-ionic 3.0.59-rc16 → 3.0.59-rc19

package/CHANGELOG.md

@@ -1,10 +1,18 @@
 # chat21-ionic ver 3.0
 
+### 3.0.59-rc19
+- Fixes the bug: when the chat is in "mobile" mode and from the dashboard the agent clicks on "Open chat" for a specific conversation the "back" button of the chat does not return to the list of conversations
+- Fixes the bug: when the chat is in "mobile" mode and from the dashboard the agent clicks on "Open chat" for a specific conversation the chat does not display the details of the conversation
+
+### 3.0.59-rc18
+- Improves the "app-config" service
+
 ### 3.0.59-rc16
 - Changes in config.xml the value of the "SplashScreen"
 - Improves the method to avoid page reloading when an agent clicks the "Open Chat" button of the dashboard on the realtime and non-real time conversation list page and on the conversation detail page
 - Modifies the "app-config" service by adding the ability to pass relative URLs to the websocket
 - Adds "wsUrlRel" property to env.sample, chat-config-template.json and chat-config.json
+- Adds a check in the "websocket-js.ts" service on the existence of the "ws" property of the "WebSocketJs" class before accessing the property "readyState"
 
 ### 3.0.59-rc15
 - Implements a method in app.components that counts and stores the number of open Chat tabs

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@chat21/chat21-ionic",
-    "version": "3.0.59-rc16",
+    "version": "3.0.59-rc19",
     "author": "Tiledesk SRL",
     "homepage": "https://ionicframework.com/",
     "scripts": {

package/src/app/app.component.ts

@@ -143,7 +143,9 @@ export class AppComponent implements OnInit {
   ) {
 
     this.saveInStorageNumberOfOpenedChatTab();
-    this.getPageState();
+
+    this.listenToUrlChanges();
+    // this.getPageState();
 
     // location.subscribe((val) => {
 
@@ -160,46 +162,48 @@ export class AppComponent implements OnInit {
     //   }
     // });
 
+
+
+
+  }
+
+  listenToUrlChanges() {
+    const self = this;
     window.addEventListener('hashchange', function () {
-      console.log('location changed!');
+      // console.log('location changed!');
+
       const convId = getParameterByName('convId')
-      console.log('[APP-COMP] ngOnInit convId get with getParameterByName  ', convId)
-   
+      // console.log('[APP-COMP] getParameterByName convId ', convId)
       if (convId) {
         setTimeout(() => {
-          events.publish('convid:haschanged', convId);
+          self.events.publish('supportconvid:haschanged', convId);
         }, 0);
       }
-    
-
-      // this.navigateToDetail(convId, requesterFullaname)
-
-    
-
-    })
 
+      const contact_id = getParameterByName('contact_id')
+      // console.log('[APP-COMP] getParameterByName contact_id ', contact_id)
+      const contact_fullname = getParameterByName('contact_fullname')
+      // console.log('[APP-COMP] getParameterByName contact_fullname ', contact_fullname)
+      if (contact_id && contact_fullname) {
+        setTimeout(() => {
+          self.router.navigateByUrl('conversation-detail/' + contact_id + '/' + contact_fullname + '/new');
+          self.events.publish('directconvid:haschanged', contact_id);
+        }, 0);
+        
+      } else {
+        // console.log('[APP-COMP] contact_id and contact_fullname are null')
+      }
 
-    // router.events.subscribe((val) => {
-    //   this.checkCurrentURL();
-    //  });
-    // FOR TEST
-    // const last_project = { "user_available": true, "number_assigned_requests": 59, "last_login_at": "2021-08-09T17:30:55.234Z", "status": "active", "_id": "6112bc8f58c958003495a2cb", "id_project": { "status": 100, "_id": "60ffe291f725db00347661ef", "name": "27-LUGLIO-21-STRIPE-TEST", "activeOperatingHours": false, "createdBy": "608ad02d3a4dc000344ade17", "profile": { "name": "pro", "trialDays": 30, "agents": 5, "type": "payment", "subStart": "2021-11-18T10:42:41.000Z", "subEnd": "2021-11-19T10:42:41.000Z", "subscriptionId": "sub_Jvf4kABe9t8JvX", "last_stripe_event": "invoice.payment_succeeded" }, "versions": 20115, "channels": [{ "name": "chat21" }], "createdAt": "2021-07-27T10:40:17.752Z", "updatedAt": "2021-11-18T11:55:01.346Z", "__v": 0, "widget": { "preChatForm": true, "preChatFormJson": [{ "name": "userFullname", "type": "text", "mandatory": true, "label": { "en": "Your name", "it": "Il tuo nome" } }, { "name": "userEmail", "type": "text", "mandatory": true, "regex": "/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/", "label": { "en": "Your email", "it": "La tua email" }, "errorLabel": { "en": "Invalid email address", "it": "Indirizzo email non valido" } }, { "name": "tel", "mandatory": true, "label": { "en": "Your phone number", "it": "Il tuo numero di telefono" } }], "preChatFormCustomFieldsEnabled": true }, "trialExpired": true, "trialDaysLeft": 84, "isActiveSubscription": true, "id": "60ffe291f725db00347661ef" }, "id_user": "60aa0fef1482fe00346854a7", "role": "admin", "createdBy": "608ad02d3a4dc000344ade17", "createdAt": "2021-08-10T17:51:11.318Z", "updatedAt": "2021-11-19T08:08:21.437Z", "__v": 0, "presence": { "status": "online", "changedAt": "2021-11-19T08:08:21.432Z" }, "isAuthenticated": true, "id": "6112bc8f58c958003495a2cb" }
-    // localStorage.setItem('last_project', JSON.stringify(last_project))
-  }
-  navigateToDetail(convId, requesterFullaname) {
-    console.log('[APP-COMP] navigateToDetail  ');
-    let pageUrl = 'conversation-detail/' + convId + '/' + requesterFullaname + '/active';
-    this.router.navigateByUrl(pageUrl);
-    this.location.replaceState('conversation-detail/' + convId + '/' + requesterFullaname + '/active');
+      const conversation_detail = getParameterByName('conversation_detail')
+      // console.log('[APP-COMP] getParameterByName conversation_detail ', conversation_detail)
+      if (conversation_detail) {
+        setTimeout(() => {
+          self.router.navigate(['conversation-detail/'])
+        }, 0);
+      } 
+    });
   }
 
-
-  // private checkCurrentURL() {
-  //   console.log("location : " + window.location.pathname)
-  //   const convId = getParameterByName('convId')
-  //   console.log('[APP-COMP] ngOnInit convId get with getParameterByName  ', convId)
-  //   this.events.publish('convid:haschanged', convId);
-  // }
   saveInStorageNumberOfOpenedChatTab() {
     this.logger.log('Calling saveInStorageChatOpenedTab!');
 
@@ -213,12 +217,13 @@ export class AppComponent implements OnInit {
     }
     const terminationEvent = 'onpagehide' in self ? 'pagehide' : 'unload';
     window.addEventListener(terminationEvent, (event) => {
-      localStorage.tabCount = +localStorage.tabCount - 1;
+      if (localStorage.tabCount > 0) {
+        localStorage.tabCount = +localStorage.tabCount - 1;
+      }
     }, { capture: true });
   }
 
   getPageState() {
-
     const getState = () => {
       localStorage.setItem('visibilityState', document.visibilityState)
       if (document.visibilityState === 'hidden') {
@@ -316,17 +321,7 @@ export class AppComponent implements OnInit {
     this.listenToPostMsgs();
   }
 
-  // ngAfterViewInit() {
-  //   console.log('[APP-COMP] ngAfterViewInit')
-  // }
-
-  // ngDoCheck(){
-  //   console.log('[APP-COMP] ngDoCheck')
-  // }
-
-
-
-
+ 
   listenToPostMsgs() {
     window.addEventListener("message", (event) => {
       // console.log("[APP-COMP] message event ", event);
@@ -736,7 +731,7 @@ export class AppComponent implements OnInit {
   }
 
   checkPlatform() {
-    this.logger.debug('[APP-COMP] checkPlatform');
+   console.log('[APP-COMP] checkPlatform');
     // let pageUrl = '';
     // try {
     //   const pathPage = this.route.snapshot.firstChild.routeConfig.path;
@@ -752,16 +747,21 @@ export class AppComponent implements OnInit {
     // }
 
     if (checkPlatformIsMobile()) {
+      // console.log('[APP-COMP] checkPlatformIsMobile',checkPlatformIsMobile());
       this.platformIs = PLATFORM_MOBILE;
       const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
-      this.logger.log('[APP-COMP] PLATFORM_MOBILE2 navigateByUrl', PLATFORM_MOBILE, this.route.snapshot);
+      // console.log('[APP-COMP]  platformIs', this.platformIs);
+      // console.log('[APP-COMP] PLATFORM', PLATFORM_MOBILE, 'route.snapshot', this.route.snapshot);
       if (!IDConv) {
         this.router.navigateByUrl('conversations-list')
       }
       // this.router.navigateByUrl(pageUrl);
       // this.navService.setRoot(ConversationListPage, {});
     } else {
+      // console.log('[APP-COMP] checkPlatformIsMobile',checkPlatformIsMobile());
       this.platformIs = PLATFORM_DESKTOP;
+      // console.log('[APP-COMP]  platformIs', this.platformIs);
+      // console.log('[APP-COMP] PLATFORM', PLATFORM_DESKTOP, 'route.snapshot',  this.route.snapshot);
       this.logger.log('[APP-COMP] PLATFORM_DESKTOP ', this.navService);
 
       this.navService.setRoot(ConversationListPage, {});
@@ -911,7 +911,7 @@ export class AppComponent implements OnInit {
 
     this.conversationsHandlerService.conversationChanged.subscribe((conversation: ConversationModel) => {
 
-      console.log('[APP-COMP] ***** subscribeConversationChanged conversation: ', conversation);
+      // console.log('[APP-COMP] ***** subscribeConversationChanged conversation: ', conversation);
       const currentUser = JSON.parse(this.appStorageService.getItem('currentUser'));
       this.logger.log('[APP-COMP] ***** subscribeConversationChanged current_user: ', currentUser);
 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.html

@@ -3,10 +3,8 @@
   <ion-toolbar>
     
     <ion-buttons slot="start">
-      <!-- (click)="pushPage('conversations-list')" -->
-      <ion-back-button text="" *ngIf="isMobile"
-          defaultHref="/conversations-list"
-         >
+      <!-- (click)="pushPage('conversations-list')" defaultHref="/conversations-list" -->
+      <ion-back-button style="display: block;" text="" *ngIf="isMobile" (click)="goBackToConversationList()">
       </ion-back-button> 
     </ion-buttons>
 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter, OnChanges } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
 
 // Logger
@@ -43,7 +43,8 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   constructor(
     public imageRepoService: ImageRepoService,
     private route: ActivatedRoute,
-    public platform: Platform
+    public platform: Platform,
+    private router: Router
   ) {
     this.route.paramMap.subscribe(params => {
 
@@ -125,4 +126,8 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   /** */
   pushPage(event) { }
 
+  goBackToConversationList() {
+    this.router.navigateByUrl('/conversations-list');
+  }
+
 }

package/src/app/pages/conversations-list/conversations-list.page.ts

@@ -106,23 +106,28 @@ export class ConversationListPage implements OnInit {
     this.listenGoOnline();
     this.listenGoOffline();
     this.listenToSwPostMessage();
-    this.listenConvIdHasChanged();
-
+    this.listenSupportConvIdHasChanged();
+    this.listenDirectConvIdHasChanged();
   }
 
-  listenConvIdHasChanged() {
-    this.events.subscribe('convid:haschanged', (convId) => {
-      console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - convId', convId);
-      // this.events.unsubscribe('profileInfoButtonClick:logout')
-      //       this.setUidConvSelected(uid , 'active')
-      // const conversation = {}
+  listenSupportConvIdHasChanged() {
+    this.events.subscribe('supportconvid:haschanged', (convId) => {
+      // console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - convId', convId);
       if (convId) {
         const conversationSelected = this.conversations.find(item => item.uid === convId);
-        console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - conversationSelected', conversationSelected);
+        // console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - conversationSelected', conversationSelected);
         this.onConversationSelected(conversationSelected)
       }
     });
+  }
 
+  listenDirectConvIdHasChanged() {
+    this.events.subscribe('directconvid:haschanged', (contact_id) => {
+      // console.log('[CONVS-LIST-PAGE] - listen To directconvid:haschanged - contact_id', contact_id);
+      if (contact_id) {
+        this.uidConvSelected = contact_id
+      }
+    });
   }
 
 
@@ -135,8 +140,8 @@ export class ConversationListPage implements OnInit {
 
     const currentUrl = this.router.url;
     this.logger.log('[CONVS-LIST-PAGE] current_url ngOnInit ', currentUrl);
-    this.route.queryParams.subscribe(params => {
-      this.logger.log('[CONVS-LIST-PAGE] ngOnInit params', params);
+    // this.route.queryParams.subscribe(params => {
+    //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params', params);
       // if (params && params.convselected) {
       //   console.log('[CONVS-LIST-PAGE] ngOnInit params convselected:', params.convselected);
 
@@ -150,23 +155,23 @@ export class ConversationListPage implements OnInit {
       // } else {
       //   console.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
       // }
-      if (params && params.contact_id && params.contact_fullname) {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params contact_id:', params.contact_id, 'contact_fullname ', params.contact_fullname);
-        this.router.navigateByUrl('conversation-detail/' + params.contact_id + '/' + params.contact_fullname + '/new');
-        this.uidConvSelected = params.contact_id
-      } else {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
-      }
+      // if (params && params.contact_id && params.contact_fullname) {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params contact_id:', params.contact_id, 'contact_fullname ', params.contact_fullname);
+      //   this.router.navigateByUrl('conversation-detail/' + params.contact_id + '/' + params.contact_fullname + '/new');
+      //   this.uidConvSelected = params.contact_id
+      // } else {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
 
-      if (params && params.conversation_detail) {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params conversation_detail:', params.conversation_detail);
-        this.router.navigateByUrl('conversation-detail/');
+      // if (params && params.conversation_detail) {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params conversation_detail:', params.conversation_detail);
+      //   this.router.navigateByUrl('conversation-detail/');
 
-      } else {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
-      }
+      // } else {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
 
-    });
+    // });
   }
 
 
@@ -605,7 +610,7 @@ export class ConversationListPage implements OnInit {
 
       if (this.route && this.route.snapshot && this.route.snapshot.firstChild) {
         const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
-        console.log('[CONVS-LIST-PAGE] conversationWith 2: ', IDConv);
+        this.logger.log('[CONVS-LIST-PAGE] conversationWith 2: ', IDConv);
         if (IDConv) {
           this.setUidConvSelected(IDConv);
         } else {
@@ -622,7 +627,7 @@ export class ConversationListPage implements OnInit {
    * ::: setUidConvSelected :::
    */
   setUidConvSelected(uidConvSelected: string, conversationType?: string,) {
-    console.log('[CONVS-LIST-PAGE] setuidCOnvSelected', uidConvSelected)
+    this.logger.log('[CONVS-LIST-PAGE] setuidCOnvSelected', uidConvSelected)
     this.uidConvSelected = uidConvSelected;
     // this.conversationsHandlerService.uidConvSelected = uidConvSelected;
     if (uidConvSelected) {
@@ -642,7 +647,7 @@ export class ConversationListPage implements OnInit {
   }
 
   onConversationSelected(conversation: ConversationModel) {
-    console.log('onConversationSelected conversation', conversation)
+    this.logger.log('onConversationSelected conversation', conversation)
     if (conversation.archived) {
       this.navigateByUrl('archived', conversation.uid)
       this.logger.log('[CONVS-LIST-PAGE] onConversationSelected archived conversation.uid ', conversation.uid)
@@ -739,16 +744,16 @@ export class ConversationListPage implements OnInit {
 
 
   navigateByUrl(converationType: string, uidConvSelected: string) {
-    console.log('[CONVS-LIST-PAGE] calling navigateByUrl: ');
-    console.log('[CONVS-LIST-PAGE] navigateByUrl uidConvSelected: ', uidConvSelected);
-    console.log('[CONVS-LIST-PAGE] navigateByUrl run  this.setUidConvSelected');
-    console.log('[CONVS-LIST-PAGE] navigateByUrl this.uidConvSelected ', this.uidConvSelected);
-    console.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected ', this.conversationSelected)
+    this.logger.log('[CONVS-LIST-PAGE] calling navigateByUrl: ');
+    this.logger.log('[CONVS-LIST-PAGE] navigateByUrl uidConvSelected: ', uidConvSelected);
+    this.logger.log('[CONVS-LIST-PAGE] navigateByUrl run  this.setUidConvSelected');
+    this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.uidConvSelected ', this.uidConvSelected);
+    this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected ', this.conversationSelected)
 
     this.setUidConvSelected(uidConvSelected, converationType);
     if (checkPlatformIsMobile()) {
-      console.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile());
-      console.log('[CONVS-LIST-PAGE] DESKTOP (window >= 768)', this.navService);
+      this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile());
+      this.logger.log('[CONVS-LIST-PAGE] DESKTOP (window >= 768)', this.navService);
       let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType;
       this.logger.log('[CONVS-LIST-PAGE] pageURL', pageUrl)
       this.router.navigateByUrl(pageUrl);

package/src/app/services/app-config.ts

@@ -30,7 +30,7 @@ export class AppConfigProvider {
 
     return this.http.get(this.appConfig.remoteConfigUrl)
       .toPromise().then((data: any ) => {
-        console.log('AppConfigService loadAppConfig data: ', data);
+        // console.log('AppConfigService loadAppConfig data: ', data);
  
         const allconfig = data
         // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig: ', allconfig);
@@ -44,44 +44,46 @@ export class AppConfigProvider {
           if (wsUrlRelIsEmpty === false) {
             // console.log('[APP-CONFIG-SERVICE]- loadAppConfig allconfig !!!! exist - SERVER_BASE_URL', data.apiUrl);
 
-            if (allconfig.apiUrl.indexOf("http://") !== -1) {
+            // if (allconfig.apiUrl.indexOf("http://") !== -1) {
 
-              const ws_url = allconfig.apiUrl.replace("http://", "ws://").slice(0, -1) + allconfig.wsUrlRel;
-              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTP - wsUrl', ws_url);
+            //   const ws_url = allconfig.apiUrl.replace("http://", "ws://").slice(0, -1) + allconfig.wsUrlRel;
+            //   // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTP - wsUrl', ws_url);
 
-              allconfig.wsUrl = ws_url
+            //   allconfig.wsUrl = ws_url
 
-            } else if (allconfig.apiUrl.indexOf("https://") !== -1) {
+            // } else if (allconfig.apiUrl.indexOf("https://") !== -1) {
 
-              const ws_url = allconfig.apiUrl.replace("https://", "wss://").slice(0, -1) + allconfig.wsUrlRel;
+            //   const ws_url = allconfig.apiUrl.replace("https://", "wss://").slice(0, -1) + allconfig.wsUrlRel;
 
-              allconfig.wsUrl = ws_url
+            //   allconfig.wsUrl = ws_url
 
-              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTPS - wsUrl', ws_url);
-            } else {
-              console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL !!! IS RELATIVE - window.location ', window.location);
+            //   // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTPS - wsUrl', ws_url);
+            // } else {
+            
+            
+              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL !!! IS RELATIVE - window.location ', window.location);
 
               // console.log(window.location)
 
               if (window.location.protocol === 'http:') {
-                allconfig.wsUrl = 'ws://' + window.location.hostname + '/ws/'
+                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
 
               } else if (window.location.protocol === 'https:') {
 
-                allconfig.wsUrl = 'wss://' + window.location.hostname + '/ws/'
+                allconfig.wsUrl = 'wss://' + window.location.hostname + allconfig.wsUrlRel
               } else {
 
-                allconfig.wsUrl = 'ws://' + window.location.hostname + '/ws/'
+                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
               }
-            }
+            // }
 
           } else {
-            console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! exist wsUrlRel but IS EMPTY');
+            // console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! exist wsUrlRel but IS EMPTY');
           }
 
         } else {
 
-          console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! does not exist wsUrlRel');
+          // console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! does not exist wsUrlRel');
         }
 
         this.appConfig = allconfig;

package/src/chat21-core/utils/utils-message.ts

@@ -19,7 +19,7 @@ export function isFirstMessage(i: number) {
         }
         return false;
       } catch (err) {
-        console.log('error: ', err);
+        console.error('error: ', err);
       }
     }
 }
@@ -103,7 +103,7 @@ export function getSizeImg(message: any, maxWidthImage?: number): any {
       }
       return sizeImage;
     } catch (err) {
-      console.log('error: ', err);
+      console.error('error: ', err);
       return;
     }
 }