@chat21/chat21-ionic 3.0.88-rc.2 → 3.0.89-rc.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # chat21-ionic ver 3.0
 
+### 3.0.89-rc.1
+- bug-fixed: projectId/project_name is undefined in conversations-list component
+
+### 3.0.88 in PROD
+
 ### 3.0.88-rc.2
 - added: enable email only if active by env parameter
 - added: emailSection env variable

package/package.json

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

package/src/app/components/canned-response/canned-response.component.ts

@@ -7,6 +7,7 @@ import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { compareValues, htmlEntities } from 'src/chat21-core/utils/utils';
+import { getProjectIdSelectedConversation } from 'src/chat21-core/utils/utils-message';
 
 @Component({
   selector: 'app-canned-response',
@@ -49,7 +50,7 @@ export class CannedResponseComponent implements OnInit {
   ngOnChanges(changes: SimpleChange){
     this.logger.debug('[CANNED] - loadTagsCanned strSearch ', this.currentString)
     if(changes && changes['conversationWith'] && (changes['conversationWith'].previousValue !== changes['conversationWith'].currentValue)){
-      this.projectID = this.getProjectIdSelectedConversation(this.conversationWith)
+      this.projectID = getProjectIdSelectedConversation(this.conversationWith)
       this.loadStoredCanned(this.projectID)
     }
     if(this.currentString !== undefined){
@@ -57,21 +58,21 @@ export class CannedResponseComponent implements OnInit {
     }
   }
 
-  getProjectIdSelectedConversation(conversationWith: string): string{
-    const conversationWith_segments = conversationWith.split('-')
-    // Removes the last element of the array if is = to the separator
-    if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
-      conversationWith_segments.pop()
-    }
+  // getProjectIdSelectedConversation(conversationWith: string): string{
+  //   const conversationWith_segments = conversationWith.split('-')
+  //   // Removes the last element of the array if is = to the separator
+  //   if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+  //     conversationWith_segments.pop()
+  //   }
 
-    this.logger.log('[CANNED] - getProjectIdSelectedConversation conversationWith_segments ', conversationWith_segments)
-    let projectId = ''
-    if (conversationWith_segments.length === 4) {
-      projectId = conversationWith_segments[2]
-      this.logger.log('[CANNED] - getProjectIdSelectedConversation projectId ', projectId)
-    }
-    return projectId
-  }
+  //   this.logger.log('[CANNED] - getProjectIdSelectedConversation conversationWith_segments ', conversationWith_segments)
+  //   let projectId = ''
+  //   if (conversationWith_segments.length === 4) {
+  //     projectId = conversationWith_segments[2]
+  //     this.logger.log('[CANNED] - getProjectIdSelectedConversation projectId ', projectId)
+  //   }
+  //   return projectId
+  // }
 
 
   loadStoredCanned(projectId){

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

@@ -231,7 +231,7 @@
               [supportMode]="supportMode"
               [leadInfo]="leadInfo"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
-              [emailSection]="appConfigProvider.getConfig().emailSection"
+              [emailSection]="isEmailEnabled"
               [isOpenInfoConversation]="openInfoConversation" 
               [translationMap]="translationsMap"
               [dropEvent]="dropEvent"

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

@@ -66,6 +66,7 @@ import {
   setChannelType,
 } from '../../../chat21-core/utils/utils'
 import {
+  getProjectIdSelectedConversation,
   isFirstMessage,
   isInfo,
   isMine,
@@ -146,6 +147,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public_Key: any;
   areVisibleCAR: boolean;
   supportMode: boolean;
+  isEmailEnabled: boolean;
   //SOUND
   setTimeoutSound: any;
   audio: any;
@@ -483,6 +485,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
     this.messages = [] // list messages of conversation
     this.isFileSelected = false // indicates if a file has been selected (image to upload)
+    this.isEmailEnabled = (this.appConfigProvider.getConfig().emailSection === 'true' || this.appConfigProvider.getConfig().emailSection === true)? true: false;
 
     if (checkPlatformIsMobile()) {
       this.isMobile = true
@@ -556,21 +559,21 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     })
   }
 
-  getProjectIdSelectedConversation(conversationWith: string): string{
-    const conversationWith_segments = conversationWith.split('-')
-    // Removes the last element of the array if is = to the separator
-    if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
-      conversationWith_segments.pop()
-    }
-
-    this.logger.log('[CONVS-DETAIL] - getProjectIdSelectedConversation conversationWith_segments ', conversationWith_segments)
-    let projectId = ''
-    if (conversationWith_segments.length === 4) {
-      projectId = conversationWith_segments[2]
-      this.logger.log('[CONVS-DETAIL] - getProjectIdSelectedConversation projectId ', projectId)
-    }
-    return projectId
-  }
+  // getProjectIdSelectedConversation(conversationWith: string): string{
+  //   const conversationWith_segments = conversationWith.split('-')
+  //   // Removes the last element of the array if is = to the separator
+  //   if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+  //     conversationWith_segments.pop()
+  //   }
+
+  //   this.logger.log('[CONVS-DETAIL] - getProjectIdSelectedConversation conversationWith_segments ', conversationWith_segments)
+  //   let projectId = ''
+  //   if (conversationWith_segments.length === 4) {
+  //     projectId = conversationWith_segments[2]
+  //     this.logger.log('[CONVS-DETAIL] - getProjectIdSelectedConversation projectId ', projectId)
+  //   }
+  //   return projectId
+  // }
 
   @HostListener('window:resize', ['$event'])
   onResize(event: any) {
@@ -803,7 +806,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       }
 
     }else {
-      const projectId = this.getProjectIdSelectedConversation(this.conversationWith)
+      const projectId = getProjectIdSelectedConversation(this.conversationWith)
       let project = localStorage.getItem(projectId)
       if(project){
         project = JSON.parse(project)
@@ -904,7 +907,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   getLeadDetail(){
     if(this.channelType !== TYPE_DIRECT){
       const tiledeskToken= this.tiledeskAuthService.getTiledeskToken();
-      const projectId = this.getProjectIdSelectedConversation(this.conversationWith)
+      const projectId = getProjectIdSelectedConversation(this.conversationWith)
       this.logger.debug('[CONVS-DETAIL] getLeadDetail - section ', projectId)
       this.tiledeskService.getRequest(this.conversationWith, projectId, tiledeskToken).subscribe((request: any)=>{
         this.logger.debug('[CONVS-DETAIL] getLeadDetail - selected REQUEST detail', request)
@@ -1020,8 +1023,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         attributes,
       )
 
-      let emailEnabled = this.appConfigProvider.getConfig().emailSection
-      if(emailEnabled && !this.leadIsOnline && this.leadInfo && this.leadInfo.email){
+      if(this.isEmailEnabled && !this.leadIsOnline && this.leadInfo && this.leadInfo.email){
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
         this.sendEmail(msg)
       }

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

@@ -48,6 +48,7 @@ import { NetworkService } from 'src/app/services/network-service/network.service
 import { Subject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
 import { TYPE_DIRECT } from 'src/chat21-core/utils/constants';
+import { getProjectIdSelectedConversation } from 'src/chat21-core/utils/utils-message';
 
 @Component({
   selector: 'app-conversations-list',
@@ -505,7 +506,7 @@ export class ConversationListPage implements OnInit {
     })
 
     this.conversationsHandlerService.conversationChanged.subscribe((conversation: ConversationModel) => {
-        // this.logger.log('[CONVS-LIST-PAGE] ***** subscribeConversationChanged *****', conversation);
+        this.logger.log('[CONVS-LIST-PAGE] ***** subscribeConversationChanged *****', conversation);
         // that.conversationsChanged(conversations)
         if (conversation) {
           this.onImageLoaded(conversation)
@@ -760,6 +761,14 @@ export class ConversationListPage implements OnInit {
         project = JSON.parse(project)
         conversation.attributes.project_name = project['name']
       }
+    }else{
+      const projectId = getProjectIdSelectedConversation(conversation.uid)
+      let project = localStorage.getItem(projectId)
+      if(project){
+        project = JSON.parse(project)
+        conversation.attributes.projectId = project['_id']
+        conversation.attributes.project_name = project['name']
+      }
     }
     // if(conversation.conversation_with_fullname === 'Guest '){
     //   conversation.conversation_with_fullname = 'guest' + '#' + this.getUUidConversation(conversation.uid)

package/src/chat-config-native-mqtt.json

@@ -31,6 +31,6 @@
     "supportMode": true,
     "archivedButton": true,
     "writeToButton": true,
-    "emailSection":true,
+    "emailSection":false,
     "wsUrl":"wss://console.native.tiledesk.com/mqws/ws"
 }

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

@@ -254,58 +254,59 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         const index = searchIndexInArrayForUid(this.conversations, conversation.conversation_with);
         if (index > -1) {
             // const conv = this.conversations[index];
-            // this.logger.log("Conversation to update found", conv);
+            this.logger.log("Conversation to update found", this.conversations[index]);
             this.updateConversationWithSnapshot(this.conversations[index], conversation);
             this.logger.debug('[MQTTConversationsHandler] conversationchanged.isnew', JSON.stringify(conversation))
-            this.conversations.sort(compareValues('timestamp', 'desc'));
             this.logger.log("this.conversations:" + JSON.stringify(this.conversations));
+            this.logger.log("Conversation updated --> ", this.conversations[index]);
             this.conversationChanged.next(this.conversations[index]);
+            this.conversations.sort(compareValues('timestamp', 'desc'));
         }
     }
 
     private updateConversationWithSnapshot(conv: ConversationModel, snap: any) {
         this.logger.debug('[MQTTConversationsHandler] updating conv', conv, 'with snap', snap)
         Object.keys(snap).forEach(k => {
-            this.logger.debug('[MQTTConversationsHandler] key:' + k);
+            // this.logger.debug('[MQTTConversationsHandler] key:' + k);
             if (k === 'is_new') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.is_new = snap[k];
             }
             if (k === 'text') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.last_message_text = snap[k];
                 conv.text = snap[k];
             }
             if (k === 'recipient') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.recipient = snap[k];
             }
             if (k === 'recipient_fullname') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.recipient_fullname = snap[k];
             }
             if (k === 'sender') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.sender = snap[k];
             }
             if (k === 'sender_fullname') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.sender_fullname = snap[k];
             }
             if (k === 'attributes') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.attributes = snap[k];
             }
             if (k === 'timestamp') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.timestamp = snap[k];
             }
             if (k === 'status') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.status = this.setStatusConversation(conv.sender, conv.uid);
             }
             if (k === 'type') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.type = snap[k];
             }
         });

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

@@ -166,4 +166,17 @@ export function hideInfoMessage(msg, infoMessageKeyEnabled): boolean{
   return true
 }
 
+export function getProjectIdSelectedConversation(conversationWith: string): string{
+  const conversationWith_segments = conversationWith.split('-')
+  // Removes the last element of the array if is = to the separator
+  if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+    conversationWith_segments.pop()
+  }
+  let projectId = ''
+  if (conversationWith_segments.length === 4) {
+    projectId = conversationWith_segments[2]
+  }
+  return projectId
+}
+