@chat21/chat21-ionic 3.0.97-rc.5 → 3.0.98-rc.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # chat21-ionic ver 3.0
 
+### 3.0.98-rc.1
+- changed: conversation.attributes.channel with conversation.attributes.request_channel to get the current convesation channel
+- bug-fixed: whatsapp template not enabled when agent is added to a whatsapp channel request
+
+### 3.0.97 in PROD
+
 ### 3.0.97-rc.5
 - added: whatsapp templates section to send an already configured whatsapp templete only in case of a whatsapp conversation channel type
 - added: channel input var in message-text-area component to manage the type of current conversation

package/package.json

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

package/src/app/app.component.ts

@@ -1151,16 +1151,16 @@ export class AppComponent implements OnInit {
 
     this.router.navigateByUrl('conversation-detail/'); //redirect to basePage
     if(this.IS_ON_MOBILE_DEVICE){
-        clearTimeout(this.timeModalLogin);
-        this.timeModalLogin = setTimeout(() => {
-          if (!this.hadBeenCalledOpenModal) {
-            this.authModal = this.presentModal('initAuthentication');
-            this.hadBeenCalledOpenModal = true;
-          }
-        }, 1000)
-      }else{
-        this.goToDashboardLogin()
-      }
+      clearTimeout(this.timeModalLogin);
+      this.timeModalLogin = setTimeout(() => {
+        if (!this.hadBeenCalledOpenModal) {
+          this.authModal = this.presentModal('initAuthentication');
+          this.hadBeenCalledOpenModal = true;
+        }
+      }, 1000)
+    }else{
+      this.goToDashboardLogin()
+    }
     
 
     // if (!this.hadBeenCalledOpenModal) {

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.html

@@ -106,12 +106,12 @@
         </div>
         <!-- SUPPORT-GROUP CONV -->
         <div  *ngIf="conversation.uid.startsWith(TYPE_SUPPORT_GROUP) && !IS_ON_MOBILE_DEVICE">
-          <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="conversation?.attributes && ( (conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_CHAT21) ||  !conversation?.attributes?.channel) " >
-          <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_EMAIL" >
-          <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_FORM" >
-          <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_MESSANGER" >
-          <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_WHATSAPP" >
-          <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_TELEGRAM" >
+          <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="conversation?.attributes && ( (conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_CHAT21) ||  !conversation?.attributes?.channel) " >
+          <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_EMAIL" >
+          <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_FORM" >
+          <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_MESSANGER" >
+          <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_WHATSAPP" >
+          <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_TELEGRAM" >
           <span *ngIf="conversation?.attributes?.project_name" class="truncate">{{conversation?.attributes?.project_name}}</span>
           <span *ngIf="!conversation?.attributes?.project_name" class="truncate">{{conversation?.attributes?.projectId}}</span>
         </div>

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

@@ -85,7 +85,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   addWhiteSpaceBefore: boolean;
   emojiPerLine: number = 9
   emojiColor: string ="#3880ff"
-  emojiiCategories = [ 'recent', 'people', 'nature', 'activity'] //, 'custom']
+  emojiiCategories = [ 'recent', 'people', 'nature', 'activity', 'flags'] //, 'custom']
 
   customEmojis = [
     {
@@ -146,7 +146,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
 
     }
     this.logger.log('[CONVS-DETAIL] - returnChangeTextArea ngOnChanges in [MSG-TEXT-AREA]  this.tagsCannedFilter.length ', this.tagsCannedFilter.length)
-    this.logger.log('[CONVS-DETAIL] - returnChangeTextArea ngOnChanges in [MSG-TEXT-AREA] channel', this.channel )
+    this.logger.log('[CONVS-DETAIL] - returnChangeTextArea ngOnChanges in [MSG-TEXT-AREA] channel', this.channel, this.whatsappTemplatesSection, this.emailSection )
 
     // use case drop
     if (this.dropEvent) {

package/src/app/modals/send-email/send-email.page.scss

@@ -1,5 +1,3 @@
-ion-content{
-}
 
 .content-container{
     padding-top: 40px;

package/src/app/modals/send-whatsapp-template/send-whatsapp-template.page.html

@@ -1,5 +1,5 @@
 <ion-header no-border class="ion-no-border">
-  <ion-toolbar>
+  <ion-toolbar class="beta">
     <ion-title *ngIf="!editTemplateView">{{ 'WHATSAPP.SELECT_MESSAGE_TEMPLATE' | translate }}</ion-title>
     <ion-title *ngIf="editTemplateView">Review and send template</ion-title>
     <ion-buttons slot="end">

package/src/app/modals/send-whatsapp-template/send-whatsapp-template.page.scss

@@ -338,3 +338,29 @@ ion-footer {
       }
 }
 
+ion-toolbar{
+    &.beta:after{
+        content: "beta";
+        position: fixed;
+        width: 80px;
+        height: 25px;
+        background: #EE8E4A;
+        top: 7px;
+        left: -20px;
+        text-align: center;
+        font-size: 13px;
+        font-family: sans-serif;
+        text-transform: uppercase;
+        font-weight: bold;
+        color: #fff;
+        line-height: 27px;
+        transform:rotate(-45deg);
+    }
+
+    ion-title{
+        margin-left: 30px;
+    }
+}
+
+
+

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

@@ -227,7 +227,7 @@
               [loggedUser]="loggedUser" 
               [conversationWith]="conversationWith" 
               [channelType]="channelType"
-              [channel]="conversation?.attributes?.channel"
+              [channel]="conversation?.attributes?.request_channel"
               [tagsCannedFilter]="tagsCannedFilter"
               [tagsCannedCount]="tagsCannedCount" 
               [areVisibleCAR]="areVisibleCAR" 

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

@@ -939,6 +939,9 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.logger.debug('[CONVS-DETAIL] getLeadDetail - section ', projectId)
       this.tiledeskService.getRequest(this.conversationWith, projectId, tiledeskToken).subscribe((request: any) => {
         that.logger.debug('[CONVS-DETAIL] getLeadDetail - selected REQUEST detail', request)
+        if(request && request.channel){
+          this.conversation.attributes['request_channel'] = request.channel.name
+        }
         if (request.lead && request.lead.email) {
           that.leadInfo = {
             lead_id: request.lead.lead_id,
@@ -970,15 +973,16 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       if (isInfo(message))
         return;
       if (index === 0)
-        text += 'On _' + date + ' - ' + time + '_ **' + message.sender_fullname + '**' + ' replied to you' + ': ' + '\n' +
+        text += 'On _' + date + ' - ' + time + '_ **' + message.sender_fullname.trimEnd() + '**' + ' replied to you' + ': ' + '\n' +
           message.text + '\n\n\n'
       if (index === 1)
         text += '_______________________________________________' + '\n' +
           '**' + 'CONVERSATION HISTORY:' + '**' + '\n' +
-          '**' + message.sender_fullname + '**' + ': ' + message.text + ' _(' + date + '-' + time + ')_' + '\n'
+          '**' + message.sender_fullname.trimEnd() + '**' + ': ' + message.text + ' _(' + date + '-' + time + ')_' + '\n'
       if (index > 1)
-        text += '**' + message.sender_fullname + '**' + ': ' + message.text + ' _(' + date + '-' + time + ')_' + '\n'
+        text += '**' + message.sender_fullname.trimEnd() + '**' + ': ' + message.text + ' _(' + date + '-' + time + ')_' + '\n'
     })
+
     return text
   }
 
@@ -1068,14 +1072,14 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         msg = `[${metadata.name}](${metadata.src})`
       }
     }
-    this.conversation.attributes && this.conversation.attributes['channel'] ? attributes.channel = this.conversation.attributes['channel'] : null;
+    this.conversation.attributes && this.conversation.attributes['request_channel'] ? attributes.channel = this.conversation.attributes['request_channel'] : null;
     metadata ? (metadata = metadata) : (metadata = '')
     this.logger.log('[CONVS-DETAIL] attributes--->>>> 1111', this.conversation.attributes, attributes)
     this.logger.log('[CONVS-DETAIL] - SEND MESSAGE msg: ', msg, ' - messages: ', this.messages, ' - loggedUser: ', this.loggedUser)
 
 
     const emailSectionMsg = (attributes && attributes['offline_channel'] === TYPE_MSG_EMAIL)
-    const channelIsNotEmailOrFormOrWhatsapp = (attributes && attributes['channel'] && (attributes['channel'] === TYPE_MSG_EMAIL || attributes['channel'] === TYPE_MSG_FORM || attributes['channel'] === CHANNEL_TYPE_WHATSAPP))
+    const channelIsNotEmailOrFormOrWhatsapp = (attributes && attributes['request_channel'] && (attributes['request_channel'] === TYPE_MSG_EMAIL || attributes['request_channel'] === TYPE_MSG_FORM || attributes['request_channel'] === CHANNEL_TYPE_WHATSAPP))
 
     if ((msg && msg.trim() !== '') || type !== TYPE_MSG_TEXT) {
 

package/src/chat21-core/providers/firebase/firebase-conversations-handler.ts

@@ -22,8 +22,9 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
 import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
-import { TOUCHING_OPERATOR } from '../../utils/constants';
+import { MESSAGE_TYPE_INFO, TOUCHING_OPERATOR } from '../../utils/constants';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { messageType } from 'src/chat21-core/utils/utils-message';
 
 
 // @Injectable({ providedIn: 'root' })
@@ -517,6 +518,10 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
 
     private changed(childSnapshot: any) {
         const oldConversation = this.conversations[searchIndexInArrayForUid(this.conversations, childSnapshot.key)]
+        //skip info message updates
+        if(messageType(MESSAGE_TYPE_INFO, oldConversation) ){
+            return;
+        }
         if (this.conversationGenerate(childSnapshot)) {
             const index = searchIndexInArrayForUid(this.conversations, childSnapshot.key);
             if (index > -1) {

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -23,6 +23,7 @@ import {
   searchIndexInArrayForUid,
   conversationMessagesRef
 } from '../../utils/utils';
+import { v4 as uuidv4 } from 'uuid';
 import { isSender, messageType } from '../../utils/utils-message';
 
 
@@ -111,7 +112,13 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             this.conversationWith, (message, topic) => {
                 this.logger.log('[MQTTConversationHandler] message added:', message, 'on topic:', topic);
                 const msg: MessageModel = message;        
-                msg.uid = message.message_id;
+                
+                //allow to replace message in unknown status (pending status: '0')
+                if(message.attributes && message.attributes.tempUID){
+                    msg.uid = message.attributes.tempUID;
+                }else{
+                    msg.uid = message.message_id
+                }
 
                 this.addedMessage(msg);
         });
@@ -170,6 +177,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const recipientFullname = conversationWithFullname;
         const recipientId = conversationWith;
         attributes.lang = language;
+        attributes.tempUID = uuidv4(); //allow to show message in a pending status
         this.chat21Service.chatClient.sendMessage(
             msg,
             typeMsg,
@@ -189,6 +197,25 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                 }
             }
         );
+
+        const message = new MessageModel(
+            attributes.tempUID, //allow to show message in a pending status 
+            language,
+            conversationWith,
+            recipientFullname,
+            sender,
+            senderFullname,
+            0,
+            metadataMsg,
+            msg,
+            Date.now(),
+            typeMsg,
+            attributes,
+            channelType,
+            false
+        );
+        this.addedMessage(message) //allow to show message in a pending status: add pending message in array of messages
+
         return new MessageModel(
             '',
             language,
@@ -402,7 +429,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
      */
     private updateMessageStatusReceived(msg) {
         this.logger.log('[MQTTConversationHandler] updateMessageStatusReceived', msg);
-        if (msg['status'] < MSG_STATUS_RECEIVED) {
+        if (msg['status'] < MSG_STATUS_RECEIVED && msg['status'] > 0) {
             this.logger.log('[MQTTConversationHandler] status ', msg['status'], ' < (RECEIVED:200)', MSG_STATUS_RECEIVED);
             if (msg.sender !== this.loggedUser.uid && msg.status < MSG_STATUS_RECEIVED) {
                 this.logger.log('[MQTTConversationHandler] updating message with status received');

package/src/chat21-core/providers/mqtt/mqtt-conversations-handler.ts

@@ -17,6 +17,8 @@ import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid } f
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
+import { messageType } from 'src/chat21-core/utils/utils-message';
+import { MESSAGE_TYPE_INFO } from 'src/chat21-core/utils/constants';
 // import { ImageRepoService } from '../abstract/image-repo.service';
 // import { ConsoleReporter } from 'jasmine';
 
@@ -251,6 +253,13 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         if (!conversation.conversation_with) {
             conversation.conversation_with = conversation.conversWith // conversWith comes from remote
         }
+
+        //skip info message updates
+        if(messageType(MESSAGE_TYPE_INFO, conversation) ){
+            return;
+        }
+        
+
         const index = searchIndexInArrayForUid(this.conversations, conversation.conversation_with);
         const oldConversation = this.conversations[index]
         if (index > -1) {

package/tsconfig.json

@@ -21,6 +21,7 @@
     ],
     "lib": [
       "es2018",
+      "es2019",
       "dom"
     ],
     "skipLibCheck": true