@chat21/chat21-ionic 3.0.52-beta → 3.0.55-RC6

package/src/app/app.module.ts

@@ -92,7 +92,8 @@ import { ConversationInfoModule } from 'src/app/components/conversation-info/con
 // Directives
 import { TooltipModule } from 'ng2-tooltip-directive';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-
+import { Network } from '@ionic-native/network/ngx';
+import { ConnectionService } from 'ng-connection-service';
 
 
 // FACTORIES
@@ -101,7 +102,7 @@ export function createTranslateLoader(http: HttpClient) {
 
 }
 
-export function authenticationFactory(http: HttpClient, appConfig: AppConfigProvider, chat21Service: Chat21Service, appSorage: AppStorageService) {
+export function authenticationFactory(http: HttpClient, appConfig: AppConfigProvider, chat21Service: Chat21Service, appSorage: AppStorageService, network: Network, connectionService:ConnectionService) {
   const config = appConfig.getConfig()
   if (config.chatEngine === CHAT_ENGINE_MQTT) {
 
@@ -111,12 +112,15 @@ export function authenticationFactory(http: HttpClient, appConfig: AppConfigProv
     const auth = new MQTTAuthService(http, chat21Service, appSorage);
 
     auth.setBaseUrl(appConfig.getConfig().apiUrl)
+    
     return auth
   } else {
 
     FirebaseInitService.initFirebase(config.firebaseConfig)
-    const auth = new FirebaseAuthService(http);
+    console.log('[APP-MOD] FirebaseInitService config ', config)
+    const auth = new FirebaseAuthService(http, network, connectionService);
     auth.setBaseUrl(config.apiUrl)
+  
     return auth
   }
 }
@@ -262,7 +266,7 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
       timestampFormat: 'HH:mm:ss.SSS',
       enableSourceMaps: false,
       colorScheme: ['purple', 'yellow', 'gray', 'gray', 'red', 'red', 'red'],
-      serverLoggingUrl: 'http://tiledesk-server-pre.herokuapp.com/logs'
+      serverLoggingUrl: 'https://tiledesk-server-pre.herokuapp.com/logs'
     }),
     ScrollbarThemeModule,
     SharedModule,
@@ -283,7 +287,7 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
     {
       provide: MessagingAuthService,
       useFactory: authenticationFactory,
-      deps: [HttpClient, AppConfigProvider, Chat21Service, AppStorageService]
+      deps: [HttpClient, AppConfigProvider, Chat21Service, AppStorageService, Network, ConnectionService]
     },
     {
       provide: PresenceService,
@@ -343,6 +347,7 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
     StatusBar,
     SplashScreen,
     Keyboard,
+    Network,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     EventsService,
     Chooser,

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.scss

@@ -1,9 +1,13 @@
 :host .base_sent .msg_sent ::ng-deep div > div > div > tiledeskwidget-text > p > p > a {
     color: lightblue;
+ 
 }
 
 :host .base_sent .msg_sent ::ng-deep div > div > div > tiledeskwidget-text > p > p  {
     margin-top:12px !important;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 :host .base_sent .msg_sent ::ng-deep > div > div > tiledeskwidget-image > div  {

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

@@ -1,7 +1,8 @@
 <!-- [ngClass]="{'button-in-msg' : message.metadata && message.metadata.button}" -->
-<div  [ngStyle]="{'padding': (isImage(message) || isFrame(message))?'0px':'0 8px'}" class="messages primary-color"  [class.emoticon]="message?.emoticon">
-  
-    
+<div [ngStyle]="{'padding': (isImage(message) || isFrame(message))?'0px':'0 8px'}" class="messages primary-color"
+  [class.emoticon]="message?.emoticon">
+
+
   <div>
     <!-- message type:: image -->
     <!-- <div *ngIf="message.type == 'image' && message.metadata"  [ngStyle] = "{ 'max-width': getSizeImg(message).width, 'max-height': getSizeImg(message).height }">
@@ -12,16 +13,16 @@
     [src]="message.metadata.src" [width]="getSizeImg(message).width"
     [height]="getSizeImg(message).height" /> -->
 
-    <tiledeskwidget-image *ngIf="isImage(message)"
+    <tiledeskwidget-image *ngIf="isImage(message)" 
       [metadata]="message.metadata"
-      [width]="getMetadataSize(message.metadata).width"
+      [width]="getMetadataSize(message.metadata).width" 
       [height]="getMetadataSize(message.metadata).height"
       (onImageRendered)="onImageRenderedFN($event)">
     </tiledeskwidget-image>
 
-    <tiledeskwidget-frame *ngIf="isFrame(message)"
+    <tiledeskwidget-frame *ngIf="isFrame(message)" 
       [metadata]="message.metadata"
-      [width]="getMetadataSize(message.metadata).width"
+      [width]="getMetadataSize(message.metadata).width" 
       [height]="getMetadataSize(message.metadata).height">
     </tiledeskwidget-frame>
 
@@ -30,22 +31,24 @@
       [width]="message.metadata.width"
       [height]="message.metadata.height">
     </tiledeskwidget-frame> -->
-  
-    <!-- message type:: text -->
-    <!-- <div *ngIf="message.type == 'text'">  -->     
-    <div *ngIf="message?.text" [tooltip]="timeTooltipLeft" [options]="tooltipOptions" placement="left" content-type="template" (click)="handleTooltipEvents($event)"> 
-        <ng-template #timeTooltipLeft>
-            <span>{{message.timestamp | amTimeAgo}}</span>
-        </ng-template>
 
-        <tiledeskwidget-text
-          [text]="message?.text"
-          [color]="textColor"
-          (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
-          (onAfterMessageRender)="returnOnAfterMessageRender($event)">
-        </tiledeskwidget-text>
-        <!-- <p #messageEl class="message_innerhtml marked" [innerHTML]="printMessage(message, messageEl, this) | marked"></p> -->
-        <!-- <div *ngIf="isPopupUrl(message.text); then contentPopup else contentNewTab">here
+    <!-- message type:: text -->
+    <!-- <div *ngIf="message.type == 'text'">  -->
+    <div *ngIf="message?.text" [tooltip]="timeTooltipLeft" [options]="tooltipOptions" placement="left"
+      content-type="template" (click)="handleTooltipEvents($event)">
+      <ng-template #timeTooltipLeft>
+        <span>{{message.timestamp | amTimeAgo}}</span>
+      </ng-template>
+
+      <tiledeskwidget-text 
+        [text]="message?.text" 
+        [color]="textColor" 
+       [message]="message"
+        (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
+        (onAfterMessageRender)="returnOnAfterMessageRender($event)">
+      </tiledeskwidget-text>
+      <!-- <p #messageEl class="message_innerhtml marked" [innerHTML]="printMessage(message, messageEl, this) | marked"></p> -->
+      <!-- <div *ngIf="isPopupUrl(message.text); then contentPopup else contentNewTab">here
             is ignored</div>
         <ng-template #contentPopup>
             <p style="text-decoration: underline; padding:8px; cursor: pointer;"
@@ -54,13 +57,7 @@
         <ng-template #contentNewTab>
             <p #messageEl [innerHTML]="printMessage(message, messageEl, this) | linky"></p>
         </ng-template> -->
-      </div>
+    </div>
   </div>
 
-</div>
-
-
-  
-
-
-
+</div>

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

@@ -1,4 +1,4 @@
-<p  #messageEl class="message_innerhtml marked" 
+<p [ngStyle] = "{ 'width': media_width +'px'  }" #messageEl class="message_innerhtml marked" 
     [innerHTML]="printMessage(text, messageEl, this) | htmlEntiesEncode  | marked"
     [ngStyle]="{'color': '$'+ color }">
 </p>

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

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, Sanitizer } from '@angular/core';
-
+import { MAX_WIDTH_IMAGES } from 'src/chat21-core/utils/constants';
 @Component({
   selector: 'tiledeskwidget-text',
   templateUrl: './text.component.html',
@@ -11,7 +11,12 @@ export class TextComponent implements OnInit {
   @Input() color: string;
   @Output() onBeforeMessageRender = new EventEmitter();
   @Output() onAfterMessageRender = new EventEmitter();
-  
+
+  @Input() message: any;
+
+  public media_width: number;
+  public media_height: number;
+
   constructor() { }
 
   ngOnInit() {
@@ -19,7 +24,7 @@ export class TextComponent implements OnInit {
 
 
   printMessage(text, messageEl, component) {
-    const messageOBJ = { messageEl: messageEl, component: component}
+    const messageOBJ = { messageEl: messageEl, component: component }
     this.onBeforeMessageRender.emit(messageOBJ)
     const messageText = text;
     this.onAfterMessageRender.emit(messageOBJ)
@@ -29,4 +34,23 @@ export class TextComponent implements OnInit {
     return messageText;
   }
 
+  ngOnChanges() {
+    if (this.message.type === 'image') {
+      console.log('TextComponent message ', this.message)
+      if (this.message.metadata.width && this.message.metadata.width > MAX_WIDTH_IMAGES) {
+
+        const ratio = (this.message.metadata['width'] / this.message.metadata['height']);
+
+        this.media_width = MAX_WIDTH_IMAGES;
+        this.media_height = MAX_WIDTH_IMAGES / ratio;
+
+        console.log('TextComponent media_width ', this.media_width, ' media_height' ,  this.media_height)
+      } else {
+        this.media_width = this.message.metadata.width;
+        this.media_height = this.message.metadata.height;
+        console.log('TextComponent media_width ', this.media_width, ' media_height' ,  this.media_height)
+      }
+    }
+  }
+
 }

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

@@ -23,10 +23,12 @@
 </div> -->
 
 
-<ion-item button="true" lines="none" class="ion-no-padding" *ngFor="let conversation of listConversations"
+<ion-item button="true" lines="none" class="ion-no-padding"  [class.ion-selected]="conversation.uid === uidConvSelected" *ngFor="let conversation of listConversations"
   (click)="openConversationByID(conversation)">
   <!-- (mouseup)="openMessageList()" -->
-  <div [class.selected]="conversation.uid === uidConvSelected"></div>
+
+ 
+  <!-- <div [class.selected]="conversation.uid === uidConvSelected"></div> -->
   <ion-avatar item-start>
     <div #avatarPlaceholder class="avatar-placeholder" [style.background-color]="conversation.color"
       [innerHTML]="conversation.avatar"></div>
@@ -57,7 +59,8 @@
       </span>
     </div>
   </ion-label>
-  <ion-note *ngIf="!conversation.archived" class="conversation_time">{{conversation.time_last_message}}</ion-note>
+
+  <ion-note *ngIf="!conversation.archived" class="conversation_time">{{conversation.timestamp | amTimeAgo}}</ion-note>
 
   <ion-buttons slot="end">
     <ion-button *ngIf="!conversation.archived" [ngClass]="{'hide': !isApp, 'button-on-desktop': !isApp  }"
@@ -74,11 +77,21 @@
   </ion-buttons>
 
   <div item-end *ngIf="conversation?.archived" class="achived-icon-wpr">
-    <i class="material-icons" item-end style="font-size: 18px;font-weight: 400;color: #aaa;"> history </i>
+    <span *ngIf="(conversation.timestamp | amDateFormat:'YYYY') === currentYear" class="time-in-archived">
+      {{browserLang === 'it' ? (conversation.timestamp| amDateFormat:'DD MMM') : (conversation.timestamp | amDateFormat:'MMM DD')}}
+     
+      <!-- {{conversation.timestamp | amDateFormat:'DD MMM'}} -->
+    </span>
+    <span *ngIf="(conversation.timestamp | amDateFormat:'YYYY') !== currentYear" class="time-in-archived">
+      {{browserLang === 'it' ? (conversation.timestamp| amDateFormat:'DD MMM') : (conversation.timestamp | amDateFormat:'MMM DD YYYY')}}
+      <!-- {{conversation.timestamp | amDateFormat:'DD MMM YYYY'}} -->
+    </span>
+    <i class="material-icons" item-end style="font-size: 15px;font-weight: 400;color: #666666;"> history </i>
   </div>
 
+  <!-- && !conversation?.archived -->
   <div item-end class="notification_point"
-    [ngClass]="{'notification_point-on-desktop': !isApp && !conversation?.archived}" *ngIf="conversation.is_new">
+    [ngClass]="{'notification_point-on-desktop': !isApp }" *ngIf="conversation.is_new">
   </div>
 
 </ion-item>

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

@@ -9,7 +9,8 @@
 }
 ion-item {
     cursor: pointer;
-    height: 64px;
+    height: 70px;
+    --min-height: 70px;
     position: relative;
     display: flex;
     text-decoration: none;
@@ -139,7 +140,7 @@ ion-item {
     }
 
     .notification_point-on-desktop {
-        bottom: 24px !important;
+        bottom: 29px !important;
     }
 }
 
@@ -177,7 +178,7 @@ ion-item:hover {
 .achived-icon-wpr {
     position: absolute;
     right: 3px;
-    top: 11px;
+    top: 4px;
     font-size: 12px;
 }
 
@@ -197,4 +198,15 @@ ion-item:hover {
     padding-right: 0px;
     vertical-align: middle;
     color: #999999;
+}
+
+.ion-selected {
+    --background: rgb(231, 241, 255);
+}
+
+.time-in-archived {
+    color: #666666;
+    font-size: 10px;
+    position: relative;
+    top: -4px;
 }

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

@@ -6,7 +6,8 @@ import { ListConversationsComponent } from '../list-conversations/list-conversat
 import { Platform } from '@ionic/angular';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-
+import { TranslateService } from '@ngx-translate/core';
+import * as moment from 'moment';
 // import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 // import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 
@@ -22,7 +23,9 @@ export class IonListConversationsComponent extends ListConversationsComponent im
 
   convertMessage = convertMessage;
   isApp: boolean = false;
-  public logger: LoggerService = LoggerInstance.getInstance()
+  public logger: LoggerService = LoggerInstance.getInstance();
+  public currentYear: any
+  public browserLang: string
   /**
    * 
    * @param iterableDiffers 
@@ -32,20 +35,35 @@ export class IonListConversationsComponent extends ListConversationsComponent im
   constructor(
     public iterableDiffers: IterableDiffers,
     public kvDiffers: KeyValueDiffers,
-    public platform: Platform
+    public platform: Platform,
+    private translate: TranslateService,
   ) {
     super(iterableDiffers, kvDiffers)
+    this.browserLang = this.translate.getBrowserLang();
+    if (this.browserLang) {
+      if (this.browserLang === 'it') {
+        // this.translate.use('it');
+        moment.locale('it')
+
+      } else {
+        // this.translate.use('en');
+        moment.locale('en')
+      }
+    }
+
+    this.currentYear = moment().format('YYYY');
+    this.logger.log('[ION-LIST-CONVS-COMP] - currentYear ', this.currentYear)
   }
 
   ngOnInit() {
     this.isApp = this.platform.is('ios') || this.platform.is('android')
-    this.logger.log('[ION-LIST-CONVS-COMP] - ngOnInit - IS-APP ',this.isApp )
+    this.logger.log('[ION-LIST-CONVS-COMP] - ngOnInit - IS-APP ', this.isApp)
     this.logger.log('[ION-LIST-CONVS-COMP] - ngOnInit - Platform', this.platform.platforms());
-   }
+  }
 
   closeConversation(conversation: ConversationModel) {
     var conversationId = conversation.uid;
-    this.logger.log('[ION-LIST-CONVS-COMP] - closeConversation - conversationId ',conversationId )
+    this.logger.log('[ION-LIST-CONVS-COMP] - closeConversation - conversationId ', conversationId)
     this.onCloseConversation.emit(conversation)
   }
 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.html

@@ -44,6 +44,10 @@
         <span class="tile-username">{{ conversationAvatar.conversation_with_fullname }} </span>
       </div>
 
+      <!-- <div *ngIf="conversationWithFullname" class="tile-info-with" (click)="onOpenCloseInfoConversation()">        
+        <span class="tile-username">{{ conversationWithFullname }} </span>
+      </div> -->
+
     </ion-title>
     <!-- openInfoConversation  {{openInfoConversation}} -->
     <ion-buttons slot="end">

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter, OnChanges } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
 
 // Logger
@@ -17,7 +18,7 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   @Input() isMobile: boolean;
   @Input() translationMap: Map<string, string>;
   @Output() eventOpenCloseInfoConversation = new EventEmitter<boolean>();
-
+  conversationWithFullname: string
   openInfoConversation = true;
   openInfoMessage = true;
   DIRECT = 'direct';
@@ -35,9 +36,17 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
    * @param imageRepoService 
    */
   constructor(
-    public imageRepoService: ImageRepoService
-
-  ) { }
+    public imageRepoService: ImageRepoService,
+    private route: ActivatedRoute,
+  ) { 
+    // this.route.paramMap.subscribe(params => {
+      
+     
+    //   this.conversationWithFullname = params.get('FullNameConv');
+    //   this.logger.log('[CONVS-DETAIL][HEADER]- initialize -> params: ', params);
+    //   this.logger.log('[CONVS-DETAIL][HEADER]- initialize -> params > : ',  this.conversationWithFullname);
+    // });
+  }
 
   // ----------------------------------------------------
   // @ Lifehooks
@@ -64,6 +73,10 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   // @ Initialize (called in ngOnInit)
   // ----------------------------------------------------
   initialize() {
+
+ 
+
+
     if (this.conversationAvatar && this.conversationAvatar.channelType === this.DIRECT) {
       this.isDirect = true;
     } else if (this.idLoggedUser) {

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

@@ -27,12 +27,12 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChanges {
 
   @ViewChild('textArea', { static: false }) messageTextArea: any
-//   set textArea(element: ElementRef<HTMLInputElement>) {
-//     if(element) {
-//       this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ViewChild element ", element);
-//       element.nativeElement.focus()
-//     }
-//  }
+  //   set textArea(element: ElementRef<HTMLInputElement>) {
+  //     if(element) {
+  //       this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ViewChild element ", element);
+  //       element.nativeElement.focus()
+  //     }
+  //  }
 
 
   @ViewChild('fileInput', { static: false }) fileInput: any;
@@ -88,9 +88,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
     // this.events.subscribe((cannedmessage) => {
     //   this.logger.log("[CONVS-DETAIL] [MSG-TEXT-AREA] events.subscribe cannedmessage ", cannedmessage);
     // })
-    this.LONG_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG')
-    this.SHORT_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG_SHORT')
-    this.SHORTER_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG_SHORTER')
+
     // this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] LONG_TEXAREA_PLACEHOLDER ", this.LONG_TEXAREA_PLACEHOLDER);
     // this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] SHORT_TEXAREA_PLACEHOLDER ", this.SHORT_TEXAREA_PLACEHOLDER);
     // this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] SHORTER_TEXAREA_PLACEHOLDER ", this.SHORTER_TEXAREA_PLACEHOLDER);
@@ -101,6 +99,12 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
 
 
   ngOnChanges() {
+    if (this.translationMap) {
+      this.LONG_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG')
+      this.SHORT_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG_SHORT')
+      this.SHORTER_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG_SHORTER')
+    }
+
     // this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges this.isOpenInfoConversation ", this.isOpenInfoConversation);
     this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges DROP EVENT ", this.dropEvent);
 
@@ -116,9 +120,9 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   }
 
   // ngAfterViewInit() {
-    ngAfterViewInit() {
+  ngAfterViewInit() {
+
 
-      
     // const element = this.renderer.selectRootElement('#textArea');
     // this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ngAfterViewInit element get with renderer ", element);
     // const elemTexarea= <HTMLElement>document.querySelector('#ion-textarea');
@@ -317,7 +321,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
         data.items.add(new File([file], file.name, { type: file.type }));
         this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] onPaste data ", data);
         this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] onPaste file ", file);
-       
+
         this.presentModal(data);
 
       } else if (item.type.startsWith("application")) {
@@ -386,7 +390,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
         backdropDismiss: true
       });
     modal.onDidDismiss().then((detail: any) => {
-      
+
       this.logger.log('presentModal onDidDismiss detail', detail);
       if (detail.data !== undefined) {
         let type = ''
@@ -438,9 +442,9 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
             this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal invio msg type::: ', type);
             this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] FIREBASE-UPLOAD presentModal invio msg message::: ', messageString);
             // send message
-// if(messageString === undefined) {
-//   messageString = metadata.name
-// }
+            // if(messageString === undefined) {
+            //   messageString = metadata.name
+            // }
 
             that.eventSendMessage.emit({ message: messageString, type: type, metadata: metadata });
 

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -78,8 +78,15 @@ export class InfoContentComponent implements OnInit {
       this.logger.log('[INFO-CONTENT-COMP] - paramMap.subscribe conversationWith: ', this.conversationWith);
       this.conversationWithFullname = params.get('FullNameConv');
       this.conv_type = params.get('Convtype');
-
+     
       const conversationWith_segments = this.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('[INFO-CONTENT-COMP] - paramMap.subscribe conversationWith_segments: ', conversationWith_segments);
 
       if (this.conversationWith.startsWith("support-group")) {

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

@@ -19,8 +19,11 @@
 
 <ng-template #showConversation>
 
-  <app-header-conversation-detail [isMobile]=isMobile [idLoggedUser]=loggedUser.uid
-    [conversationAvatar]=conversationAvatar [translationMap]=translationMap
+  <app-header-conversation-detail 
+    [isMobile]="isMobile" 
+    [idLoggedUser]="loggedUser.uid"
+    [conversationAvatar]="conversationAvatar" 
+    [translationMap]="translationMap"
     (eventOpenCloseInfoConversation)="returnOpenCloseInfoConversation($event)"
     [isOpenInfoConversation]="isOpenInfoConversation">
   </app-header-conversation-detail>
@@ -79,10 +82,15 @@
             </ng-template>
 
             <ng-template #content_messages>
-              <ion-content #ionContentChatArea class="ionContentChatArea" (drop)="drop($event)"
-                (dragover)="allowDrop($event)" (dragleave)="drag($event)" [scrollEvents]="true"
-                (ionScrollStart)="logScrollStart($event)" (ionScroll)="logScrolling($event)"
-                (ionScrollEnd)="logScrollEnd($event)" [class.active]="showIonContent">
+              <ion-content #ionContentChatArea class="ionContentChatArea"
+                (drop)="drop($event)"
+                (dragover)="allowDrop($event)" 
+                (dragleave)="drag($event)" 
+                [scrollEvents]="true"
+                (ionScrollStart)="logScrollStart($event)" 
+                (ionScroll)="logScrolling($event)"
+                (ionScrollEnd)="logScrollEnd($event)" 
+                [class.active]="showIonContent">
 
                 <!-- ----------------------------------------------------------- -->
                 <!-- DROPZONE -->
@@ -100,15 +108,18 @@
 
 
                 <ion-conversation-detail *ngIf="isHovering === false" #conversationContentDetail
-                  [channelType]="channelType" [messages]="messages" [senderId]="loggedUser.uid"
-                  [baseLocation]="window?.location?.origin" [stylesMap]="styleMap"
+                  [channelType]="channelType" 
+                  [messages]="messages" 
+                  [senderId]="loggedUser.uid"
+                  [baseLocation]="window?.location?.origin"
+                  [stylesMap]="styleMap"
                   (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
                   (onAfterMessageRender)="returnOnAfterMessageRender($event)"
                   (onAttachmentButtonClicked)="returnOnAttachmentButtonClicked($event)"
-                  (onScrollContent)="returnOnScrollContent($event)" (onMenuOptionShow)="returnOnMenuOption($event)"
+                  (onScrollContent)="returnOnScrollContent($event)" 
+                  (onMenuOptionShow)="returnOnMenuOption($event)"
                   (onImageRendered)="onImageRenderedFN($event)"
                   (onAddUploadingBubble)="addUploadingBubbleEvent($event)">
-
                 </ion-conversation-detail>
 
               </ion-content>
@@ -139,10 +150,16 @@
             <!-- openInfoConversation   {{openInfoConversation}} - isMobile {{isMobile}} -->
             <app-message-text-area
               *ngIf="(openInfoConversation === false && isMobile === true) || (openInfoConversation === true && isMobile === false) || (openInfoConversation === false && isMobile === false)"
-              [loggedUser]="loggedUser" [conversationWith]="conversationWith" [tagsCannedFilter]="tagsCannedFilter"
-              (eventChangeTextArea)="returnChangeTextArea($event)" (eventSendMessage)="returnSendMessage($event)"
-              [translationMap]="translationMap" [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
-              [isOpenInfoConversation]="isOpenInfoConversation" [dropEvent]="dropEvent"  (onPresentModalScrollToBottom)="onPresentModalScrollToBottom($event)">
+              [loggedUser]="loggedUser" 
+              [conversationWith]="conversationWith" 
+              [tagsCannedFilter]="tagsCannedFilter"
+              (eventChangeTextArea)="returnChangeTextArea($event)" 
+              (eventSendMessage)="returnSendMessage($event)"
+              [translationMap]="translationMap" 
+              [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
+              [isOpenInfoConversation]="isOpenInfoConversation" 
+              [dropEvent]="dropEvent"  
+              (onPresentModalScrollToBottom)="onPresentModalScrollToBottom($event)">
             </app-message-text-area>
             <!-- [events]="eventsReplaceTexareaText.asObservable()" -->
           </ion-row>
@@ -150,8 +167,12 @@
         </ion-col>
 
         <ion-col id="chat21-info-conversation" [class.mobile]="isMobile" [class.open]="openInfoConversation">
-          <app-info-content [openInfoConversation]="openInfoConversation" [translationMap]="translationMap"
-            [loggedUser]="loggedUser" [tenant]="tenant" [groupDetail]="groupDetail">
+          <app-info-content 
+            [openInfoConversation]="openInfoConversation" 
+            [translationMap]="translationMap"
+            [loggedUser]="loggedUser" 
+            [tenant]="tenant" 
+            [groupDetail]="groupDetail">
           </app-info-content>
         </ion-col>