@chat21/chat21-ionic 3.0.60-rc2 → 3.0.60

package/src/assets/js/chat21client.js

@@ -1,7 +1,7 @@
 /*
     Chat21Client
 
-    v0.1.9
+    v0.1.10
 
     @Author Andrea Sponziello
     (c) Tiledesk 2020
@@ -124,7 +124,7 @@ class Chat21Client {
     }
 
     sendMessageRaw(outgoing_message, recipient_id, callback) {
-        // callback - function (err) 
+        // callback - function (err)
         // console.log("recipient_id:", recipient_id)
         let dest_topic = `apps/${this.appid}/outgoing/users/${this.user_id}/messages/${recipient_id}/outgoing`
         // console.log("dest_topic:", dest_topic)
@@ -784,8 +784,21 @@ class Chat21Client {
     }
 
     conversationDetail(conversWith, callback) {
+        this.crossConversationDetail(conversWith, false, callback);
+    }
+
+    archivedConversationDetail(conversWith, callback) {
+        this.crossConversationDetail(conversWith, true, callback);
+    }
+
+    crossConversationDetail(conversWith, archived, callback) {
+        let path = "conversations";
+        if (archived) {
+            path = "archived_conversations"
+        }
         // ex.: http://localhost:8004/tilechat/04-ANDREASPONZIELLO/conversations/CONVERS_WITH
-        const URL = `${this.APIendpoint}/${this.appid}/${this.user_id}/conversations/${conversWith}`
+        //const URL = `${this.APIendpoint}/${this.appid}/${this.user_id}/conversations/${conversWith}`
+        const URL = `${this.APIendpoint}/${this.appid}/${this.user_id}/${path}/${conversWith}`
         console.log("getting conversation detail:", URL)
         console.log("conversWith:", conversWith)
         var xmlhttp = new XMLHttpRequest();

package/src/chat-config-mqtt.json

@@ -23,4 +23,5 @@
     "apiUrl": "http://99.80.197.164:3000/",
     "baseImageUrl": "http://99.80.197.164:3000/",
     "dashboardUrl": "http://tiledesk-dashboard-pre.s3-eu-west-1.amazonaws.com/native-mqtt/dashboard/2.1.70-beta.1.6/index.html"
-}
+}
+

package/src/chat-config-pre-test.json

@@ -1,4 +1,5 @@
 {
+    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T",
     "chatEngine": "firebase",
     "uploadEngine": "firebase",
     "pushEngine": "firebase",
@@ -30,3 +31,4 @@
     "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/"
 }
 
+

package/src/chat-config-template.json

@@ -1,4 +1,5 @@
 {
+    "t2y12PruGU9wUtEGzBJfolMIgK": "${FEATURES_TOKEN}",
     "chatEngine": "${CHAT21_ENGINE}",
     "uploadEngine": "${UPLOAD_ENGINE}",
     "pushEngine":"${PUSH_ENGINE}",

package/src/chat-config.json

@@ -1,4 +1,5 @@
 {
+    "t2y12PruGU9wUtEGzBJfolMIgK": "",
     "chatEngine": "mqtt",
     "updloaEngine": "native",
     "pushEngine":"none",

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

@@ -18,8 +18,8 @@ import { ConversationHandlerService } from '../abstract/conversation-handler.ser
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 // utils
-import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO } from '../../utils/constants';
-import { compareValues,searchIndexInArrayForUid,conversationMessagesRef } from '../../utils/utils';
+import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO , TOUCHING_OPERATOR} from '../../utils/constants';
+import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 
 
 import { messageType } from 'src/chat21-core/utils/utils-message';
@@ -54,7 +54,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     private listSubsriptions: any[];
     private CLIENT_BROWSER: string;
     private lastDate = '';
-    private logger:LoggerService = LoggerInstance.getInstance()
+    private logger: LoggerService = LoggerInstance.getInstance()
     private ref: firebase.database.Query;
 
     constructor(@Inject('skipMessage') private skipMessage: boolean) {
@@ -64,8 +64,8 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     /**
      * inizializzo conversation handler
      */
-    initialize(recipientId: string,recipientFullName: string,loggedUser: UserModel,tenant: string,translationMap: Map<string, string>) {
-        this.logger.log('[FIREBASEConversationHandlerSERVICE] initWithRecipient',recipientId, recipientFullName, loggedUser, tenant, translationMap)
+    initialize(recipientId: string, recipientFullName: string, loggedUser: UserModel, tenant: string, translationMap: Map<string, string>) {
+        this.logger.log('[FIREBASEConversationHandlerSERVICE] initWithRecipient', recipientId, recipientFullName, loggedUser, tenant, translationMap)
         this.recipientId = recipientId;
         this.recipientFullname = recipientFullName;
         this.loggedUser = loggedUser;
@@ -74,7 +74,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         }
         this.tenant = tenant;
         this.translationMap = translationMap;
-        
+
         this.listSubsriptions = [];
         this.CLIENT_BROWSER = navigator.userAgent;
         this.conversationWith = recipientId;
@@ -159,20 +159,20 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
             false
         );
         const messageRef = firebaseMessagesCustomUid.push({
-                language: lang,
-                recipient: conversationWith,
-                recipient_fullname: recipientFullname,
-                sender: sender,
-                sender_fullname: senderFullname,
-                status: 0,
-                metadata: metadataMsg,
-                text: msg,
-                timestamp: firebase.database.ServerValue.TIMESTAMP,
-                type: typeMsg,
-                attributes: attributes,
-                channel_type: channelType
-                // isSender: true
-            });
+            language: lang,
+            recipient: conversationWith,
+            recipient_fullname: recipientFullname,
+            sender: sender,
+            sender_fullname: senderFullname,
+            status: 0,
+            metadata: metadataMsg,
+            text: msg,
+            timestamp: firebase.database.ServerValue.TIMESTAMP,
+            type: typeMsg,
+            attributes: attributes,
+            channel_type: channelType
+            // isSender: true
+        });
 
         // const message = new MessageModel(
         //     key,
@@ -190,9 +190,9 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         //     channelType, // channel_type
         //     true // is_sender
         // );
-        this.logger.debug('[FIREBASEConversationHandlerSERVICE] sendMessage --> messages: ',  this.messages);
-        this.logger.debug('[FIREBASEConversationHandlerSERVICE] sendMessage --> senderFullname: ',  senderFullname);
-        this.logger.debug('[FIREBASEConversationHandlerSERVICE] sendMessage --> sender: ',  sender);
+        this.logger.debug('[FIREBASEConversationHandlerSERVICE] sendMessage --> messages: ', this.messages);
+        this.logger.debug('[FIREBASEConversationHandlerSERVICE] sendMessage --> senderFullname: ', senderFullname);
+        this.logger.debug('[FIREBASEConversationHandlerSERVICE] sendMessage --> sender: ', sender);
         this.logger.debug('[FIREBASEConversationHandlerSERVICE] sendMessage --> SEND MESSAGE: ', msg, channelType);
         return message
     }
@@ -213,7 +213,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     //     const attributes: any = {
     //         client: this.CLIENT_BROWSER,
     //         sourcePage: location.href,
-            
+
     //     };
 
     //     if(this.loggedUser && this.loggedUser.email ){
@@ -222,7 +222,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     //     if(this.loggedUser && this.loggedUser.fullname) {
     //         attributes.userFullname = this.loggedUser.fullname
     //     }
-        
+
 
     //     // let attributes: any = JSON.parse(sessionStorage.getItem('attributes'));
     //     // if (!attributes || attributes === 'undefined') {
@@ -242,7 +242,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     private added(childSnapshot: any) {
         const msg = this.messageGenerate(childSnapshot);
         // msg.attributes && msg.attributes['subtype'] === 'info'
-        if(this.skipMessage && messageType(MESSAGE_TYPE_INFO, msg)){
+        if (this.skipMessage && messageType(MESSAGE_TYPE_INFO, msg)) {
             return;
         }
         this.addRepalceMessageInArray(childSnapshot.key, msg);
@@ -254,12 +254,12 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         const msg = this.messageGenerate(childSnapshot);
         // imposto il giorno del messaggio per visualizzare o nascondere l'header data
         // msg.attributes && msg.attributes['subtype'] === 'info'
-        if(this.skipMessage && messageType(MESSAGE_TYPE_INFO, msg) ){
+        if (this.skipMessage && messageType(MESSAGE_TYPE_INFO, msg)) {
             return;
         }
         this.addRepalceMessageInArray(childSnapshot.key, msg);
         this.messageChanged.next(msg);
-        
+
     }
 
     /** */
@@ -274,7 +274,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
 
     /** */
     private messageGenerate(childSnapshot: any) {
-        const msg: MessageModel = childSnapshot.val();        
+        const msg: MessageModel = childSnapshot.val();
         msg.uid = childSnapshot.key;
         // controllo fatto per i gruppi da rifattorizzare
         if (!msg.sender_fullname || msg.sender_fullname === 'undefined') {
@@ -285,7 +285,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         //     msg.text = htmlEntities(msg.text)
         //     msg.text = replaceEndOfLine(msg.text)
         // }
-        
+
         // verifico che il sender è il logged user
         msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
         // traduco messaggi se sono del server
@@ -324,6 +324,8 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         const INFO_SUPPORT_USER_ADDED_VERB = this.translationMap.get('INFO_SUPPORT_USER_ADDED_VERB');
         const INFO_SUPPORT_CHAT_REOPENED = this.translationMap.get('INFO_SUPPORT_CHAT_REOPENED');
         const INFO_SUPPORT_CHAT_CLOSED = this.translationMap.get('INFO_SUPPORT_CHAT_CLOSED');
+        const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
+
         if (message.attributes.messagelabel
             && message.attributes.messagelabel.parameters
             && message.attributes.messagelabel.key === MEMBER_JOINED_GROUP
@@ -355,6 +357,15 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_CLOSED)) {
             message.text = INFO_SUPPORT_CHAT_CLOSED;
         }
+        // ['last_message_text']
+        else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
+            // console.log('FIREBASEConversationHandlerSERVICE message text', message.text)
+            const textAfterColon = message.text.split(":")[1]
+            // console.log('FIREBASEConversationHandlerSERVICE message text - textAfterColon', textAfterColon)
+            if (textAfterColon !== undefined) {
+                message.text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;
+            }
+        }
     }
 
 
@@ -368,9 +379,9 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     private setStatusMessage(msg: MessageModel, conversationWith: string) {
         if (msg.status < MSG_STATUS_RECEIVED) {
             if (msg.sender !== this.loggedUser.uid && msg.status < MSG_STATUS_RECEIVED) {
-            const urlNodeMessagesUpdate  = this.urlNodeFirebase + '/' + msg.uid;
-            this.logger.debug('[FIREBASEConversationHandlerSERVICE] update message status', urlNodeMessagesUpdate);
-            firebase.database().ref(urlNodeMessagesUpdate).update({ status: MSG_STATUS_RECEIVED });
+                const urlNodeMessagesUpdate = this.urlNodeFirebase + '/' + msg.uid;
+                this.logger.debug('[FIREBASEConversationHandlerSERVICE] update message status', urlNodeMessagesUpdate);
+                firebase.database().ref(urlNodeMessagesUpdate).update({ status: MSG_STATUS_RECEIVED });
             }
         }
     }
@@ -403,14 +414,14 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     // }
 
 
-  unsubscribe(key: string) {
-    this.listSubsriptions.forEach(sub => {
-        this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
-    	if (sub.uid === key) {
-			this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
-			sub.unsubscribe(key, null);
-			return;
-      	}
-    });
-  }
+    unsubscribe(key: string) {
+        this.listSubsriptions.forEach(sub => {
+            this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
+            if (sub.uid === key) {
+                this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
+                sub.unsubscribe(key, null);
+                return;
+            }
+        });
+    }
 }

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

@@ -22,6 +22,7 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
 import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
+import { TOUCHING_OPERATOR } from '../../utils/constants';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 
 
@@ -476,6 +477,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
             conversation_with = conv.recipient;
             conversation_with_fullname = conv.recipient_fullname;
             conv.sender_fullname = this.translationMap.get('YOU')
+
             // conv.last_message_text = YOU + conv.last_message_text;
             // } else if (conv.channel_type === TYPE_GROUP) {
         } else if (isGroup(conv)) {
@@ -484,6 +486,12 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
             conversation_with = conv.recipient;
             conversation_with_fullname = conv.recipient_fullname;
         }
+        if (conv.attributes && conv.attributes.subtype) {
+            if (conv.attributes.subtype === 'info' || conv.attributes.subtype === 'info/support') {
+                this.translateInfoSupportMessages(conv);
+            }
+        }
+
         conv.conversation_with = conversation_with;
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
@@ -496,6 +504,21 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     }
 
 
+    translateInfoSupportMessages(conv) {
+        const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
+        // console.log('[FIREBASEConversationsHandlerSERVICE] INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU', INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU) 
+        if ((conv.attributes && conv.attributes.messagelabel && conv.attributes.messagelabel.key === TOUCHING_OPERATOR) && conv.sender === "system") {
+            // console.log('FIREBASEConversationsHandlerSERVICE last_message_text', conv.last_message_text)
+            const textAfterColon = conv.last_message_text.split(":")[1]
+            // console.log('FIREBASEConversationsHandlerSERVICE last_message_text - textAfterColon', textAfterColon)
+            // message.text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ' ' + textAfterColon;
+            if (textAfterColon !== undefined) {
+                conv.last_message_text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;
+            }
+        }
+    }
+
+
 
     /** */
     private setStatusConversation(sender: string, uid: string): string {

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

@@ -82,7 +82,7 @@ export class MQTTArchivedConversationsHandler extends ArchivedConversationsHandl
             callback(conversation);
         } else {
             console.log('Not found locally, remote.getConversationDetail *****: ', conversation);
-            this.chat21Service.chatClient.conversationDetail(conversationWith, (conversation) => {
+            this.chat21Service.chatClient.archivedConversationDetail(conversationWith, (err, conversation) => {
                 if (conversation) {
                     if (callback) {
                         callback(this.completeConversation(conversation));

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

@@ -60,6 +60,8 @@ export const MESSAGE_TYPE_DATE = 'DATE';
 export const CHAT_REOPENED = 'CHAT_REOPENED';
 export const CHAT_CLOSED = 'CHAT_CLOSED';
 export const MEMBER_JOINED_GROUP = 'MEMBER_JOINED_GROUP';
+export const TOUCHING_OPERATOR = "TOUCHING_OPERATOR"
+
 
 // URLS
 // export const URL_SOUND = 'assets/sounds/pling.mp3';

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

@@ -13,7 +13,7 @@ import { ConversationModel } from '../models/conversation';
 import { MAX_WIDTH_IMAGES, TYPE_DIRECT, TYPE_SUPPORT_GROUP } from './constants';
 
 import { avatarPlaceholder, getColorBck, getImageUrlThumbFromFirebasestorage } from './utils-user';
-
+import { TooltipOptions } from 'ng2-tooltip-directive';
 
 /**
  * Shortest description  for phone and tablet
@@ -31,6 +31,17 @@ export function windowsMatchMedia() {
   }
 }
 
+
+export const DefaultTooltipOptions: TooltipOptions = {
+  'show-delay': 500,
+  'tooltip-class': 'chat-tooltip',
+  'theme': 'light',
+  'shadow': false,
+  'hide-delay-mobile': 0,
+  'hideDelayAfterClick': 3000,
+  'hide-delay': 200
+}
+
 /**
  * chiamata da ChatConversationsHandler
  * restituisce url '/conversations'

package/src/global.scss

@@ -531,6 +531,10 @@ select:-webkit-autofill:focus {
     // border: 0px solid #000000;
 }
 
+#canned > ion-list > ion-item > div > div.nocannedTitle {
+   color: #f44336
+}
+
 .highlight-search-string {
     color: #1877f2 !important;
 }