@chat21/chat21-ionic 3.0.91 → 3.0.92-rc.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # chat21-ionic ver 3.0
 
+### 3.0.92-rc.1
+- added: limit parameter to message-attachment component
+- added: listen to new event related to user presence
+- changed: message-text-area icons 
+- changed: moved isSender function from service to utils-message
+- changed: unsubscribe from unserved request directly using wsService and not with wsSocketJs
+- bug-fixed: if user is offline and implicit email is sent, not show flash icon to indicate offline_msg 
+- bug-fixed: conversation list not show projectName (cannot set properties of undefined reading 'projectId')
+- bug-fixed: msg.text is undefined while reading trim()
+- removed: user status from contact-directory
+
 ### 3.0.91 in PROD
 
 ### 3.0.91-rc.1

package/package.json

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

package/src/app/app.component.ts

@@ -374,6 +374,12 @@ export class AppComponent implements OnInit {
           this.presentToastJoinComplete(event.data.text)
         }
       }
+
+      if (event && event.data && event.data.action && event.data.parameter) {
+        if (event.data.action === "presenceUser") {
+          this.events.publish('presenceUser', event.data.parameter)
+        }
+      }
     })
   }
 
@@ -751,11 +757,11 @@ export class AppComponent implements OnInit {
       this.IS_ONLINE = false;
       // clearTimeout(this.timeModalLogin);
       // this.timeModalLogin = setTimeout(() => {
-      // if (!this.hadBeenCalledOpenModal) {
-      //   this.authModal = this.presentModal('initAuthentication');
-      //   this.hadBeenCalledOpenModal = true;
-      // }
-      this.goToDashboardLogin()
+      if (!this.hadBeenCalledOpenModal) {
+        this.authModal = this.presentModal('initAuthentication');
+        this.hadBeenCalledOpenModal = true;
+      }
+      // this.goToDashboardLogin()
       // }, 1000);
     }
   }

package/src/app/chatlib/conversation-detail/message/message-attachment/message-attachment.component.html

@@ -1,6 +1,6 @@
 <div id="buttons-in-message">
   
-  <span *ngFor="let button of buttons" class="div-button">
+  <span *ngFor="let button of buttons | slice:0:limit" class="div-button">
       
       <chat-text-button-attachment *ngIf="button.type === 'text' && isLastMessage === true" class="div-button"
         [button]="button"

package/src/app/chatlib/conversation-detail/message/message-attachment/message-attachment.component.ts

@@ -15,6 +15,7 @@ export class MessageAttachmentComponent implements OnInit {
   @Input() isConversationArchived: boolean;
   @Input() isLastMessage: boolean;
   @Input() fullscreenMode: boolean;
+  @Input() limit: number;
   @Input() stylesMap: Map<string, string>;
   @Output() onAttachmentButtonClicked = new EventEmitter<any>();
   @Output() onElementRendered = new EventEmitter<{element: string, status: boolean}>()

package/src/app/components/contacts-directory/contacts-directory.component.html

@@ -8,11 +8,11 @@
     <div #avatarPlaceholder class="avatar-placeholder" [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + user.color + ')'}" [innerHTML]="user.avatar"></div>
     <div *ngIf="user.imageurl" #avatarImage class="avatar-profile" [style.background-image]="'url(' + user.imageurl + ')'"></div>
     <!-- <div *ngIf="getImageAvatar(conversation.sender)" #avatarImage class="avatar-profile" [style.background-image]="'url(' + getImageAvatar(conversation.sender) + ')'"></div> -->
-    <div class="user-presence">
+    <!-- <div class="user-presence">
       <app-presence
       [isOnline]="user.online">
       </app-presence>
-    </div>
+    </div> -->
   </ion-avatar>
   
   <ion-label>

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

@@ -31,7 +31,7 @@
 
         <!-- CANNED RESPONSES -->
         <ng-container *ngIf="areVisibleCAR && supportMode">
-          <div class="canned-responses-btn-wpr" style="margin-left: -5px;"
+          <div class="canned-responses-btn-wpr"
             tooltip="{{translationMap?.get('CANNED_RESPONSES')}}" [options]="tooltipOptions" placement="top">
             <ion-button ion-button fill="clear" class="canned-responses-btn" (click)="openCannedResponses()"
               [disabled]="!conversationWith?.startsWith(TYPE_SUPPORT_GROUP) || disableTextarea">

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

@@ -73,10 +73,10 @@
     }
     .buttons-left {
         position: absolute;
-        left: 0;
-        bottom: -3px;
-        width: 30px;
-        height: 100%;
+        top: 2px;
+        right: 0;
+        // width: 30px;
+        // height: 100%;
         .attach-button {
             font-size: 24px;
             position: absolute;
@@ -90,21 +90,25 @@
         }
     }
     .buttons-right {
+        display: flex;
         position: absolute;
-        bottom: 3px;
+        top: 2px;
         right: 0;
-        width: 30px;
-        height: 100%;
+        // width: 30px;
+        // height: 100%;
         .send-button {
             font-size: 12px;
-            position: absolute;
-            bottom: 0px;
-            left: 0px;
-            margin: 2px 0;
+            // position: absolute;
+            // bottom: 0px;
+            // left: 0px;
+            // margin: 2px 0;
             --padding-top: 0;
             --padding-bottom: 0;
             --padding-start: 0;
             --padding-end: 0;
+            --border-radius: 50%;
+            width: 30px;
+            height: 30px
         }
     }
     .text-message {
@@ -172,29 +176,30 @@
     --padding-bottom: 0px;
     --padding-top: 0px;
     --border-radius: 50%;
-    --padding-end: 1px;
-    --padding-start: 1px;
-    height: 33px !important;
+    --padding-end: 0px;
+    --padding-start: 0px;
+    height: 30px !important;
+    width: 30px;
 }
 
 .canned-responses-btn {
     --padding-bottom: 0px;
     --padding-top: 0px;
     --border-radius: 50%;
-    --padding-end: 2px;
-    --padding-start: 2px;
-    height: 33px !important;
-    width: 33px;
+    --padding-end: 0px;
+    --padding-start: 0px;
+    height: 30px !important;
+    width: 30px;
 }
 
 .emoji-picker-btn {
     --padding-bottom: 0px;
     --padding-top: 0px;
     --border-radius: 50%;
-    --padding-end: 2px;
-    --padding-start: 2px;
-    height: 33px !important;
-    width: 33px;
+    --padding-end: 0px;
+    --padding-start: 0px;
+    height: 30px !important;
+    width: 30px;
 }
 
 .no-canned-responses-btn-badge {

package/src/app/components/project-item/project-item.component.ts

@@ -122,7 +122,7 @@ export class ProjectItemComponent implements OnInit {
         if (event.data === 'hasChangedProject') {
           this.unservedRequestCount = 0;
           if (this.project) {
-            this.webSocketJs.unsubscribe('/' + this.project.id_project._id + '/requests');
+            this.wsService.unsubscribeToWsConversations(this.project.id_project._id)
           }
           this.getLastProjectStoredAndSubscToWSAvailabilityAndConversations();
         }

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

@@ -809,7 +809,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         conversation.attributes.project_name = project['name']
       }
 
-    }else {
+    }else if(conversation.attributes) {
       const projectId = getProjectIdSelectedConversation(this.conversationWith)
       let project = localStorage.getItem(projectId)
       if(project){
@@ -909,15 +909,16 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
 
   getLeadDetail(){
+    const that = this;
     if(this.channelType !== TYPE_DIRECT){
       const tiledeskToken= this.tiledeskAuthService.getTiledeskToken();
       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)
+        that.logger.debug('[CONVS-DETAIL] getLeadDetail - selected REQUEST detail', request)
         if(request.lead && request.lead.email){
-          this.leadInfo = {lead_id: request.lead.lead_id, hasEmail: true, email: request.lead.email, projectId: projectId}
-          this.presenceService.userIsOnline(this.leadInfo.lead_id);
+          that.leadInfo = {lead_id: request.lead.lead_id, hasEmail: true, email: request.lead.email, projectId: projectId}
+          that.presenceService.userIsOnline(projectId);
         }
       }, (error)=>{
         this.logger.error('[CONVS-DETAIL] - getLeadDetail - GET REQUEST DETAIL - ERROR  ', error)
@@ -980,6 +981,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.logger.log('[CONVS-DETAIL] - SEND MESSAGE - MSG: ', msg)
     this.logger.log('[CONVS-DETAIL] - SEND MESSAGE - type: ', type)
     this.logger.log('[CONVS-DETAIL] - SEND MESSAGE - metadata: ', metadata)
+    this.logger.log('[CONVS-DETAIL] - SEND MESSAGE - additional_attributes: ', additional_attributes)
     let fullname = this.loggedUser.uid
     if (this.loggedUser.fullname) {
       fullname = this.loggedUser.fullname
@@ -998,7 +1000,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         attributes[key] = value
       }
     }
-
     // || type === 'image'
     if (type === 'file') {
       if (msg) {
@@ -1016,11 +1017,11 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     }
 
     metadata ? (metadata = metadata) : (metadata = '')
+    const emailSectionMsg = (attributes && attributes['channel']===TYPE_MSG_EMAIL)
     this.logger.log('[CONVS-DETAIL] - SEND MESSAGE msg: ', msg, ' - messages: ', this.messages, ' - loggedUser: ', this.loggedUser)
 
     if ((msg && msg.trim() !== '') || type !== TYPE_MSG_TEXT) {
-      
-      if(this.isEmailEnabled && !this.leadIsOnline && this.leadInfo && this.leadInfo.email){
+      if(this.isEmailEnabled && !this.leadIsOnline && this.leadInfo && this.leadInfo.email && !emailSectionMsg){
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
         this.sendEmail(msg).subscribe(status => {
           if(status){

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

@@ -761,7 +761,7 @@ export class ConversationListPage implements OnInit {
         project = JSON.parse(project)
         conversation.attributes.project_name = project['name']
       }
-    }else{
+    }else if(conversation.attributes){
       const projectId = getProjectIdSelectedConversation(conversation.uid)
       let project = localStorage.getItem(projectId)
       if(project){

package/src/app/services/contacts/contacts.service.ts

@@ -28,19 +28,13 @@ export class ContactsService {
   // private
   private urlRemoteContacts: string;
   private contacts: UserModel[];
-  private FIREBASESTORAGE_BASE_URL_IMAGE: string;
-  private urlStorageBucket: string;
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
     public http: HttpClient,
     public appConfigProvider: AppConfigProvider
   ) {
-    
     this.urlRemoteContacts = appConfigProvider.getConfig().apiUrl + 'chat21/contacts';
-    this.FIREBASESTORAGE_BASE_URL_IMAGE = appConfigProvider.getConfig().baseImageUrl;
-    this.urlStorageBucket = appConfigProvider.getConfig().firebaseConfig.storageBucket + '/o/profiles%2F';
-
   }
 
 

package/src/app/services/tiledesk/tiledesk.service.ts

@@ -51,7 +51,7 @@ export class TiledeskService {
     }))
   }
 
-    // ---------------------------------------------
+  // ---------------------------------------------
   // @ GET request by id
   // ---------------------------------------------
   public getRequest(request_id: string, project_id: string, token: string) {
@@ -241,7 +241,7 @@ export class TiledeskService {
     }))
   }
 
-    // -----------------------------------------------------------------------------------------
+  // -----------------------------------------------------------------------------------------
   // @ Create ticket
   // -----------------------------------------------------------------------------------------
   public createInternalRequest(requester_id: string, request_id: string, subject: string, message: string, departmentid: string, participantid: string, ticketpriority: string, project_id: string, token: string) {
@@ -272,6 +272,9 @@ export class TiledeskService {
     }))
   }
 
+  // -----------------------------------------------------------------------------------------
+  // @ Send Email
+  // -----------------------------------------------------------------------------------------
   public sendEmail(token: string, projectid: string, form: { to: string, subject: string, text: string, request_id: string}) {
     
     const httpOptions = {
@@ -292,11 +295,4 @@ export class TiledeskService {
     }))
   }
   
-
-
-  
-
-  // .post(url, JSON.stringify(body), options)
-  // .map((res) => res.json());
-
 }

package/src/app/services/websocket/websocket.service.ts

@@ -12,11 +12,12 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 })
 export class WebsocketService {
   private apiUrl: string;
-  public currentProjectUserAvailability$: BehaviorSubject<[]> = new BehaviorSubject<[]>([])
-
+  
   wsService: WebSocketJs;
   wsRequestsList: any;
   public wsRequestsList$: BehaviorSubject<any[]> = new BehaviorSubject<any[]>([]);
+  public currentProjectUserAvailability$: BehaviorSubject<[]> = new BehaviorSubject<[]>([])
+  public wsRequesterStatus$: BehaviorSubject<any> = new BehaviorSubject<any>({});
 
   private logger: LoggerService = LoggerInstance.getInstance();
 
@@ -32,9 +33,9 @@ export class WebsocketService {
   }
 
 
-  subscriptionToWsCurrentProjectUserAvailability(projectid, prjctuserid) {
+  subscriptionToWsCurrentProjectUserAvailability(project_id, prjctuserid) {
     var self = this;
-    const path = '/' + projectid + '/project_users/' + prjctuserid
+    const path = '/' + project_id + '/project_users/' + prjctuserid
     // console.log('[WS-SERV] - SUBSCR (REF) TO WS CURRENT USERS PATH: ', path);
 
     return new Promise(function (resolve, reject) {
@@ -293,4 +294,54 @@ export class WebsocketService {
   }
 
 
+  // -----------------------------------------------
+  //  @ Subscribe to Requester Presence
+  // -----------------------------------------------
+  subscribeToWS_RequesterPresence(project_id, requesterid) {
+    var self = this;
+
+    const path = '/' + project_id + '/project_users/users/' + requesterid;
+
+    this.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE PATH ", path);
+
+    this.webSocketJs.ref(path, 'subscribeToWS_RequesterPresence',
+
+      function (data, notification) {
+        // self.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - CREATE data ", data);
+
+        self.wsRequesterStatus$.next(data);
+
+      }, function (data, notification) {
+        self.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - UPDATE data ", data);
+
+        self.wsRequesterStatus$.next(data);
+
+      }, function (data, notification) {
+
+        if (data) {
+          // self.logger.log("[WS-REQUESTS-SERV] - SUBSCRIBE TO REQUESTER-PRECENCE - ON-DATA data ", data);
+        }
+      }
+    );
+  }
+
+  // -----------------------------------------------
+  //  @ Un-Subscribe to Requester Presence
+  // -----------------------------------------------
+  unsubscribeToWS_RequesterPresence(project_id, requesterid) {
+    const path = '/' + project_id + '/project_users/users/' + requesterid;
+    this.logger.log("[WS-REQUESTS-SERV] - UNSUBSCRIBE TO REQUESTER-PRECENCE PATH", path);
+    this.webSocketJs.unsubscribe(path);
+  }
+
+  // -----------------------------------------------
+  //  @ Un-Subscribe to  Requests
+  // -----------------------------------------------
+  unsubscribeToWsConversations(project_id){
+    const path = '/' + project_id + '/requests';
+    this.logger.log("[WS-REQUESTS-SERV] - UNSUBSCRIBE TO REQUESTS PATH", path);
+    this.webSocketJs.unsubscribe(path);
+  }
+
+
 }

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

@@ -23,7 +23,7 @@
     },
     "apiUrl": "https://api.tiledesk.com/v3/",
     "baseImageUrl": "https://eu.rtmv3.tiledesk.com/api/",
-    "dashboardUrl": "https://console.tiledesk.com/v3/dashboard/",
+    "dashboardUrl": "https://panel.tiledesk.com/v3/dashboard/",
     "testsiteBaseUrl": "https://widget.tiledesk.com/v6/assets/twp/index.html",
     "wsUrl": "wss://eu.rtmv3.tiledesk.com/api/",
     "logLevel": "debug",

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

@@ -22,7 +22,7 @@ import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, T
 import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 
 
-import { messageType, isEmojii } from 'src/chat21-core/utils/utils-message';
+import { messageType, isEmojii, isSender } from 'src/chat21-core/utils/utils-message';
 
 
 
@@ -312,7 +312,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         // }
 
         // verifico che il sender è il logged user
-        msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+        msg.isSender = isSender(msg.sender, this.loggedUser.uid);
 
         //check if message contains only an emojii
         // msg.emoticon = isEmojii(msg.text)
@@ -326,7 +326,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
 
     private messageCommandGenerate(message:MessageModel){
         const msg: MessageModel = message;
-        if(msg.text) msg.text = msg.text.trim(); //remove black msg with only spaces
+        msg.text = msg.text? msg.text.trim(): "";//remove black msg with only spaces
         // controllo fatto per i gruppi da rifattorizzare
         if (!msg.sender_fullname || msg.sender_fullname === 'undefined') {
             msg.sender_fullname = msg.sender;
@@ -338,7 +338,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         // }
         
         // verifico che il sender è il logged user
-        msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+        msg.isSender = isSender(msg.sender, this.loggedUser.uid);
         //check if message contains only an emojii
         // msg.emoticon = isEmojii(msg.text)
 
@@ -453,33 +453,6 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         }
     }
 
-    /**
-     * controllo se il messaggio è stato inviato da loggerUser
-     * richiamato dalla pagina elenco messaggi della conversazione
-     */
-    private isSender(sender: string, currentUserId: string) {
-        if (currentUserId) {
-            if (sender === currentUserId) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-
-    /** */
-    // updateMetadataMessage(uid: string, metadata: any) {
-    //     metadata.status = true;
-    //     const message = {
-    //         metadata: metadata
-    //     };
-    //     const firebaseMessages = firebase.database().ref(this.urlNodeFirebase + uid);
-    //     firebaseMessages.set(message);
-    // }
-
 
     unsubscribe(key: string) {
         this.listSubsriptions.forEach(sub => {

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

@@ -24,7 +24,7 @@ import {
   setHeaderDate,
   conversationMessagesRef
 } from '../../utils/utils';
-import { messageType } from '../../utils/utils-message';
+import { isSender, messageType } from '../../utils/utils-message';
 
 
 @Injectable({ providedIn: 'root' })
@@ -288,7 +288,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         this.logger.log("[MQTTConversationHandler] childSnapshot >" + JSON.stringify(childSnapshot));
         const msg = childSnapshot;
         // msg.uid = childSnapshot.key;
-        msg.text = msg.text.trim() //remove black msg with only spaces
+        msg.text = msg.text? msg.text.trim(): "";//remove black msg with only spaces
         // controllo fatto per i gruppi da rifattorizzare
         if (!msg.sender_fullname || msg.sender_fullname === 'undefined') {
             msg.sender_fullname = msg.sender;
@@ -299,7 +299,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         // }
         // verifico che il sender è il logged user
         this.logger.log("[MQTTConversationHandler] ****>msg.sender:" + msg.sender);
-        msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+        msg.isSender = isSender(msg.sender, this.loggedUser.uid);
         // traduco messaggi se sono del server
         if (messageType(MESSAGE_TYPE_INFO, msg)) {
             this.translateInfoSupportMessages(msg);
@@ -418,32 +418,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         // }
     }
 
-    /**
-     * controllo se il messaggio è stato inviato da loggerUser
-     * richiamato dalla pagina elenco messaggi della conversazione
-     */
-    private isSender(sender: string, currentUserId: string) {
-        if (currentUserId) {
-            if (sender === currentUserId) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-
-    /** */
-    // updateMetadataMessage(uid: string, metadata: any) {
-    //     metadata.status = true;
-    //     const message = {
-    //         metadata: metadata
-    //     };
-    //     const firebaseMessages = firebase.database().ref(this.urlNodeFirebase + uid);
-    //     firebaseMessages.set(message);
-    // }
 
 
   unsubscribe(key: string) {

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

@@ -62,6 +62,18 @@ export function isMine(message: any) {
   return false;
 }
 
+export function isSender(sender: string, currentUserId: string) {
+  if (currentUserId) {
+      if (sender === currentUserId) {
+          return true;
+      } else {
+          return false;
+      }
+  } else {
+      return false;
+  }
+}
+
 /** */
 export function messageType(msgType: string, message: any) {