@chat21/chat21-ionic 3.4.1 → 3.4.3-rc.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # chat21-ionic ver 3.0
 
+### 3.4.3-rc.1
+- added: encodeUri for project name on chatbot share link
+- added: offlineMsgEmail project email to emable/disable automatic offline msg email
+
+### 3.4.2 in PROD
+- added: chat21client v0.1.12.8
+
 ### 3.4.1 in PROD
 - bug-fixed: supportMode parameter is not typed as boolean
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.4.1",
+    "version": "3.4.3-rc.1",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -27,7 +27,7 @@ import { CustomTranslateService } from 'src/chat21-core/providers/custom-transla
 import { NotificationsService } from 'src/chat21-core/providers/abstract/notifications.service';
 import { NetworkService } from './services/network-service/network.service';
 import { ScriptService } from './services/scripts/script.service';
-import { AUTH_STATE_OFFLINE, AUTH_STATE_ONLINE, PLATFORM_DESKTOP, PLATFORM_MOBILE, tranlatedLanguage, TYPE_DIRECT, URL_SOUND_CONVERSATION_ADDED, URL_SOUND_CONVERSATION_UNASSIGNED, URL_SOUND_LIST_CONVERSATION } from 'src/chat21-core/utils/constants';
+import { AUTH_STATE_CLOSE, AUTH_STATE_OFFLINE, AUTH_STATE_ONLINE, PLATFORM_DESKTOP, PLATFORM_MOBILE, tranlatedLanguage, TYPE_DIRECT, URL_SOUND_CONVERSATION_ADDED, URL_SOUND_CONVERSATION_UNASSIGNED, URL_SOUND_LIST_CONVERSATION } from 'src/chat21-core/utils/constants';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ConversationModel } from 'src/chat21-core/models/conversation';
 import { LoginPage } from './pages/authentication/login/login.page';
@@ -1073,8 +1073,16 @@ export class AppComponent implements OnInit {
           // this.checkTokenAndGoOffline() //se c'è un tiledeskToken salvato, allora aspetta, altrimenti vai offline
           this.IS_ONLINE = false;
           // console.log('[APP-COMP] IS_ONLINE', this.IS_ONLINE)
-          this.goOffLine()
+          this.goOffLine();
           this.triggerOnAuthStateChanged(state)
+        } else if(state && state === AUTH_STATE_CLOSE ){
+          this.logger.info('[APP-COMP] CLOSE - CHANNEL CLOSED: ', this.chatManager);
+          // let IDConv= null
+          // if(this.route &&  this.route.snapshot && this.route.snapshot.firstChild){
+          //   IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
+          //   this.chatManager.removeConversationHandler(IDConv);
+          // }
+          // this.checkPlatform();
         }
       }, error => {
         this.logger.error('initialize FROM [APP-COMP] - [APP-COMP] ***** BSAuthStateChanged * error * ', error)

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.html

@@ -22,7 +22,7 @@
       </ion-button>
     </div>
     
-    <div *ngIf="section==='chat' && channel !== CHANNEL_TYPE.WHATSAPP && messageString && (leadInfo?.presence['status']==='offline' && leadInfo?.hasEmail)" class="section-option offline-lead-tip" >
+    <div *ngIf="offlineMsgEmail && section==='chat' && channel !== CHANNEL_TYPE.WHATSAPP && messageString && (leadInfo?.presence['status']==='offline' && leadInfo?.hasEmail)" class="section-option offline-lead-tip" >
       {{translationMap.get('EMAIL.EMAIL_OFFLINE_TIP')}}
     </div>
 

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.ts

@@ -54,6 +54,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() leadInfo: {lead_id: string, hasEmail: boolean, email: string, projectId: string, presence: {}};
   @Input() fileUploadAccept: string;
   @Input() emailSection: boolean;
+  @Input() offlineMsgEmail: boolean;
   @Input() whatsappTemplatesSection: boolean;
   @Input() isOpenInfoConversation: boolean;
   @Input() stylesMap: Map<string, string>;

package/src/app/components/navbar/navbar.component.ts

@@ -159,7 +159,7 @@ export class NavbarComponent implements OnInit {
     const simulateVisitorBtnElem = <HTMLElement>document.querySelector('.simulate-visitor-btn');
     simulateVisitorBtnElem.blur();
     // + '&isOpen=true'
-    const url = this.appConfigProvider.getConfig().widgetBaseUrl + 'assets/twp/index.html?tiledesk_projectid=' + this.project.id_project.id + '&project_name=' + this.project.id_project.name + '&role=' + this.USER_ROLE
+    const url = this.appConfigProvider.getConfig().widgetBaseUrl + 'assets/twp/index.html?tiledesk_projectid=' + this.project.id_project.id + '&project_name=' + encodeURIComponent(this.project.id_project.name) + '&role=' + this.USER_ROLE
     window.open(url, '_blank');
   }
 

package/src/app/pages/conversation-detail/conversation-detail.page.html

@@ -236,6 +236,7 @@
               [leadInfo]="leadInfo"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
               [emailSection]="isEmailEnabled"
+              [offlineMsgEmail]="offlineMsgEmail"
               [whatsappTemplatesSection]="isWhatsappTemplatesEnabled"
               [isOpenInfoConversation]="openInfoConversation" 
               [stylesMap]="styleMap"

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -160,6 +160,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   areVisibleCAR: boolean;
   supportMode: boolean;
   isEmailEnabled: boolean;
+  offlineMsgEmail: boolean;
   isWhatsappTemplatesEnabled: boolean;
   //SOUND
   setTimeoutSound: any;
@@ -524,9 +525,9 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.disableTextarea = false
       this._getProjectIdByConversationWith(this.conversationWith)
       this.initConversationHandler()
-      this.initGroupsHandler()
-      this.initSubscriptions()
-      this.startConversation()
+      this.initGroupsHandler();
+      this.startConversation();
+      this.initSubscriptions();
       this.getLeadDetail()
       this.initializeTyping();
     }
@@ -556,6 +557,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       if (project) {
         const projectId = project.id_project
         this.canShowCanned = this.checkPlanIsExpired(project)
+        this.offlineMsgEmail = this.checkOfflineMsgEmailIsEnabled(project)
       }
     }, (error) => {
       this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
@@ -588,6 +590,23 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     return check
   }
 
+
+  checkOfflineMsgEmailIsEnabled(project: Project): boolean {
+    let check: boolean = true
+
+    //case: check emailSection env variable 
+    if(!this.isEmailEnabled){
+      return check= false
+    }
+
+    //case: check offlineMsgEmail project property
+    if(project && project.hasOwnProperty('offlineMsgEmail')){
+      check = project.offlineMsgEmail
+    }
+
+    return check
+  }
+
   // getProjectIdSelectedConversation(conversationWith: string): string{
   //   const conversationWith_segments = conversationWith.split('-')
   //   // Removes the last element of the array if is = to the separator
@@ -879,7 +898,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.attributes['project_name'],
             conv.attributes['request_channel']
           )
-
         }
         if (!conv) {
           this.logger.debug('[CONV-COMP] setHeaderContent getConversationDetail: conv not exist --> search in archived list', this.conversationWith, this.conv_type)
@@ -1120,8 +1138,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
     if ((msg && msg.trim() !== '') || type !== TYPE_MSG_TEXT) {
 
-
-      if (this.isEmailEnabled &&
+      if (this.offlineMsgEmail &&
         this.leadInfo && this.leadInfo.presence && this.leadInfo.presence['status'] === 'offline' &&
         this.leadInfo.email && !emailSectionMsg && !channelIsNotWeb) {
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
@@ -1317,7 +1334,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   updateLeadInfo(msg) {
     if (msg.attributes && msg.attributes.hasOwnProperty("updateUserFullname")) {
       const userFullname = msg.attributes['updateUserFullname'];
-      this.logger.debug('[CONVS-DETAIL] newMessageAdded --> updateUserFullname', userFullname)
+      this.logger.debug('[CONVS-DETAIL] newMessageAdded --> updateUserFullname', userFullname, this.conversation)
       this.conversationWithFullname = userFullname //update info for next sendMessage object
       //updates conversation header info
       this.conversationAvatar = setConversationAvatar(

package/src/app/utils/utils-resources.ts

@@ -7,7 +7,7 @@ export const BRAND_BASE_INFO: { [key: string] : string | boolean} ={
     FAVICON: "https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v13-300x300.png",
     META_TITLE:"Tiledesk - Open Source Live Chat",
     DOCS: true,
-    LOGOUT_ENABLED: false
+    LOGOUT_ENABLED: true
 }
 
 export var LOGOS_ITEMS: { [key: string] : { label: string | boolean, icon: string }} ={

package/src/assets/js/chat21client.js

@@ -1,7 +1,7 @@
 /*
     Chat21Client
 
-    v0.1.12.7
+    v0.1.12.8
 
     @Author Andrea Sponziello
     @Member Gabriele Panico
@@ -24,6 +24,7 @@ class Chat21Client {
         this.reconnections = 0 // just to check how many reconnections
         this.client_id = this.uuidv4();
         this.log = options.log ? true : false;
+
         if (options && options.MQTTendpoint) {
             if (options.MQTTendpoint.startsWith('/')) {
                 if (this.log) {
@@ -1021,25 +1022,31 @@ class Chat21Client {
                 );
             }
         );
+        this.client.on('error',
+            (error) => {
+                console.error("Chat client error event", error);
+            }
+        );
+    }
+
+    onDisconnect(callback){
         this.client.on('reconnect',
             () => {
                 if (this.log) {console.log("Chat client reconnect event");}
+                // callback('reconnect')
             }
         );
         this.client.on('close',
             () => {
                 this.connected = false
                 if (this.log) {console.log("Chat client close event");}
+                callback('close')
             }
         );
         this.client.on('offline',
             () => {
                 if (this.log) {console.log("Chat client offline event");}
-            }
-        );
-        this.client.on('error',
-            (error) => {
-                console.error("Chat client error event", error);
+                // callback('offline')
             }
         );
     }

package/src/chat21-core/models/projects.ts

@@ -19,6 +19,7 @@ export interface Project {
     // profile_type?: string;
     isActiveSubscription?: boolean;
     profile?: any;
+    offlineMsgEmail?: boolean;
     // subscription_end_date?: any;
     // subscription_id?: any;
     // subscription_creation_date?: any;

package/src/chat21-core/providers/mqtt/mqtt-auth-service.ts

@@ -246,8 +246,7 @@ z
     const responseType = 'text';
     const postData = {};
     // const that = this;
-    this.http.post(this.URL_TILEDESK_CREATE_CUSTOM_TOKEN, postData, { headers, responseType})
-    .subscribe(data =>  {
+    this.http.post(this.URL_TILEDESK_CREATE_CUSTOM_TOKEN, postData, { headers, responseType}).subscribe(data =>  {
       this.logger.debug("[MQTTAuthService] connectWithCustomToken: **** data", data)
       const result = JSON.parse(data);
       this.connectMQTT(result);
@@ -262,9 +261,17 @@ z
     this.chat21Service.chatClient.connect(userid, credentials.token, () => {
       this.logger.debug('[MQTTAuthService] connectMQTT: Chat connected.');
       this.BSAuthStateChanged.next('online');
+      this.onDisconnectMQTT();
     });
   }
 
+  onDisconnectMQTT(): any{
+    this.chat21Service.chatClient.onDisconnect((state)=> {
+      this.logger.debug('[MQTTAuthService] onDisconnect --> ', state)
+      this.BSAuthStateChanged.next('close');
+    })
+  }
+
   // /**
   //  * createCompleteUser
   //  * @param user

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

@@ -13,7 +13,8 @@ export const PUSH_ENGINE_FIREBASE = 'firebase';
 
 // AUTH
 export const AUTH_STATE_OFFLINE = 'offline';
-export const AUTH_STATE_ONLINE = 'online'
+export const AUTH_STATE_ONLINE = 'online';
+export const AUTH_STATE_CLOSE = 'close';
 
 
 // MESSAGES STATUS