@chat21/chat21-ionic 3.0.64 → 3.0.65

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

@@ -143,7 +143,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   arrowkeyLocation = -1
   public_Key: any;
   areVisibleCAR: boolean;
-  support_mode: boolean;
+  supportMode: boolean;
   //SOUND
   setTimeoutSound: any;
   audio: any;
@@ -313,7 +313,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       const conversations = this.conversationsHandlerService.conversations
       // console.log('[CONVS-DETAIL] conversations', conversations);
       this.conversation_count = conversations.length
-      this.logger.log('[CONVS-DETAIL] conversation_count', this.conversation_count)
     })
 
     this.conversationsHandlerService.conversationChanged.subscribe((conv) => {
@@ -321,20 +320,19 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       const conversations = this.conversationsHandlerService.conversations
       // console.log('[CONVS-DETAIL] conversations', conversations);
       this.conversation_count = conversations.length
-      this.logger.log('[CONVS-DETAIL] conversation_count', this.conversation_count)
-      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)
         this.logger.log('[CONVS-DETAIL] subscribe to  BSConversationsChange showButtonToBottom ', this.showButtonToBottom)
         // UPDATE THE CONVERSATION TO 'READ' IF IT IS ME WHO WRITES THE LAST MESSAGE OF THE CONVERSATION
         // AND IF THE POSITION OF THE SCROLL IS AT THE END
-        if (!this.showButtonToBottom && conv.is_new) {
-          // ARE AT THE END
-          this.updateConversationBadge()
-        }
-        if (conv.uid === this.conversationWith) {
-          this.conversationAvatar = setConversationAvatar(conv.conversation_with, conv.conversation_with_fullname, conv.channel_type)
+        // if (!this.showButtonToBottom && conv.is_new) {
+        //   // ARE AT THE END
+        //   this.updateConversationBadge()
+        // }
+        if(conv.uid && conv.uid === this.conversationWith){
+          this.conversationAvatar = setConversationAvatar(conv.conversation_with,conv.conversation_with_fullname,conv.channel_type)
         }
 
       }
@@ -354,15 +352,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
   getOSCODE() {
-    this.support_mode = null
+    this.supportMode = null
     if (this.appConfigProvider.getConfig().supportMode === true || this.appConfigProvider.getConfig().supportMode === 'true') {
-      this.support_mode = true
+      this.supportMode = true
     } else if (this.appConfigProvider.getConfig().supportMode === false || this.appConfigProvider.getConfig().supportMode === 'false') {
-      this.support_mode = false
+      this.supportMode = false
     } else if (!this.appConfigProvider.getConfig().supportMode) {
-      this.support_mode = false
+      this.supportMode = false
     }
-    this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig support_mode', this.support_mode)
+    this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig supportMode', this.supportMode)
     this.public_Key = this.appConfigProvider.getConfig().t2y12PruGU9wUtEGzBJfolMIgK
     this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig public_Key', this.public_Key)
 
@@ -375,26 +373,17 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
           let car = key.split(':')
           if (car[1] === 'F') {
             this.areVisibleCAR = false
-            this.logger.log(
-              '[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',
-              this.areVisibleCAR,
-            )
+            this.logger.log('[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',this.areVisibleCAR)
           } else {
             this.areVisibleCAR = true
-            this.logger.log(
-              '[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',
-              this.areVisibleCAR,
-            )
+            this.logger.log('[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',this.areVisibleCAR)
           }
         }
       })
 
       if (!this.public_Key.includes('CAR')) {
         this.areVisibleCAR = false
-        this.logger.log(
-          '[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',
-          this.areVisibleCAR,
-        )
+        this.logger.log('[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',this.areVisibleCAR)
       }
     } else {
       this.areVisibleCAR = false
@@ -772,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,
@@ -779,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)
+          })
+        }
       })
     }
 
@@ -945,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) {
@@ -961,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)
       })
@@ -972,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)
       })
@@ -1127,7 +1140,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       // ----------------------------------------------------------
       // DISPLAY CANNED RESPONSES if message.lastIndexOf("/")
       // ----------------------------------------------------------
-      if (this.areVisibleCAR && this.support_mode === true) {
+      if (this.areVisibleCAR && this.supportMode === true) {
         setTimeout(() => {
           if (this.conversationWith.startsWith('support-group')) {
             const pos = message.lastIndexOf('/')
@@ -1197,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 = []
@@ -1486,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
     }
@@ -1582,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)
   }
 
@@ -1761,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()

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

@@ -43,16 +43,17 @@
           <ion-label part="message-text" class="waiting-for-network-msg"> Waiting for network</ion-label>
         </ion-item>
         <!-- supportMode && -->
-        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived'" class="ion-no-padding open-iframe-item">
+        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived' && supportMode" class="ion-no-padding open-iframe-item">
           <div tabindex="0"></div>
           <!-- <ion-note class="pinned-project">
             {{ 'PINNED_PROJECT' | translate }}
           </ion-note> -->
      
-          <app-project-item style="width: 100%;" 
-          (openUnsevedConvsEvent)="openUnsevedConversationIframe($event)"  
-          (projectIdEvent)="getLastProjectId($event)">
-        </app-project-item>
+          <app-project-item
+            style="width: 100%;" 
+            (openUnsevedConvsEvent)="openUnsevedConversationIframe($event)"
+            (projectIdEvent)="getLastProjectId($event)">
+          </app-project-item>
         </ion-item>
 
       <span
@@ -66,10 +67,15 @@
         <!-- ---------------------------------- -->
         <!-- ACTIVE CONVERSATION LIST -->
         <!-- ---------------------------------- -->
-        <ion-list-conversations *ngIf="conversationType ==='active'" [uidConvSelected]="uidConvSelected"
-          [listConversations]="conversations" [stylesMap]="stylesMap" [translationMap]="translationMapConversation"
-          (onConversationSelected)=onConversationSelected($event) (onImageLoaded)="onImageLoaded($event)"
-          (onConversationLoaded)="onConversationLoaded($event)" (onCloseConversation)="onCloseConversation($event)" 
+        <ion-list-conversations *ngIf="conversationType ==='active'" 
+          [uidConvSelected]="uidConvSelected"
+          [listConversations]="conversations" 
+          [stylesMap]="stylesMap" 
+          [translationMap]="translationMapConversation"
+          (onConversationSelected)=onConversationSelected($event) 
+          (onImageLoaded)="onImageLoaded($event)"
+          (onConversationLoaded)="onConversationLoaded($event)" 
+          (onCloseConversation)="onCloseConversation($event)" 
           [archiveActionNotAllowed]="archiveActionNotAllowed"
           (onCloseAlert)="onCloseAlert($event)">
         </ion-list-conversations>
@@ -77,9 +83,12 @@
         <!-- ---------------------------------- -->
         <!-- ARCHIVED CONVERSATION LIST -->
         <!-- ---------------------------------- -->
-        <ion-list-conversations *ngIf="conversationType ==='archived'" [listConversations]="archivedConversations"
-          [stylesMap]="stylesMap" [translationMap]="translationMapConversation"
-          (onConversationSelected)=onConversationSelected($event) (onImageLoaded)="onImageLoaded($event)"
+        <ion-list-conversations *ngIf="conversationType ==='archived'" 
+          [listConversations]="archivedConversations"
+          [stylesMap]="stylesMap" 
+          [translationMap]="translationMapConversation"
+          (onConversationSelected)=onConversationSelected($event) 
+          (onImageLoaded)="onImageLoaded($event)"
           (onConversationLoaded)="onConversationLoaded($event)">
         </ion-list-conversations>
       </ng-template>