@chat21/chat21-ionic 3.0.55-RC6 → 3.0.57

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

@@ -1,6 +1,6 @@
 import { ArchivedConversationsHandlerService } from 'src/chat21-core/providers/abstract/archivedconversations-handler.service';
-import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { IonContent, ModalController } from '@ionic/angular';
 import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
 // config
 import { environment } from '../../../environments/environment';
@@ -39,6 +39,7 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
   styleUrls: ['./conversations-list.page.scss'],
 })
 export class ConversationListPage implements OnInit {
+  @ViewChild('ioncontentconvlist', { static: false }) ionContentConvList: IonContent;
   private subscriptions: Array<string>;
   public tenant: string;
   public loggedUserUid: string;
@@ -59,7 +60,7 @@ export class ConversationListPage implements OnInit {
   stylesMap: Map<string, string>;
 
   public conversationType = 'active'
-  headerTitle: string
+  headerTitle: string;
 
 
   constructor(
@@ -82,12 +83,16 @@ export class ConversationListPage implements OnInit {
     this.listenToAppCompConvsLengthOnInitConvs();
     this.listenToLogoutEvent();
     this.listenToSwPostMessage();
+
   }
 
+
   // -----------------------------------------------
   // @ Lifehooks
   // -----------------------------------------------
-  ngOnInit() { }
+  ngOnInit() {
+
+  }
 
   ionViewWillEnter() {
     this.logger.log('[CONVS-LIST-PAGE] ionViewWillEnter uidConvSelected', this.uidConvSelected);
@@ -195,8 +200,8 @@ export class ConversationListPage implements OnInit {
 
   listenToLogoutEvent() {
     this.events.subscribe('profileInfoButtonClick:logout', (hasclickedlogout) => {
-      this.logger.log('[CONVS-LIST-PAGE] - listenToLogoutEvent - hasclickedlogout', hasclickedlogout);
-
+      this.logger.info('[CONVS-LIST-PAGE] - listenToLogoutEvent - hasclickedlogout', hasclickedlogout);
+      this.conversations = []
       this.conversationsHandlerService.conversations = [];
       this.uidConvSelected = null;
 
@@ -209,13 +214,11 @@ export class ConversationListPage implements OnInit {
   }
 
 
-
-
-
   // ------------------------------------------------------------------ 
   //  SUBSCRIPTIONS
   // ------------------------------------------------------------------
   initSubscriptions() {
+    this.logger.log('[CONVS-LIST-PAGE] - CALLING - initSubscriptions ')
     let key = '';
 
 
@@ -243,7 +246,7 @@ export class ConversationListPage implements OnInit {
     // });
 
     this.conversationsHandlerService.conversationAdded.subscribe((conversation: ConversationModel) => {
-      this.logger.log('[CONVS-LIST-PAGE] ***** conversationsAdded *****', conversation);
+      // this.logger.log('[CONVS-LIST-PAGE] ***** conversationsAdded *****', conversation);
       // that.conversationsChanged(conversations);
       if (conversation) {
         this.onImageLoaded(conversation)
@@ -252,7 +255,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)
@@ -263,6 +266,15 @@ export class ConversationListPage implements OnInit {
     this.conversationsHandlerService.conversationRemoved.subscribe((conversation: ConversationModel) => {
       this.logger.log('[CONVS-LIST-PAGE] ***** conversationsRemoved *****', conversation);
     });
+
+    this.archivedConversationsHandlerService.archivedConversationAdded.subscribe((conversation: ConversationModel) => {
+      this.logger.log('[CONVS-LIST-PAGE] ***** archivedConversationAdded *****', conversation);
+      // that.conversationsChanged(conversations);
+      if (conversation) {
+        this.onImageLoaded(conversation)
+        this.onConversationLoaded(conversation)
+      }
+    });
   }
 
   // ------------------------------------------------------------------------------------
@@ -403,18 +415,24 @@ export class ConversationListPage implements OnInit {
    * imposto recipient se esiste nei parametri passati nell'url
    * imposto uidConvSelected recuperando id ultima conversazione aperta dallo storage
    */
+  // --------------------------------------------------------
+  // It only works on BSStart.subscribe! it is useful or can be eliminated
+  // --------------------------------------------------------
   initVariables() {
     this.logger.log('[CONVS-LIST-PAGE] uidReciverFromUrl:: ' + this.uidReciverFromUrl);
     this.logger.log('[CONVS-LIST-PAGE] loggedUserUid:: ' + this.loggedUserUid);
     this.logger.log('[CONVS-LIST-PAGE] tenant:: ' + this.tenant);
     if (this.route.component['name'] !== "ConversationListPage") {
-      const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
-      this.logger.log('[CONVS-LIST-PAGE] conversationWith: ', IDConv);
-      if (IDConv) {
-        this.setUidConvSelected(IDConv);
-      } else {
 
-        this.logger.log('[CONVS-LIST-PAGE] conversationWith: ', IDConv);
+      if (this.route && this.route.snapshot && this.route.snapshot.firstChild) {
+        const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
+        this.logger.log('[CONVS-LIST-PAGE] conversationWith 2: ', IDConv);
+        if (IDConv) {
+          this.setUidConvSelected(IDConv);
+        } else {
+
+          this.logger.log('[CONVS-LIST-PAGE] conversationWith 2 (else): ', IDConv);
+        }
       }
     }
   }
@@ -437,7 +455,7 @@ export class ConversationListPage implements OnInit {
       }
       if (conversationSelected) {
         this.logger.log('[CONVS-LIST-PAGE] conversationSelected', conversationSelected);
-        this.logger.log('[CONVS-LIST-PAGE] la conv ', this.conversationSelected, ' è già stata caricata');
+        this.logger.log('[CONVS-LIST-PAGE] la conv ', this.conversationSelected, ' has already been loaded');
         this.conversationSelected = conversationSelected;
         this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected: ', this.conversationSelected);
       }
@@ -457,7 +475,7 @@ export class ConversationListPage implements OnInit {
   }
 
   onImageLoaded(conversation: any) {
-    this.logger.log('[CONVS-LIST-PAGE] onImageLoaded', conversation)
+    // this.logger.log('[CONVS-LIST-PAGE] onImageLoaded', conversation)
     let conversation_with_fullname = conversation.sender_fullname;
     let conversation_with = conversation.sender;
     if (conversation.sender === this.loggedUserUid) {
@@ -476,6 +494,11 @@ export class ConversationListPage implements OnInit {
 
   onConversationLoaded(conversation: ConversationModel) {
     this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded ', conversation)
+    this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded is new? ', conversation.is_new)
+    // if (conversation.is_new === false) {
+    //   this.ionContentConvList.scrollToTop(0);
+    // }
+
     const keys = ['YOU', 'SENT_AN_IMAGE', 'SENT_AN_ATTACHMENT'];
     const translationMap = this.translateService.translateLanguage(keys);
     // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the convesations list
@@ -486,30 +509,55 @@ export class ConversationListPage implements OnInit {
 
       //FIX-BUG: 'YOU: YOU: YOU: text' on last-message-text in conversation-list
       if (conversation.sender === this.loggedUserUid && !conversation.last_message_text.includes(': ')) {
-        this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded', conversation)
+        // this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded', conversation)
 
         if (conversation.type !== "image" && conversation.type !== "file") {
           conversation.last_message_text = translationMap.get('YOU') + ': ' + conversation.last_message_text;
 
         } else if (conversation.type === "image") {
 
-          this.logger.log('[CONVS-LIST-PAGE] HAS SENT AN IMAGE');
-          this.logger.log("[CONVS-LIST-PAGE] translationMap.get('YOU')")
-          // const keys = ['SENT_AN_IMAGE'];
-
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT AN IMAGE');
+          // this.logger.log("[CONVS-LIST-PAGE] translationMap.get('YOU')")
           const SENT_AN_IMAGE = conversation['last_message_text'] = translationMap.get('SENT_AN_IMAGE')
 
-          conversation.last_message_text = translationMap.get('YOU') + ' ' + SENT_AN_IMAGE;
+          conversation.last_message_text = translationMap.get('YOU') + ': ' + SENT_AN_IMAGE;
 
         } else if (conversation.type === "file") {
-          this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
+          const SENT_AN_ATTACHMENT = conversation['last_message_text'] = translationMap.get('SENT_AN_ATTACHMENT')
+          conversation.last_message_text = translationMap.get('YOU') + ': ' + SENT_AN_ATTACHMENT;
+        }
+      } else {
+        if (conversation.type === "image") {
+
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT AN IMAGE');
+          // this.logger.log("[CONVS-LIST-PAGE] translationMap.get('YOU')")
+          const SENT_AN_IMAGE = conversation['last_message_text'] = translationMap.get('SENT_AN_IMAGE')
+
+          conversation.last_message_text = SENT_AN_IMAGE;
+
+        }
+        else if (conversation.type === "file") {
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
           const SENT_AN_ATTACHMENT = conversation['last_message_text'] = translationMap.get('SENT_AN_ATTACHMENT')
-          conversation.last_message_text = translationMap.get('YOU') + ' ' + SENT_AN_ATTACHMENT;
+          conversation.last_message_text = SENT_AN_ATTACHMENT;
+
         }
       }
     }
   }
 
+  // isMarkdownLink(last_message_text) {
+  //   this.logger.log('[CONVS-LIST-PAGE] isMarkdownLink 1')
+  //   var regex = /^(^|[\n\r])\s*1\.\s.*\s+1\.\s$/
+  //   let matchRegex = false
+  //   if (regex.test(last_message_text)) { 
+  //     this.logger.log('[CONVS-LIST-PAGE] isMarkdownLink 2')
+  //     matchRegex = true
+  //     return matchRegex
+  //   }
+  // }
+
 
   navigateByUrl(converationType: string, uidConvSelected: string) {
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl uidConvSelected: ', uidConvSelected);
@@ -588,33 +636,75 @@ export class ConversationListPage implements OnInit {
     const conversationId = conversation.uid;
 
     this.logger.log('[CONVS-LIST-PAGE] onCloseConversation conversationId: ', conversationId)
-    const conversationId_segments = conversationId.split('-');
-    this.logger.log('[CONVS-LIST-PAGE] - conversationId_segments: ', conversationId_segments);
-    const project_id = conversationId_segments[2]
-    this.logger.log('[CONVS-LIST-PAGE] - conversationWith_segments project_id: ', project_id);
 
-    if (conversationId.startsWith("support-group")) {
+    const conversationWith_segments = conversationId.split('-');
+    this.logger.log('[CONVS-LIST-PAGE] - conversationId_segments: ', conversationWith_segments);
+
+    // Removes the last element of the array if is = to the separator 
+    if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+      conversationWith_segments.pop();
+    }
 
-      // const projectId = conversation.attributes.projectId
-      const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-      this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation projectId: ', project_id)
+    if (conversationWith_segments.length === 4) {
+      const lastArrayElement = conversationWith_segments[conversationWith_segments.length - 1]
+      this.logger.log('[CONVS-LIST-PAGE] - lastArrayElement ', lastArrayElement);
+      this.logger.log('[CONVS-LIST-PAGE] - lastArrayElement length', lastArrayElement.length);
+      if (lastArrayElement.length !== 32) {
+        conversationWith_segments.pop();
+      }
+    }
 
-      this.tiledeskService.closeSupportGroup(tiledeskToken, project_id, conversationId).subscribe(res => {
+    if (conversationId.startsWith("support-group")) {
+      let project_id = ''
+      if (conversationWith_segments.length === 4) {
+        project_id = conversationWith_segments[2];
 
-        this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation closeSupportGroup RES', res);
-      }, (error) => {
-        this.logger.error('[CONVS-LIST-PAGE] - onCloseConversation closeSupportGroup - ERROR  ', error);
-      }, () => {
-        this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation closeSupportGroup * COMPLETE *');
-        this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation (closeSupportGroup) CONVS ', this.conversations)
-        this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation (closeSupportGroup) CONVS LENGHT ', this.conversations.length)
-      });
-    } else {
+        const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
+        this.archiveSupportGroupConv(tiledeskToken, project_id, conversationId);
 
+      } else {
+        this.getProjectIdByConversationWith(conversationId)
+      }
+    } else {
       this.conversationsHandlerService.archiveConversation(conversationId)
     }
   }
 
+  getProjectIdByConversationWith(conversationId: string) {
+    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
+
+    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationId).subscribe(res => {
+      this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT RES', res);
+
+      if (res) {
+        const project_id = res.id_project
+        this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT  project_id', project_id);
+        this.archiveSupportGroupConv(tiledeskToken, project_id, conversationId);
+      }
+
+    }, (error) => {
+      this.logger.error('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error);
+
+    }, () => {
+      this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *');
+
+    });
+  }
+
+  archiveSupportGroupConv(tiledeskToken, project_id, conversationId) {
+    this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation projectId: ', project_id)
+    this.tiledeskService.closeSupportGroup(tiledeskToken, project_id, conversationId).subscribe(res => {
+
+      this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation closeSupportGroup RES', res);
+    }, (error) => {
+      this.logger.error('[CONVS-LIST-PAGE] - onCloseConversation closeSupportGroup - ERROR  ', error);
+    }, () => {
+      this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation closeSupportGroup * COMPLETE *');
+      this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation (closeSupportGroup) CONVS ', this.conversations)
+      this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation (closeSupportGroup) CONVS LENGHT ', this.conversations.length)
+    });
+
+  }
 
 
   public generateFake(count: number): Array<number> {

package/src/app/pages/loader-preview/loader-preview.page.html

@@ -27,7 +27,7 @@
     <ion-item>
       <ion-label color="primary" position="floating" floating> {{'AddACaption' | translate}}...</ion-label>
       <!-- <ion-input clearInput></ion-input> -->
-      <ion-textarea #messageTextArea rows="1" autosize="false" auto-grow="true" [(ngModel)]="messageString"
+      <ion-textarea #messageTextArea #imageCaptionTexarea rows="1" autosize="false" auto-grow="true" [(ngModel)]="messageString"
         (ionInput)="onChangeTextArea($event);" (keyup.enter)="pressedOnKeyboard($event, messageString);">
       </ion-textarea>
     </ion-item>

package/src/app/pages/loader-preview/loader-preview.page.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, Output, ViewChild, ElementRef, EventEmitter, HostListener } from '@angular/core';
+import { Component, OnInit, Input, Output, ViewChild, ElementRef, EventEmitter, HostListener, AfterViewInit } from '@angular/core';
 import { TYPE_MSG_IMAGE } from 'src/chat21-core/utils/constants';
 import { NavParams, ModalController } from '@ionic/angular';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
@@ -12,9 +12,10 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
   templateUrl: './loader-preview.page.html',
   styleUrls: ['./loader-preview.page.scss'],
 })
-export class LoaderPreviewPage implements OnInit {
+export class LoaderPreviewPage implements OnInit, AfterViewInit {
   @ViewChild('thumbnailsPreview', { static: false }) thumbnailsPreview: ElementRef;
   @ViewChild('messageTextArea', { static: false }) messageTextArea: ElementRef;
+  @ViewChild('imageCaptionTexarea', { static: false }) imageCaptionTexarea: any
   // @Output() eventSendMessage = new EventEmitter<object>();
   @Input() files: [any];
 
@@ -43,6 +44,17 @@ export class LoaderPreviewPage implements OnInit {
       //this.fileChange(this.files[i]);
     }
   }
+  ngAfterViewInit() {
+    if (this.imageCaptionTexarea) {
+      setTimeout(() => {
+        // this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] set focus on ", this.messageTextArea);
+        // Keyboard.show() // for android
+        this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ngAfterViewInit this.imageCaptionTexarea ", this.imageCaptionTexarea);
+        this.imageCaptionTexarea.setFocus();
+
+      }, 1000); //a least 150ms.
+    }
+  }
 
   ionViewDidEnter() {
     this.logger.log('[LOADER-PREVIEW-PAGE] ionViewDidEnter thumbnailsPreview.nativeElement.offsetHeight', this.thumbnailsPreview.nativeElement.offsetHeight);
@@ -126,7 +138,7 @@ export class LoaderPreviewPage implements OnInit {
 
   start_and_end(str) {
     if (str.length > 70) {
-      return str.substr(0, 20) + '...' + str.substr(str.length-10, str.length);
+      return str.substr(0, 20) + '...' + str.substr(str.length - 10, str.length);
     }
     return str;
   }
@@ -270,7 +282,7 @@ export class LoaderPreviewPage implements OnInit {
 
   /** */
   onChangeTextArea(e: any) {
-    // this.logger.log('onChangeTextArea', e.target.clientHeight);
+    this.logger.log('onChangeTextArea', e.target.clientHeight);
     this.calculateHeightPreviewArea();
     // try {
     //   let height: number = e.target.offsetHeight;
@@ -315,7 +327,7 @@ export class LoaderPreviewPage implements OnInit {
   /** */
   onSendMessage() {
     this.logger.log('[LOADER-PREVIEW-PAGE] onSendMessage messageString:', this.messageString);
-    const file = this.selectedFiles.item(0);
+    let file = this.selectedFiles.item(0);
     const file4Load = new Image;
     const nameImg = file.name;
     const typeFile = file.type;
@@ -332,6 +344,7 @@ export class LoaderPreviewPage implements OnInit {
       'uid': uid
     };
     this.viewCtrl.dismiss({ fileSelected: file, messageString: this.messageString, metadata: metadata, type: TYPE_MSG_IMAGE });
+  
   }
 
   async onClose() {

package/src/app/pages/profile-info/profile-info.page.html

@@ -56,6 +56,7 @@
 
   <ion-list *ngIf="loggedUser">
     <ion-item lines="none" class="sidebar-items" (click)="onClickArchivedConversation()">
+      <div tabindex="0"></div>
       <ion-icon name="archive-outline" class="sidebar-icons"></ion-icon>
       <ion-label class="sidebar-labels">
         <h3>{{ 'LABEL_ARCHIVED' | translate }}</h3>
@@ -63,6 +64,7 @@
     </ion-item>
 
     <ion-item lines="none" class="sidebar-items" (click)="onLogout()">
+      <div tabindex="0"></div>
       <ion-icon name="log-out-outline" class="sidebar-icons"></ion-icon>
       <ion-label class="sidebar-labels">
         <h3>{{ 'LABEL_LOGOUT' | translate }}</h3>

package/src/app/services/nav-proxy.service.ts

@@ -52,7 +52,7 @@ export class NavProxyService {
 
     // !!!! SEEMS NOT USED
     pushSidebar(page: any, pageName: string, navExtra?) {
-      console.log('push2:', pageName, 'navExtra():', navExtra, 'this.sidebarNav', this.sidebarNav);
+      this.logger.log('push2:', pageName, 'navExtra():', navExtra, 'this.sidebarNav', this.sidebarNav);
       if (checkPlatformIsMobile()) {
         this.router.navigate([pageName], navExtra);
       } else {
@@ -64,7 +64,7 @@ export class NavProxyService {
 
    // !!!! SEEMS NOT USED
   closePage(pageName: string) {
-    console.log('closePage:', pageName, 'checkPlatformIsMobile():', checkPlatformIsMobile());
+    this.logger.log('closePage:', pageName, 'checkPlatformIsMobile():', checkPlatformIsMobile());
     if (checkPlatformIsMobile()) {
       const navigationExtras: NavigationExtras = {
         state: {

package/src/app/services/network-service/network.service.spec.ts

@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NetworkService } from './network.service';
+
+describe('NetworkService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: NetworkService = TestBed.get(NetworkService);
+    expect(service).toBeTruthy();
+  });
+});

package/src/app/services/network-service/network.service.ts

@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { Observable, Observer, fromEvent, merge, of } from 'rxjs';
+import { mapTo } from 'rxjs/operators';
+import { Platform } from '@ionic/angular';
+import { Network } from '@ionic-native/network/ngx';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NetworkService {
+
+  public appIsOnline$: Observable<boolean> = undefined;
+  checkInternet: boolean;
+
+  constructor(
+    private platform: Platform,
+    private network: Network
+  ) { }
+
+
+
+  checkInternetFunc() {
+    if (!window || !navigator || !('onLine' in navigator)) return;
+
+    this.appIsOnline$ = Observable.create(observer => {
+      observer.next(true);
+    }).pipe(mapTo(true));
+
+    if (this.platform.is('cordova')) {
+      // on Device - when platform is cordova
+      this.appIsOnline$ = merge(
+        this.network.onConnect().pipe(mapTo(true)),
+        this.network.onDisconnect().pipe(mapTo(false))
+      );
+    } else {
+      // on Browser - when platform is Browser
+      this.appIsOnline$ = merge(
+        of(navigator.onLine),
+        fromEvent(window, 'online').pipe(mapTo(true)),
+        fromEvent(window, 'offline').pipe(mapTo(false))
+      );
+    }
+    return this.appIsOnline$
+  }
+
+}

package/src/app/shared/shared.module.ts

@@ -36,6 +36,7 @@ import { AdvancedInfoAccordionComponent } from '../components/conversation-info/
 import { InfoGroupComponent } from '../components/conversation-info/info-group/info-group.component';
 import { TooltipModule } from 'ng2-tooltip-directive';
 import { OptionHeaderComponent } from '../components/conversation-detail/option-header/option-header.component';
+import { MessageAttachmentComponent } from '../chatlib/conversation-detail/message/message-attachment/message-attachment.component';
 
 @NgModule({
   declarations: [
@@ -50,6 +51,7 @@ import { OptionHeaderComponent } from '../components/conversation-detail/option-
     ConversationContentComponent,
     AvatarComponent,
     BubbleMessageComponent,
+    MessageAttachmentComponent,
     TextButtonComponent,
     LinkButtonComponent,
     ActionButtonComponent,

package/src/assets/i18n/en.json

@@ -172,10 +172,12 @@
   "UPLOAD_FILE_ERROR":"An unexpected error occurred while uploading the file",
   "DROP_IMAGE_HERE_TO_SEND_IT":"Drop image here to send it",
   "ONLY_IMAGE_FILES_ARE_ALLOWED_TO_PASTE": "Only image files and text are allowed to be pasted",
-  "ONLY_IMAGE_FILES_ARE_ALLOWED_TO_DRAG": "Only image files are allowed to be dragged",
+  "FAILED_TO_UPLOAD_THE_FORMAT_IS_NOT_SUPPORTED": "Failed to upload: the format is not supported",
   "SENT_AN_IMAGE": "sent an image",
   "SENT_AN_ATTACHMENT":"sent an attachment",
   "NO_INFORMATION_AVAILABLE": "No information available",
   "CONTACT_ID": "Contact ID",
-  "USER_ID": "User ID"
+  "USER_ID": "User ID",
+  "CLOSE_TOAST": "Close",
+  "WAITING_FOR_NETWORK": "Waiting for network"
 }

package/src/assets/i18n/it.json

@@ -180,10 +180,12 @@
     "UPLOAD_FILE_ERROR":"Si è verificato un errore imprevisto durante il caricamento del file",
     "DROP_IMAGE_HERE_TO_SEND_IT":"Trascina qui l'immagine per inviarla",
     "ONLY_IMAGE_FILES_ARE_ALLOWED_TO_PASTE": "Possono essere incollati solo file di tipo immagine e testo",
-    "ONLY_IMAGE_FILES_ARE_ALLOWED_TO_DRAG": "È consentito trascinare solo file di tipo immagine",
-    "SENT_AN_IMAGE": "hai inviato un'immagine",
+    "FAILED_TO_UPLOAD_THE_FORMAT_IS_NOT_SUPPORTED": "Impossibile caricare: il formato non è supportato",
+    "SENT_AN_IMAGE": "ha inviato un'immagine",
     "SENT_AN_ATTACHMENT":"hai inviato un allegato",
     "NO_INFORMATION_AVAILABLE": "Nessuna informazione disponibile",
     "CONTACT_ID": "ID contatto",
-    "USER_ID": "ID utente"
+    "USER_ID": "ID utente",
+    "CLOSE_TOAST": "Chiudi",
+    "WAITING_FOR_NETWORK": "In attesa di rete"
 }

package/src/chat21-core/providers/abstract/app-storage.service.ts

@@ -9,8 +9,8 @@ export abstract class AppStorageService {
   abstract initialize(storagePrefix: string, persistence: string, projectID?: string): void;
   abstract getItem(key: string): any;
   abstract setItem(key: string, value: any): void;
-  abstract getItemWithoutProjectID(key: string): any;
-  abstract setItemWithoutProjectID(key: string, value: any): void;
+  // abstract getItemWithoutProjectID(key: string): any; // deprecated !Not tUsed
+  // abstract setItemWithoutProjectID(key: string, value: any): void; // deprecated !Not tUsed
   abstract removeItem(key: string): void;
   abstract clear(): void;
 

package/src/chat21-core/providers/chat-manager.ts

@@ -17,7 +17,6 @@ import { LoggerService } from './abstract/logger.service';
 import { LoggerInstance } from './logger/loggerInstance';
 
 
-
 @Injectable({ providedIn: 'root' })
 
 export class ChatManager {
@@ -58,6 +57,7 @@ export class ChatManager {
    * setTiledeskToken
    */
   public setTiledeskToken(tiledeskToken: string) {
+    this.logger.info('initialize FROM [APP-COMP] - [CHAT MANAGER] - initialize -> firebaseConfig tenant ', this.tenant);
     this.tiledeskToken = tiledeskToken;
   }
 
@@ -72,6 +72,7 @@ export class ChatManager {
    * setCurrentUser
    */
   public setCurrentUser(currentUser: UserModel) {
+    this.logger.info('initialize FROM [APP-COMP] - [CHAT MANAGER] setCurrentUser currentUser ', currentUser)
     this.currentUser = currentUser;
   }
 

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

@@ -64,7 +64,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
      * inizializzo conversations handler
      */
     initialize(tenant: string, userId: string, translationMap: Map<string, string>) {
-        this.logger.info('[FIREBASEArchivedConversationsHandlerSERVICE] tenant ', tenant, ' - userId: ', userId, ' - translationMap: ', translationMap)
+        this.logger.info('initialize FROM [APP-COMP] - FIREBASEArchivedConversationsHandlerSERVICE] tenant ', tenant, ' - userId: ', userId, ' - translationMap: ', translationMap)
         this.tenant = tenant;
         this.loggedUserId = userId;
         this.translationMap = translationMap;
@@ -190,7 +190,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
                 const childData: ConversationModel = childSnapshot.val();
                 this.logger.log('[FIREBASEArchivedConversationsHandlerSERVICE] childData *****', childData)
                 // if (childSnapshot && childSnapshot.key && childData.uid) {
-                if (childSnapshot && childSnapshot.key) {
+                if (childSnapshot && childSnapshot.key && childData) {
                     childData.uid = childSnapshot.key;
                     const conversation = this.completeConversation(childData);
                     if (conversation) {
@@ -391,6 +391,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
         }
         // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the archived convesations list
         // conv.last_message_text = htmlEntities(conv.last_message_text)
+        conv.conversation_with = conversation_with;
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
         // conv.time_last_message = this.getTimeLastMessage(conv.timestamp); // evaluate if is used