@chat21/chat21-ionic 3.0.65-rc2 → 3.0.67

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

@@ -320,7 +320,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       const conversations = this.conversationsHandlerService.conversations
       // console.log('[CONVS-DETAIL] conversations', conversations);
       this.conversation_count = conversations.length
-      if (conv && conv.sender !== this.loggedUser.uid) {
+      if (conv && this.loggedUser && conv.sender !== this.loggedUser.uid) {
         this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange data sender ', conv.sender)
         this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange this.loggedUser.uid ', this.loggedUser.uid)
         this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange is_new ', conv.is_new)
@@ -761,6 +761,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     if (this.conversationWith && this.conversationsHandlerService && this.conv_type === 'active') {
       this.logger.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail CALLING')
       this.conversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
+        this.logger.debug('[CONV-COMP] setHeaderContent getConversationDetail: conversationsHandlerService ', this.conversationWith, conv, this.conv_type)
         if (conv) {
           this.conversationAvatar = setConversationAvatar(
             conv.conversation_with,
@@ -768,19 +769,45 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.channel_type,
           )
         }
+        if(!conv){
+          this.logger.debug('[CONV-COMP] setHeaderContent getConversationDetail: conv not exist --> search in archived list', this.conversationWith, this.conv_type)
+          this.archivedConversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
+            this.logger.debug('[CONV-COMP] setHeaderContent getConversationDetail: archivedConversationsHandlerService', this.conversationWith, conv)
+            if (conv) {
+              console.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail (archived)', this.conversationWith, 'CONVS', conv)
+              this.conversationAvatar = setConversationAvatar(
+                conv.conversation_with,
+                conv.conversation_with_fullname,
+                conv.channel_type,
+              )
+            }
+          })
+        }
         this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar)
       })
     } else {
-      //get conversation from 'conversations' firebase node
+      //get conversation from 'archived-conversations' firebase node
+      this.logger.debug('[CONV-COMP] setHeaderContent getConversationDetail: archivedConversationsHandlerService', this.conversationWith, this.conv_type)
       this.archivedConversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
         if (conv) {
-          // console.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail (archived)', this.conversationWith, 'CONVS', conv)
           this.conversationAvatar = setConversationAvatar(
             conv.conversation_with,
             conv.conversation_with_fullname,
             conv.channel_type,
           )
         }
+        if(!conv){
+          this.conversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
+            if (conv) {
+              this.conversationAvatar = setConversationAvatar(
+                conv.conversation_with,
+                conv.conversation_with_fullname,
+                conv.channel_type,
+              )
+            }
+            this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar)
+          })
+        }
       })
     }
 
@@ -934,7 +961,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     subscriptionKey = 'messageAdded'
     subscription = this.subscriptions.find((item) => item.key === subscriptionKey)
     if (!subscription) {
-      this.logger.log('[CONVS-DETAIL] subscribe to messageAdded - conversationHandlerService', this.conversationHandlerService)
       subscription = this.conversationHandlerService.messageAdded.subscribe((msg: any) => {
         this.logger.log('[CONVS-DETAIL] subscribe to messageAdded - msg ', msg)
         if (msg) {
@@ -950,7 +976,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     subscriptionKey = 'messageChanged'
     subscription = this.subscriptions.find((item) => item.key === subscriptionKey)
     if (!subscription) {
-      this.logger.log('[CONVS-DETAIL] subscribe to messageChanged')
       subscription = this.conversationHandlerService.messageChanged.subscribe((msg: any) => {
         this.logger.log('[CONVS-DETAIL] subscribe to messageChanged - msg ', msg)
       })
@@ -961,7 +986,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     subscriptionKey = 'messageRemoved'
     subscription = this.subscriptions.find((item) => item.key === subscriptionKey)
     if (!subscription) {
-      this.logger.log('[CONVS-DETAIL] subscribe to messageRemoved')
       subscription = this.conversationHandlerService.messageRemoved.subscribe((messageId: any) => {
         this.logger.log('[CONVS-DETAIL] subscribe to messageRemoved - messageId ', messageId)
       })
@@ -1186,26 +1210,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 this.logger.log('[CONVS-DETAIL] - returnChangeTextArea  --> beforeSlash parts', beforeSlashParts)
 
                 if (beforeSlashParts.length === 2) {
-                  if (
-                    beforeSlashParts[0].indexOf(' ') >= 0 &&
-                    afterSlashParts[0] === ''
-                  ) {
+                  if (beforeSlashParts[0].indexOf(' ') >= 0 && afterSlashParts[0] === '') {
                     this.HIDE_CANNED_RESPONSES = false
-                    this.logger.log(
-                      '[CONVS-DETAIL] - returnChangeTextArea  --> beforeSlash there is a white space After Not',
-                    )
+                    this.logger.log('[CONVS-DETAIL] - returnChangeTextArea  --> beforeSlash there is a white space After Not')
                     // if (beforeSlashParts[0].indexOf(' ') >= 0 && afterSlashParts[0].indexOf(' ') >= 0)
-                  } else if (
-                    beforeSlashParts[0].indexOf(' ') < 0 &&
-                    afterSlashParts[0] === ''
-                  ) {
+                  } else if (beforeSlashParts[0].indexOf(' ') < 0 && afterSlashParts[0] === '') {
                     this.HIDE_CANNED_RESPONSES = true
                     this.tagsCannedFilter = []
                     this.logger.log('[CONVS-DETAIL] - returnChangeTextArea  --> beforeSlash not thete is a white space After Not')
-                  } else if (
-                    beforeSlashParts[0].indexOf(' ') >= 0 &&
-                    afterSlashParts[0] === ' '
-                  ) {
+                  } else if (beforeSlashParts[0].indexOf(' ') >= 0 && afterSlashParts[0] === ' ') {
                     this.logger.log('[CONVS-DETAIL] - returnChangeTextArea  --> beforeSlash not thete is a white space After YES')
                     this.HIDE_CANNED_RESPONSES = true
                     this.tagsCannedFilter = []
@@ -1475,11 +1488,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.logger.log('[CONVS-DETAIL] - insertAtCursor - myValue ', myValue)
     this.logger.log('[CONVS-DETAIL] - insertAtCursor - myField ', myField)
 
-    // myValue = ' ' + myValue;
-
-    // console.log('[CONVS-DETAIL] - GET TEXT AREA - Here yes myValue ', myValue);
-    // console.log('[CONVS-DETAIL] - GET TEXT AREA - Here yes textArea value length', myField.value.length);
-
     if (myField.value.length > 0) {
       myValue = ' ' + myValue
     }
@@ -1571,24 +1579,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     // this.audio.src = '/assets/sounds/pling.mp3';
     this.audio.src = URL_SOUND_LIST_CONVERSATION
     this.audio.load()
-    this.logger.log(
-      '[CONVS-DETAIL] soundMessage conversation this.audio',
-      this.audio,
-    )
+    this.logger.log('[CONVS-DETAIL] soundMessage conversation this.audio',this.audio)
     clearTimeout(this.setTimeoutSound)
     this.setTimeoutSound = setTimeout(function () {
-      that.audio
-        .play()
-        .then(() => {
+      that.audio.play().then(() => {
           // Audio is playing.
-          this.logger.log(
-            '[CONVS-DETAIL] soundMessag that.audio.src ',
-            that.audio.src,
-          )
-        })
-        .catch((error) => {
+          this.logger.log('[CONVS-DETAIL] soundMessag that.audio.src ',that.audio.src)
+      }).catch((error) => {
           that.logger.error(error)
-        })
+      })
     }, 1000)
   }
 
@@ -1750,10 +1749,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
    * FIREBY BY: click event ScrollToBottom bottom-right icon button
    */
   public actionScrollBottom() {
-    this.logger.log(
-      '[CONVS-DETAIL] actionScrollBottom - ionContentChatArea: ',
-      this.ionContentChatArea,
-    )
+    this.logger.log('[CONVS-DETAIL] actionScrollBottom - ionContentChatArea: ',this.ionContentChatArea)
     // const that = this;
     this.showButtonToBottom = false
     this.updateConversationBadge()
@@ -1790,43 +1786,22 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
   checkAcceptedFile(draggedFileMimeType) {
     let isAcceptFile = false
-    this.logger.log(
-      '[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept: ',
-      this.appConfigProvider.getConfig().fileUploadAccept,
-    )
+    this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept: ',this.appConfigProvider.getConfig().fileUploadAccept)
     const accept_files = this.appConfigProvider.getConfig().fileUploadAccept
-    this.logger.log(
-      '[CONVS-DETAIL] > checkAcceptedFile - mimeType: ',
-      draggedFileMimeType,
-    )
+    this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - mimeType: ',draggedFileMimeType)
     if (accept_files === '*/*') {
       isAcceptFile = true
       return isAcceptFile
     } else if (accept_files !== '*/*') {
-      this.logger.log(
-        '[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept typeof accept_files ',
-        typeof accept_files,
-      )
+      this.logger.log( '[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept typeof accept_files ',typeof accept_files)
       const accept_files_array = accept_files.split(',')
-      this.logger.log(
-        '[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_files_array ',
-        accept_files_array,
-      )
-      this.logger.log(
-        '[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_files_array typeof: ',
-        typeof accept_files_array,
-      )
+      this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_files_array ',accept_files_array)
+      this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_files_array typeof: ',typeof accept_files_array)
 
       accept_files_array.forEach((accept_file) => {
-        this.logger.log(
-          '[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_file ',
-          accept_file,
-        )
+        this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_file ',accept_file)
         const accept_file_segment = accept_file.split('/')
-        this.logger.log(
-          '[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_file_segment ',
-          accept_file_segment,
-        )
+        this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept accept_file_segment ',accept_file_segment)
         if (accept_file_segment[1] === '*') {
           if (draggedFileMimeType.startsWith(accept_file_segment[0])) {
             isAcceptFile = true

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

@@ -4,12 +4,14 @@
     [supportMode]="supportMode"
     [archived_btn]="archived_btn"
     [writeto_btn]="writeto_btn"
+    [sound_btn]="sound_btn"
+    (onSoundChange)="onSoundChange($event)"
     (openContactsDirectory)=openContactsDirectory($event) 
     (openProfileInfo)=openProfileInfo($event)>
   </app-ddp-header>
 
   <app-option-header *ngIf="conversationType !=='active'" 
-  [headerTitle]=headerTitle
+    [headerTitle]=headerTitle
     (onBackButton)=onBackButtonFN($event)>
   </app-option-header>
 </ion-header>

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

@@ -1,3 +1,4 @@
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 import { ArchivedConversationsHandlerService } from 'src/chat21-core/providers/abstract/archivedconversations-handler.service'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { IonContent, ModalController } from '@ionic/angular'
@@ -17,6 +18,8 @@ import {
   closeModal,
   convertMessage,
   isGroup,
+  searchIndexInArrayForUid,
+  compareValues,
 } from '../../../chat21-core/utils/utils'
 
 import { EventsService } from '../../services/events-service'
@@ -69,6 +72,7 @@ export class ConversationListPage implements OnInit {
   public supportMode: boolean
   public writeto_btn: boolean
   public archived_btn: boolean
+  public sound_btn: string
   public convertMessage = convertMessage
   private isShowMenuPage = false
   private logger: LoggerService = LoggerInstance.getInstance()
@@ -118,11 +122,13 @@ export class ConversationListPage implements OnInit {
     public appConfigProvider: AppConfigProvider,
     public platform: Platform,
     private networkService: NetworkService,
+    private appStorageService: AppStorageService
   ) {
     this.listenToAppCompConvsLengthOnInitConvs()
     this.listenToLogoutEvent()
     this.listenGoOnline()
     this.listenGoOffline()
+    this.listenToStorageChange()
     this.listenToSwPostMessage()
     this.listenSupportConvIdHasChanged()
     // this.listenDirectConvIdHasChanged();
@@ -168,6 +174,7 @@ export class ConversationListPage implements OnInit {
   ngOnInit() {
     this.watchToConnectionStatus()
     this.getAppConfigToHideDiplayBtns()
+    
   }
 
   ngOnChanges() {
@@ -206,6 +213,16 @@ export class ConversationListPage implements OnInit {
       this.writeto_btn = false;
       this.logger.log('[CONVS-LIST-PAGE] getAppConfigToHideDiplayBtns writeto_btn ', this.writeto_btn)
     }
+
+
+    const sound_status = localStorage.getItem('dshbrd----sound')
+    if(sound_status && sound_status !== 'undefined'){
+      this.sound_btn = sound_status
+    } else {
+      this.sound_btn = 'enabled'
+    }
+
+
   }
 
   watchToConnectionStatus() {
@@ -226,7 +243,7 @@ export class ConversationListPage implements OnInit {
     this.logger.log('Called ionViewDidEnter')
     this.logger.log('[CONVS-LIST-PAGE] ionViewWillEnter uidConvSelected',this.uidConvSelected )
     this.listnerStart()
-
+    // this.conversations = this.manageStoredConversations()
     // exit from app with hardware back button
     this.subscription = this.platform.backButton.subscribe(() => {
       navigator['app'].exitApp()
@@ -331,10 +348,13 @@ export class ConversationListPage implements OnInit {
     })
   }
 
+  
+
   // ------------------------------------------------------------------ //
   // Init convrsation handler
   // ------------------------------------------------------------------ //
   initConversationsHandler() {
+    // this.conversations = this.manageStoredConversations()
     this.conversations = this.conversationsHandlerService.conversations
     this.logger.log('[CONVS-LIST-PAGE] - CONVERSATIONS ', this.conversations.length, this.conversations)
     // save conversationHandler in chatManager
@@ -342,6 +362,19 @@ export class ConversationListPage implements OnInit {
     this.showPlaceholder = false
   }
 
+  private manageStoredConversations(): ConversationModel[] {
+    let conversationsStored = []
+    if(this.appStorageService.getItem('conversations')){
+      conversationsStored = JSON.parse(this.appStorageService.getItem('conversations'))
+      if(conversationsStored && conversationsStored.length > 0) {
+        // this.conversationsHandlerService.conversations = conversationsStored
+        this.logger.log('[CONVS-LIST-PAGE] retrive conversations from storage --> ', conversationsStored.length)
+        this.events.publish('appcompSubscribeToConvs:loadingIsActive', false);
+      }
+    }
+    return conversationsStored
+  }
+
   initArchivedConversationsHandler() {
     const keysConversation = ['CLOSED', 'Resolve']
     this.translationMapConversation = this.translateService.translateLanguage( keysConversation )
@@ -416,6 +449,10 @@ export class ConversationListPage implements OnInit {
     })
   }
 
+  listenToStorageChange(){
+    this.events.subscribe('storage:sound', value => this.sound_btn = value)
+  }
+
   // ------------------------------------------------------------------
   //  SUBSCRIPTIONS
   // ------------------------------------------------------------------
@@ -648,16 +685,15 @@ export class ConversationListPage implements OnInit {
       let conversationSelected
       if (conversationType === 'active') {
         conversationSelected = this.conversations.find((item) => item.uid === this.uidConvSelected)
-        this.conversationsHandlerService.uidConvSelected = conversationSelected.uid
       } else if (conversationType === 'archived') { 
-        conversationSelected = this.archivedConversations.find((item) => item.uid === this.uidConvSelected) 
-        this.archivedConversationsHandlerService.uidConvSelected = conversationSelected.uid
+        conversationSelected = this.archivedConversations.find((item) => item.uid === this.uidConvSelected)
       }
       if (conversationSelected) {
         this.logger.log('[CONVS-LIST-PAGE] conversationSelected', conversationSelected)
         this.logger.log('[CONVS-LIST-PAGE] the conversation ', this.conversationSelected, ' has already been loaded')
         this.conversationSelected = conversationSelected
         this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected: ', this.conversationSelected)
+        conversationType === 'active'? this.conversationsHandlerService.uidConvSelected = conversationSelected.uid : this.archivedConversationsHandlerService.uidConvSelected = conversationSelected.uid
       }
     }
   }
@@ -821,6 +857,13 @@ export class ConversationListPage implements OnInit {
     }
   }
 
+  onSoundChange(event: string){
+    if(event && event !== undefined){
+      localStorage.setItem('dshbrd----sound', event)
+      this.sound_btn = event
+    }
+  }
+
   listenToCloseConvFromHeaderConversation() {
     this.events.subscribe('conversation:closed', (convId) => {
       this.logger.log('[CONVS-LIST-PAGE] hasclosedconversation  convId', convId)
@@ -922,7 +965,9 @@ export class ConversationListPage implements OnInit {
       this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation (closeSupportGroup) CONVS ',this.conversations)
       this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation (closeSupportGroup) CONVS LENGHT ',this.conversations.length)
       this.events.publish('conversationhasbeenclosed', conversationId)
-      this.navigateByUrl('archived', conversationId)
+      if(conversationId === this.uidConvSelected){
+        this.navigateByUrl('archived', conversationId)
+      }
     })
   }
 

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

@@ -110,39 +110,25 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
     } else if (file.type.startsWith('image') && file.type.includes('svg')) {
       // this.previewFiles(file)
 
-      this.logger.log(
-        '[LOADER-PREVIEW-PAGE] - readAsDataURL file TYPE',
-        file.type,
-      )
+      this.logger.log('[LOADER-PREVIEW-PAGE] - readAsDataURL file TYPE',file.type)
       this.logger.log('[LOADER-PREVIEW-PAGE] - readAsDataURL file ', file)
       const preview = document.querySelector('#img-preview') as HTMLImageElement
 
       const reader = new FileReader()
       const that = this
-      reader.addEventListener(
-        'load',
-        function () {
+      reader.addEventListener('load',function () {
           // convert image file to base64 string
           // const img = reader.result as string;
           const img = reader.result.toString()
-          that.logger.log(
-            'FIREBASE-UPLOAD USE CASE SVG LoaderPreviewPage readAsDataURL img ',
-            img,
-          )
+          that.logger.log('FIREBASE-UPLOAD USE CASE SVG LoaderPreviewPage readAsDataURL img ',img)
 
           // that.fileSelected = that.sanitizer.bypassSecurityTrustResourceUrl(img);
 
-          that.arrayFiles.push(
-            that.sanitizer.bypassSecurityTrustResourceUrl(img),
-          )
+          that.arrayFiles.push(that.sanitizer.bypassSecurityTrustResourceUrl(img))
           if (!that.fileSelected) {
-            that.fileSelected = that.sanitizer.bypassSecurityTrustResourceUrl(
-              img,
-            )
+            that.fileSelected = that.sanitizer.bypassSecurityTrustResourceUrl(img)
           }
-        },
-        false,
-      )
+      },false)
 
       if (file) {
         reader.readAsDataURL(file)
@@ -153,27 +139,13 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
       // ---------------------------------------------------------------------
       // } else if (file.type.startsWith("application") || file.type.startsWith("video") || file.type.startsWith("audio") ) {
     } else {
-      this.logger.log(
-        '[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE ',
-        file,
-      )
-      this.logger.log(
-        '[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE TYPE',
-        file.type,
-      )
-      this.file_extension =
-        file.name.substring(file.name.lastIndexOf('.') + 1, file.name.length) ||
-        file.name
-      this.logger.log(
-        '[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE EXTENSION',
-        this.file_extension,
-      )
+      this.logger.log('[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE ',file)
+      this.logger.log('[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE TYPE',file.type)
+      this.file_extension =  file.name.substring(file.name.lastIndexOf('.') + 1, file.name.length) || file.name
+      this.logger.log('[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE EXTENSION',this.file_extension)
       this.file_name = file.name
       this.file_name_ellipsis_the_middle = this.start_and_end(file.name)
-      this.logger.log(
-        '[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE NAME',
-        this.file_name,
-      )
+      this.logger.log( '[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE FILE - FILE NAME',this.file_name)
       // if (file.type) {
       //   const file_type_array = file.type.split('/');
       //   this.logger.log('FIREBASE-UPLOAD USE CASE FILE LoaderPreviewPage readAsDataURL file_type_array', file_type_array);
@@ -204,10 +176,7 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
     const reader = new FileReader()
     reader.onloadend = (evt) => {
       const img = reader.result.toString()
-      this.logger.log(
-        '[LOADER-PREVIEW-PAGE] - createFile file - FileReader success img',
-        img,
-      )
+      this.logger.log('[LOADER-PREVIEW-PAGE] - createFile file - FileReader success img',img)
       this.arrayFiles.push(img)
       if (!this.fileSelected) {
         this.fileSelected = img