@chat21/chat21-ionic 3.0.109-rc.2 → 3.1.0-rc1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # chat21-ionic ver 3.0
 
+### 3.1.0-rc1
+- added: INFO_MESSAGE_TYPE enum added to manage info message keys into message.attributes object
+- changed: route to main page ('/conversation-detail') when a conversation is closed or abandoned
+- bug-fixed: if agent abandoned a chat, detail still remain visible and can send message
+
 ### 3.0.109 in PROD
 
 ### 3.0.109-rc.1

package/config.xml

@@ -103,6 +103,9 @@
         <splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
         <splash height="828" src="resources/ios/splash/Default-Landscape-1792h~iphone.png" width="1792" />
     </platform>
+    <platform name="browser">
+        <preference name="ShowSplashScreen" value="false" />
+    </platform>
     <engine name="browser" spec="^5.0.4" />
     <plugin name="cordova-android-support-gradle-release" spec="^3.0.1">
         <variable name="ANDROID_SUPPORT_VERSION" value="27.+" />

package/package.json

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

package/src/app/app.component.ts

@@ -1119,7 +1119,8 @@ export class AppComponent implements OnInit {
       this.logger.log('[APP-COMP] ***** conversationRemoved *****', conversation);
       if(conversation) { 
         this.updateConversationsOnStorage();
-        this.segmentResolved(conversation)
+        this.segmentResolved(conversation);
+        this.router.navigateByUrl('conversation-detail/'); //redirect to basePage
       }
     });
   }

package/src/app/components/sidebar/sidebar.component.html

@@ -222,7 +222,7 @@
 
     </ul>
 
-    <div matTooltipClass="custom-mat-tooltip" [matTooltip]="LOGOS_ITEMS['COMPANY_LOGO_NO_TEXT'].label" class="logoBrand"
+    <div matTooltipClass="custom-mat-tooltip" [matTooltip]="BRAND_BASE_INFO['COMPANY_NAME']" class="logoBrand"
       #tooltip="matTooltip" matTooltipPosition='right' matTooltipHideDelay="100">
       <!-- ------------------------------------------- -->
       <!-- LOGO BRAND  (click)="goToOfficialSite()" -->

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

@@ -60,6 +60,7 @@ export class SidebarComponent implements OnInit {
   dashboard_settings_url: string;
   tiledesk_url: string;
   LOGOS_ITEMS = LOGOS_ITEMS;
+  BRAND_BASE_INFO = BRAND_BASE_INFO;
   constructor(
     public imageRepoService: ImageRepoService,
     public appStorageService: AppStorageService,
@@ -77,7 +78,7 @@ export class SidebarComponent implements OnInit {
     this.tiledesk_url = BRAND_BASE_INFO['COMPANY_SITE_URL']
     
     this.DASHBOARD_URL = this.appConfig.getConfig().dashboardUrl + '#/project/';
-    // console.log('[SIDEBAR] DASHBOARD_URL ', this.DASHBOARD_URL)
+    console.log('[SIDEBAR] DASHBOARD_URL ', this.DASHBOARD_URL, LOGOS_ITEMS)
     this.getStoredProjectAndUserRole()
     this.subcribeToAuthStateChanged()
     this.listenTocurrentProjectUserUserAvailability$()

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

@@ -61,7 +61,8 @@ import {
   TYPE_MSG_EMAIL,
   TYPE_MSG_FORM,
   CHANNEL_TYPE_TELEGRAM,
-  CHANNEL_TYPE_WHATSAPP
+  CHANNEL_TYPE_WHATSAPP,
+  INFO_MESSAGE_TYPE
 } from 'src/chat21-core/utils/constants'
 import {
   checkPlatformIsMobile,
@@ -71,6 +72,7 @@ import {
 } from '../../../chat21-core/utils/utils'
 import {
   getProjectIdSelectedConversation,
+  infoMessageType,
   isFirstMessage,
   isInfo,
   isMine,
@@ -219,6 +221,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
    */
   constructor(
     private route: ActivatedRoute,
+    private router: Router,
     public chatManager: ChatManager,
     public actionSheetCtrl: ActionSheetController,
     public platform: Platform,
@@ -1213,6 +1216,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.logger.log('[CONVS-DETAIL] subscribe to messageInfo - messageId ', msg, this.conversation)
         if (msg) {
           that.updateLeadInfo(msg)
+          that.manageInfoMessage(msg)
           // this.updateLiveInfo(msg)
           // this.setHeaderContent()
         }
@@ -1292,6 +1296,24 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     })
   }
 
+  manageInfoMessage(msg: MessageModel){
+    this.logger.log('[CONVS-DETAIL] manageInfoMessage --> ', msg)
+    switch(infoMessageType(msg)){
+        case INFO_MESSAGE_TYPE.MEMBER_JOINED_GROUP:
+          break;
+        case INFO_MESSAGE_TYPE.CHAT_REOPENED:
+          break;
+        case INFO_MESSAGE_TYPE.CHAT_CLOSED:
+            break; 
+        case INFO_MESSAGE_TYPE.LEAD_UPDATED:
+          break;  
+        case INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP:
+          break;  
+        case INFO_MESSAGE_TYPE.LIVE_PAGE:
+          break;    
+    }
+  }
+
   updateLeadInfo(msg) {
     if (msg.attributes && msg.attributes.hasOwnProperty("updateUserFullname")) {
       const userFullname = msg.attributes['updateUserFullname'];

package/src/app/utils/BrandResources.ts

@@ -28,11 +28,12 @@ export class BrandResources {
         /** CSS */
         document.body.style.setProperty('--base-brand-color', this.brand['BRAND_COLOR']);
 
-        /** LOGOS_ITEMS */
-        Object.keys(LOGOS_ITEMS).forEach(key => { LOGOS_ITEMS[key].icon = this.brand[key];}) 
-        
+         
         /** BRAND_BASE_INFO */
-        Object.keys(BRAND_BASE_INFO).forEach(key => BRAND_BASE_INFO[key] = this.brand[key])
+        Object.keys(BRAND_BASE_INFO).forEach(key => BRAND_BASE_INFO[key] = this.brand[key] )
+
+        /** LOGOS_ITEMS */
+        Object.keys(LOGOS_ITEMS).forEach(key => { LOGOS_ITEMS[key].icon = this.brand[key]; })
 
         // /** INFO_MENU_ITEMS */
         // let result: Array<{ key: string, label: string, icon: string, type: TYPE_URL, status: "active" | "inactive", src?: string}> = Array.from([...INFO_MENU_ITEMS, ...this.brand['INFO_MENU_ITEMS']].reduce((m, o) => m.set(o.key, o), new Map).values());

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

@@ -8,7 +8,7 @@ export const BRAND_BASE_INFO: { [key: string] : string} ={
     META_TITLE:"Tiledesk - Open Source Live Chat"
 }
 
-export const LOGOS_ITEMS: { [key: string] : { label: string, icon: string }} ={
+export var LOGOS_ITEMS: { [key: string] : { label: string, icon: string }} ={
     COMPANY_LOGO: {label: BRAND_BASE_INFO.COMPANY_NAME,  icon: 'assets/logos/tiledesk_logo.svg'},
     COMPANY_LOGO_NO_TEXT: {label: BRAND_BASE_INFO.COMPANY_NAME, icon: 'assets/logos/tiledesk_logo_no_text.svg'},
     BASE_LOGO: {label: BRAND_BASE_INFO.BRAND_NAME,  icon: 'assets/logos/tiledesk_logo.svg'},

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

@@ -18,11 +18,11 @@ 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, TOUCHING_OPERATOR, LEAD_UPDATED, MEMBER_LEFT_GROUP, LIVE_PAGE } from '../../utils/constants';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
 import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 
 
-import { messageType, isEmojii, isSender } from 'src/chat21-core/utils/utils-message';
+import { messageType, isEmojii, isSender, infoMessageType } from 'src/chat21-core/utils/utils-message';
 
 
 
@@ -376,10 +376,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
         const INFO_SUPPORT_LIVE_PAGE = this.translationMap.get('INFO_SUPPORT_LIVE_PAGE');
         
-        if (message.attributes.messagelabel
-            && message.attributes.messagelabel.parameters
-            && message.attributes.messagelabel.key === MEMBER_JOINED_GROUP
-        ) {
+        if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_JOINED_GROUP && message.attributes.messagelabel.parameters) {
             let subject: string;
             let verb: string;
             let complement: string;
@@ -402,20 +399,20 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 }
             }
             message.text = subject + ' ' + verb + ' ' + complement;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_REOPENED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.CHAT_REOPENED ) {
             message.text = INFO_SUPPORT_CHAT_REOPENED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_CLOSED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.CHAT_CLOSED ) {
             message.text = INFO_SUPPORT_CHAT_CLOSED;
-        } else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
+        } else if ((infoMessageType(message) === INFO_MESSAGE_TYPE.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;
             }
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.LEAD_UPDATED) {
             message.text = INFO_SUPPORT_LEAD_UPDATED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP) {
             let subject: string;
             if (message.attributes.messagelabel.parameters.fullname) {
                 subject = message.attributes.messagelabel.parameters.fullname;
@@ -423,7 +420,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 subject = message.attributes.messagelabel.parameters.member_id;
             }
             message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
-        } else if(message.attributes.messagelabel && message.attributes.messagelabel.key === LIVE_PAGE){
+        } else if(infoMessageType(message) === INFO_MESSAGE_TYPE.LIVE_PAGE){
             let sourceUrl: string = '';
             if(message.attributes && message.attributes.sourcePage){
                 sourceUrl = message.attributes.sourcePage 

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

@@ -22,9 +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 { MESSAGE_TYPE_INFO, TOUCHING_OPERATOR } from '../../utils/constants';
+import { INFO_MESSAGE_TYPE, MESSAGE_TYPE_INFO } from '../../utils/constants';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { messageType } from 'src/chat21-core/utils/utils-message';
+import { infoMessageType, messageType } from 'src/chat21-core/utils/utils-message';
 
 
 // @Injectable({ providedIn: 'root' })
@@ -635,7 +635,7 @@ 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');
-        if ((conv.attributes && conv.attributes.messagelabel && conv.attributes.messagelabel.key === TOUCHING_OPERATOR) && conv.sender === "system") {
+        if ((infoMessageType(conv) === INFO_MESSAGE_TYPE.TOUCHING_OPERATOR) && conv.sender === "system") {
             const textAfterColon = conv.last_message_text.split(":")[1]
             if (textAfterColon !== undefined) {
                 conv.last_message_text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;

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

@@ -1,4 +1,3 @@
-import { TOUCHING_OPERATOR, LEAD_UPDATED, MEMBER_LEFT_GROUP, LIVE_PAGE } from './../../utils/constants';
 import { Inject, Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -16,15 +15,10 @@ import { UserModel } from '../../models/user';
 import { ConversationHandlerService } from '../abstract/conversation-handler.service';
 
 // utils
-import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO } from '../../utils/constants';
-import {
-  htmlEntities,
-  compareValues,
-  searchIndexInArrayForUid,
-  conversationMessagesRef
-} from '../../utils/utils';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
+import { compareValues, searchIndexInArrayForUid, } from '../../utils/utils';
 import { v4 as uuidv4 } from 'uuid';
-import { isSender, messageType } from '../../utils/utils-message';
+import { infoMessageType, isSender, messageType } from '../../utils/utils-message';
 
 
 @Injectable({ providedIn: 'root' })
@@ -361,10 +355,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
         const INFO_SUPPORT_LIVE_PAGE = this.translationMap.get('INFO_SUPPORT_LIVE_PAGE');
         
-        if (message.attributes.messagelabel
-            && message.attributes.messagelabel.parameters
-            && message.attributes.messagelabel.key === MEMBER_JOINED_GROUP
-        ) {
+        if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_JOINED_GROUP && message.attributes.messagelabel.parameters ) {
             let subject: string;
             let verb: string;
             let complement: string;
@@ -386,20 +377,20 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                 }
             }
             message.text = subject + ' ' + verb + ' ' + complement;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_REOPENED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.CHAT_REOPENED) {
             message.text = INFO_SUPPORT_CHAT_REOPENED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_CLOSED)) {
+        } else if (infoMessageType(message) ===  INFO_MESSAGE_TYPE.CHAT_CLOSED) {
             message.text = INFO_SUPPORT_CHAT_CLOSED;
-        } else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
+        } else if ((infoMessageType(message) ===INFO_MESSAGE_TYPE.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;
             }
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.LEAD_UPDATED) {
             message.text = INFO_SUPPORT_LEAD_UPDATED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP) {
            let subject: string;
            if (message.attributes.messagelabel.parameters.fullname) {
                subject = message.attributes.messagelabel.parameters.fullname;
@@ -407,7 +398,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                subject = message.attributes.messagelabel.parameters.member_id;
            }
            message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
-        } else if(message.attributes.messagelabel && message.attributes.messagelabel.key === LIVE_PAGE){
+        } else if(infoMessageType(message) === INFO_MESSAGE_TYPE.LIVE_PAGE){
             let sourceUrl: string = '';
             if(message.attributes && message.attributes.sourcePage){
                 sourceUrl = message.attributes.sourcePage 

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

@@ -72,13 +72,15 @@ export const MESSAGE_TYPE_INFO = 'INFO';
 export const MESSAGE_TYPE_MINE = 'MINE';
 export const MESSAGE_TYPE_OTHERS = 'OTHERS';
 
-export const CHAT_REOPENED = 'CHAT_REOPENED';
-export const CHAT_CLOSED = 'CHAT_CLOSED';
-export const MEMBER_JOINED_GROUP = 'MEMBER_JOINED_GROUP';
-export const MEMBER_LEFT_GROUP = "MEMBER_LEFT_GROUP";
-export const LEAD_UPDATED = "LEAD_UPDATED";
-export const TOUCHING_OPERATOR = "TOUCHING_OPERATOR";
-export const LIVE_PAGE = "LIVE_PAGE"
+export enum INFO_MESSAGE_TYPE {
+    CHAT_REOPENED = 'CHAT_REOPENED',
+    CHAT_CLOSED = 'CHAT_CLOSED',
+    MEMBER_JOINED_GROUP = 'MEMBER_JOINED_GROUP',
+    MEMBER_LEFT_GROUP = "MEMBER_LEFT_GROUP",
+    LEAD_UPDATED = "LEAD_UPDATED",
+    TOUCHING_OPERATOR = "TOUCHING_OPERATOR",
+    LIVE_PAGE = "LIVE_PAGE"
+}
 
 
 // URLS

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

@@ -7,7 +7,8 @@ import {
   MESSAGE_TYPE_OTHERS,
   MAX_WIDTH_IMAGES,
   CHANNEL_TYPE_GROUP,
-  TYPE_SUPPORT_GROUP
+  TYPE_SUPPORT_GROUP,
+  INFO_MESSAGE_TYPE
 } from '../../chat21-core/utils/constants';
 
 /** */
@@ -106,6 +107,27 @@ export function messageType(msgType: string, message: any) {
   }
 }
 
+export function infoMessageType(msg: MessageModel): string{
+  if(msg && msg.attributes.messagelabel && msg.attributes.messagelabel.key === INFO_MESSAGE_TYPE.MEMBER_JOINED_GROUP){
+    return INFO_MESSAGE_TYPE.MEMBER_JOINED_GROUP
+  }
+  if(msg && msg.attributes.messagelabel && msg.attributes.messagelabel.key === INFO_MESSAGE_TYPE.CHAT_REOPENED){
+    return INFO_MESSAGE_TYPE.CHAT_REOPENED
+  }
+  if(msg && msg.attributes.messagelabel && msg.attributes.messagelabel.key === INFO_MESSAGE_TYPE.TOUCHING_OPERATOR){
+    return INFO_MESSAGE_TYPE.TOUCHING_OPERATOR
+  }
+  if(msg && msg.attributes.messagelabel && msg.attributes.messagelabel.key === INFO_MESSAGE_TYPE.LEAD_UPDATED){
+    return INFO_MESSAGE_TYPE.LEAD_UPDATED
+  }
+  if(msg && msg.attributes.messagelabel && msg.attributes.messagelabel.key === INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP){
+    return INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP
+  }
+  if(msg && msg.attributes.messagelabel && msg.attributes.messagelabel.key === INFO_MESSAGE_TYPE.LIVE_PAGE){
+    return INFO_MESSAGE_TYPE.LIVE_PAGE
+  }
+}
+
 /** */
 export function getSizeImg(message: any, maxWidthImage?: number): any {
   try {