@chat21/chat21-ionic 3.0.64-rc1 → 3.0.64

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

@@ -18,18 +18,13 @@
 
     <!-- [width]="getMetadataSize(message.metadata).width" 
     [height]="getMetadataSize(message.metadata).height" -->
-    <chat-image *ngIf="isImage(message)" 
-      [metadata]="message.metadata" 
-      [width]="message.metadata.width"
-      [height]="message.metadata.height" 
-      (onImageRendered)="onImageRenderedFN($event)">
+    <chat-image *ngIf="isImage(message)" [metadata]="message.metadata" [width]="message.metadata.width"
+      [height]="message.metadata.height" (onImageRendered)="onImageRenderedFN($event)">
     </chat-image>
 
     <!-- [width]="getMetadataSize(message.metadata).width"  -->
     <!-- [height]="getMetadataSize(message.metadata).height"> -->
-    <chat-frame *ngIf="isFrame(message)" 
-      [metadata]="message.metadata" 
-      [width]="message.metadata.width"
+    <chat-frame *ngIf="isFrame(message)" [metadata]="message.metadata" [width]="message.metadata.width"
       [height]="message.metadata.height">
     </chat-frame>
 
@@ -47,20 +42,13 @@
         <span> {{message.timestamp | amCalendar }} </span>
       </ng-template> -->
 
-      <chat-text *ngIf="message?.type !=='html'"
-        [text]="message?.text" 
-        [color]="textColor" 
-        [message]="message"
-        [class.chat-text-emoticon]="message?.emoticon"
+      <chat-text [text]="message?.text" [color]="textColor" [message]="message"
+      [class.chat-text-emoticon]="message?.emoticon"
         (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
         (onAfterMessageRender)="returnOnAfterMessageRender($event)">
       </chat-text>
 
-      <chat-html *ngIf="message?.type==='html'"
-        [htmlText]="message?.text">
-      </chat-html>
-
-      <ng-container *ngIf="areVisibleCAR && supportMode">
+      <ng-container *ngIf="areVisibleCAR && support_mode === true">
         <ion-button shape="round" size="small" class="btn-add-msg-as-canned-response" ion-button fill="clear"
           (click)="presentCreateCannedResponseModal()" tooltip="{{addAsCannedResponseTooltipText}}"
           [options]="tooltipOptions" placement="bottom">

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

@@ -20,7 +20,7 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
   @Input() message: MessageModel;
   @Input() textColor: string;
   @Input() areVisibleCAR: boolean;
-  @Input() supportMode: boolean;
+  @Input() support_mode: boolean;
   @Output() onBeforeMessageRender = new EventEmitter();
   @Output() onAfterMessageRender = new EventEmitter();
   @Output() onImageRendered = new EventEmitter<boolean>()
@@ -89,7 +89,7 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
   ngOnChanges() {
     this.logger.log('BUBBLE-MSG Hello !!!! this.message ',  this.message)
     this.logger.log('BUBBLE-MSG ngOnChanges areVisibleCAR', this.areVisibleCAR)
-    this.logger.log('BUBBLE-MSG ngOnChanges supportMode', this.supportMode)
+    this.logger.log('BUBBLE-MSG ngOnChanges support_mode', this.support_mode)
     if (this.message && this.message.metadata && typeof this.message.metadata === 'object') {
       this.getMetadataSize(this.message.metadata)
     }

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

@@ -90,7 +90,7 @@
     <!-- <div *ngIf="getImageAvatar(conversation.sender)" #avatarImage class="avatar-profile" [style.background-image]="'url(' + getImageAvatar(conversation.sender) + ')'"></div> -->
   </ion-avatar>
   <ion-label>
-    <div class="conversation_with truncate" [innerHTML]="conversation.conversation_with_fullname"></div>
+    <div class="conversation_with truncate">{{conversation.conversation_with_fullname}}</div>
     <div class="conversation_message truncate-conv-msg" [ngClass]="{'truncate-on-desktop': !isApp}">
 
       <!-- -------------------------------------------------------------------------- -->

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

@@ -40,7 +40,7 @@
 
       <div class="start-buttons" style="position: absolute;display: flex; top: 2px;">
 
-        <ng-container *ngIf="areVisibleCAR && supportMode">
+        <ng-container *ngIf="areVisibleCAR && support_mode === true">
           <div class="canned-responses-btn-wpr" style="margin-left: -5px;"
             tooltip="{{translationMap?.get('CANNED_RESPONSES')}}" [options]="tooltipOptions" placement="top">
             <ion-button ion-button fill="clear" class="canned-responses-btn" (click)="openCannedResponses()"
@@ -110,7 +110,7 @@
 
 
 
-      <div class="text-message" [ngClass]="{'text-message-no-cr': areVisibleCAR === false || supportMode === false}">
+      <div class="text-message" [ngClass]="{'text-message-no-cr': areVisibleCAR === false || support_mode === false}">
         <ion-textarea id="ion-textarea" #messageTextArea #message_text_area #textArea rows="1"
           [placeholder]="TEXAREA_PLACEHOLDER" autosize="false" auto-grow="true" autofocus="true" [value]=""
           [(ngModel)]="messageString" (ionChange)="ionChange($event);" [disabled]="disableTextarea"

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

@@ -46,7 +46,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() tagsCannedFilter: any = [];
   @Input() tagsCannedCount: number;
   @Input() areVisibleCAR: boolean;
-  @Input() supportMode: boolean;
+  @Input() support_mode: boolean;
   @Input() events: Observable<void>;
   @Input() fileUploadAccept: string
   @Input() isOpenInfoConversation: boolean;
@@ -157,7 +157,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
     } else {
       this.IS_SUPPORT_GROUP_CONVERSATION = false
     }
-    this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges supportMode ', this.supportMode)
+    this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges support_mode ', this.support_mode)
     this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges disableTextarea ', this.disableTextarea)
     this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges DROP EVENT ", this.dropEvent);
     this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges tagsCannedFilter ", this.tagsCannedFilter);

package/src/app/directives/safe-html.pipe.ts

@@ -8,8 +8,8 @@ export class SafeHtmlPipe implements PipeTransform {
   
   transform(html) {
     // console.log('SafeHtmlPipe html ', html)
-    // return this.sanitizer.bypassSecurityTrustResourceUrl(html);
-    return this.sanitizer.bypassSecurityTrustHtml(html);
+    // return this.sanitizer.bypassSecurityTrustHtml(html);
+    return this.sanitizer.bypassSecurityTrustResourceUrl(html);
   
   }
 

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

@@ -122,9 +122,7 @@
                   [channelType]="channelType" 
                   [messages]="messages" 
                   [senderId]="loggedUser.uid"
-                  [baseLocation]="window?.location?.origin"
-                  [areVisibleCAR]="areVisibleCAR" 
-                  [supportMode]= "supportMode" 
+                  [baseLocation]="window?.location?.origin" 
                   [stylesMap]="styleMap"
                   (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
                   (onAfterMessageRender)="returnOnAfterMessageRender($event)"
@@ -178,7 +176,7 @@
             <app-message-text-area *ngIf="(openInfoConversation === false && isMobile === true) || (openInfoConversation === true && isMobile === false) || (openInfoConversation === false && isMobile === false)"
               [tagsCannedCount]="tagsCannedCount" 
               [areVisibleCAR]="areVisibleCAR" 
-              [supportMode]="supportMode"
+              [support_mode]="support_mode"
               [loggedUser]="loggedUser" 
               [conversationWith]="conversationWith" 
               [tagsCannedFilter]="tagsCannedFilter"

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;
-  supportMode: boolean;
+  support_mode: boolean;
   //SOUND
   setTimeoutSound: any;
   audio: any;
@@ -313,6 +313,7 @@ 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) => {
@@ -320,6 +321,7 @@ 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) {
         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)
@@ -331,8 +333,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
           // 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)
+        if (conv.uid === this.conversationWith) {
+          this.conversationAvatar = setConversationAvatar(conv.conversation_with, conv.conversation_with_fullname, conv.channel_type)
         }
 
       }
@@ -352,15 +354,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
   getOSCODE() {
-    this.supportMode = null
+    this.support_mode = null
     if (this.appConfigProvider.getConfig().supportMode === true || this.appConfigProvider.getConfig().supportMode === 'true') {
-      this.supportMode = true
+      this.support_mode = true
     } else if (this.appConfigProvider.getConfig().supportMode === false || this.appConfigProvider.getConfig().supportMode === 'false') {
-      this.supportMode = false
+      this.support_mode = false
     } else if (!this.appConfigProvider.getConfig().supportMode) {
-      this.supportMode = false
+      this.support_mode = false
     }
-    this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig supportMode', this.supportMode)
+    this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig support_mode', this.support_mode)
     this.public_Key = this.appConfigProvider.getConfig().t2y12PruGU9wUtEGzBJfolMIgK
     this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig public_Key', this.public_Key)
 
@@ -373,17 +375,26 @@ 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
@@ -1116,7 +1127,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       // ----------------------------------------------------------
       // DISPLAY CANNED RESPONSES if message.lastIndexOf("/")
       // ----------------------------------------------------------
-      if (this.areVisibleCAR && this.supportMode === true) {
+      if (this.areVisibleCAR && this.support_mode === true) {
         setTimeout(() => {
           if (this.conversationWith.startsWith('support-group')) {
             const pos = message.lastIndexOf('/')

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

@@ -43,17 +43,16 @@
           <ion-label part="message-text" class="waiting-for-network-msg"> Waiting for network</ion-label>
         </ion-item>
         <!-- supportMode && -->
-        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived' && supportMode" class="ion-no-padding open-iframe-item">
+        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived'" 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
@@ -67,15 +66,10 @@
         <!-- ---------------------------------- -->
         <!-- 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>
@@ -83,12 +77,9 @@
         <!-- ---------------------------------- -->
         <!-- 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>