@chat21/chat21-ionic 3.0.78-rc.2 → 3.0.78-rc.4

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

@@ -115,15 +115,12 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public openInfoConversation = false
   public isMobile = false
   public isLessThan991px = false // nk added
-  public isTyping = false
-  public nameUserTypingNow: string
 
   public heightMessageTextArea = ''
   public translationsMap: Map<string, string> = new Map()
   public translationsHeaderMap: Map<string, string> = new Map() 
   public translationsContentMap: Map<string, string> = new Map()
   public conversationAvatar: any
-  public membersConversation: any
   public member: UserModel
   public urlConversationSupportGroup: any
   public isFileSelected: boolean
@@ -169,6 +166,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public disableTextarea: boolean;
   appsidebarIsWide: boolean;
 
+  // ========== begin:: typying =======
+  public isTypings = false;
+  public isDirect = false;
+  public idUserTypingNow: string;
+  public nameUserTypingNow: string;
+  private setTimeoutWritingMessages;
+  membersConversation = ['SYSTEM'];
+  // ========== end:: typying =======
+
   /**
    * Constructor
    * @param route
@@ -237,21 +243,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   // -----------------------------------------------------------
   ngOnInit() {
     this.logger.log('[CONVS-DETAIL] > ngOnInit - window.location: ', window.location);
-    // this.logger.log('[CONVS-DETAIL] > ngOnInit - fileUploadAccept: ', this.appConfigProvider.getConfig().fileUploadAccept);
-    // const accept_files = this.appConfigProvider.getConfig().fileUploadAccept;
-    // this.logger.log('[CONVS-DETAIL] > ngOnInit - fileUploadAccept typeof accept_files ', typeof accept_files);
-    // const accept_files_array = accept_files.split(',')
-    // this.logger.log('[CONVS-DETAIL] > ngOnInit - fileUploadAccept accept_files_array ', accept_files_array);
-    // this.logger.log('[CONVS-DETAIL] > ngOnInit - fileUploadAccept accept_files_array typeof: ', typeof accept_files_array);
-
-    // accept_files_array.forEach(accept_file => {
-    //   this.logger.log('[CONVS-DETAIL] > ngOnInit - fileUploadAccept accept_file ', accept_file);
-    //   const accept_file_segment = accept_file.split('/')
-    //   this.logger.log('[CONVS-DETAIL] > ngOnInit - fileUploadAccept accept_file_segment ', accept_file_segment);
-    //   if (accept_file_segment[1] === '*') {
-
-    //   }
-    // });
+
     this.getConversations();
     this.watchToConnectionStatus();
     this.getOSCODE();
@@ -479,6 +471,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.loggedUser = this.tiledeskAuthService.getCurrentUser()
     this.logger.log('[CONVS-DETAIL] - initialize -> loggedUser: ', this.loggedUser)
     this.translations()
+    this.setStyleMap()
     // this.conversationSelected = localStorage.getItem('conversationSelected');
     this.showButtonToBottom = false
     this.showMessageWelcome = false
@@ -531,6 +524,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.addEventsKeyboard()
     this.startConversation()
     this.updateConversationBadge() // AGGIORNO STATO DELLA CONVERSAZIONE A 'LETTA' (is_new = false)
+  
+    this.initializeTyping();
   }
 
   _getProjectIdByConversationWith(conversationWith: string) {
@@ -589,7 +584,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       'LABEL_TO',
       'LABEL_LAST_ACCESS',
       'ARRAY_DAYS',
-      'LABEL_IS_WRITING',
+      
       'LABEL_INFO_ADVANCED',
       'ID_CONVERSATION',
       'UPLOAD_FILE_ERROR',
@@ -625,11 +620,13 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       'LABEL_TO',
       'LABEL_LAST_ACCESS',
       'ARRAY_DAYS',
+      'Resolve',
     ]
 
     const keysContentDetail = [
       'LABEL_OPEN_INFO_CONVERSATION',
-      'LABEL_CLOSE_GROUP'
+      'LABEL_CLOSE_GROUP',
+      'LABEL_IS_WRITING',
     ]
 
     this.translationsMap = this.customTranslateService.translateLanguage(keys)
@@ -662,6 +659,19 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     return this.customTranslateService.translateLanguage(keys)
   }
 
+  private setStyleMap(){
+      this.styleMap.set('themeColor', 'var(--basic-blue)')
+                    .set('bubbleReceivedBackground','var(--bck-msg-received)')
+                    .set('bubbleReceivedTextColor', 'var(--col-msg-received)')
+                    .set('bubbleSentBackground', 'var(--bck-msg-sent)')
+                    .set('bubbleSentTextColor', 'var(--col-msg-sent)')
+                    .set('buttonFontSize','var(--button-in-msg-font-size)')
+                    .set('buttonBackgroundColor', 'var(--buttonBackgroundColor)')
+                    .set('buttonTextColor', 'var(--buttonTextColor)')
+                    .set('buttonHoverBackgroundColor', 'var(--buttonHoverBackgroundColor)')
+                    .set('buttonHoverTextColor', 'var(--buttonHoverTextColor)')
+  
+  }
   // -------------------------------------------------------------------------------------
   // * retrieving the handler from chatManager
   // * if it DOESN'T EXIST I create a handler and connect and store it in the chatmanager
@@ -1000,6 +1010,22 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.subscriptions.push(subscribe)
     }
 
+    subscriptionKey = 'conversationTyping';
+    subscription = this.subscriptions.find(item => item.key === subscriptionKey);
+    if (!subscription) {
+      subscription =  this.typingService.BSIsTyping.pipe(takeUntil(this.unsubscribe$)).subscribe((data: any) => {
+        this.logger.debug('[CONVS-DETAIL] ***** BSIsTyping *****', data);
+        if (data) {
+          const isTypingUid = data.uid; //support-group-...
+          if (this.conversationWith === isTypingUid) {
+            that.subscribeTypings(data);
+          }
+        }
+      });
+      const subscribe = {key: subscriptionKey, value: subscription };
+      this.subscriptions.push(subscribe);
+    }
+
     // subscriptionKey = 'onGroupChange';
     // subscription = this.subscriptions.find(item => item.key === subscriptionKey);
     // if (!subscription) {
@@ -1684,6 +1710,63 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       return isAcceptFile
     }
   }
+
+
+  initializeTyping() {
+    this.logger.debug('[CONVS-DETAIL] membersconversation', this.membersConversation)
+    this.membersConversation.push(this.loggedUser.uid)
+    //this.setSubscriptions();
+    this.typingService.isTyping(this.conversationWith, this.loggedUser.uid, this.isDirect);
+    
+  }
+
+  /** */
+  subscribeTypings(data: any) {
+    const that = this;
+    try {
+      const key = data.uidUserTypingNow;
+      const waitTime = data.waitTime
+      this.nameUserTypingNow = null;
+      this.idUserTypingNow = null;
+
+      if (data.nameUserTypingNow) {
+        this.nameUserTypingNow = data.nameUserTypingNow;
+      }
+      if (data.uidUserTypingNow){
+        this.idUserTypingNow = data.uidUserTypingNow
+      }
+      this.logger.debug('[CONV-COMP] subscribeTypings data:', data);
+      const userTyping = this.membersConversation.includes(key);
+      if ( !userTyping && key) {
+        this.isTypings = true;
+        setTimeout(function () {
+          that.scrollBottom(0)
+        }, 0);
+        // clearTimeout(this.setTimeoutWritingMessages);
+        this.setTimeoutWritingMessages = setTimeout(() => {
+            that.isTypings = false;
+        }, waitTime);
+        // this.initiTimeout(waitTime)
+      }
+    } catch (error) {
+      this.logger.error('[CONV-COMP] error: ', error);
+    }
+
+  }
+
+  initiTimeout(waitTime){
+    const that = this;
+    this.setTimeoutWritingMessages = setTimeout(() => {
+      that.isTypings = false;
+    }, waitTime);
+  }
+
+  resetTimeout(){
+    this.isTypings = false
+    this.setTimeoutWritingMessages = null;
+    clearTimeout(this.setTimeoutWritingMessages)
+  }
+
   // -------------------------------------------------------------
   // DRAG FILE
   // -------------------------------------------------------------

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

@@ -502,22 +502,6 @@ export class ConversationListPage implements OnInit {
     this.logger.log('[CONVS-LIST-PAGE] - subscribeLoggedUserLogout uidConvSelected ',this.uidConvSelected)
   }
 
-  // ------------------------------------------------------------------------------------
-  // @ SUBSCRIBE TO CONVERSATION CHANGED  ??????????? SEEMS NOT USED ?????????????????
-  // ------------------------------------------------------------------------------------
-  conversationsChanged = (conversations: ConversationModel[]) => {
-    this.numberOpenConv = this.conversationsHandlerService.countIsNew()
-    this.logger.log('[CONVS-LIST-PAGE] - conversationsChanged - NUMB OF CONVERSATIONS: ',this.numberOpenConv)
-    // console.log('conversationsChanged »»»»»»»»» uidConvSelected', that.conversations[0], that.uidConvSelected);
-    if (this.uidConvSelected && !this.conversationSelected) {
-      const conversationSelected = this.conversations.find((item) => item.uid === this.uidConvSelected)
-      if (conversationSelected) {
-        this.conversationSelected = conversationSelected
-        this.setUidConvSelected(this.uidConvSelected)
-      }
-    }
-  }
-
   /**
    * ::: subscribeChangedConversationSelected :::
    * evento richiamato quando si seleziona un utente nell'elenco degli user
@@ -654,7 +638,7 @@ export class ConversationListPage implements OnInit {
    * ::: setUidConvSelected :::
    */
   setUidConvSelected(uidConvSelected: string, conversationType?: string) {
-    this.logger.log('[CONVS-LIST-PAGE] setuidCOnvSelected', uidConvSelected)
+    this.logger.log('[CONVS-LIST-PAGE] setuidCOnvSelected', uidConvSelected, conversationType)
     this.uidConvSelected = uidConvSelected
     // this.conversationsHandlerService.uidConvSelected = uidConvSelected;
     if (uidConvSelected) {

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

@@ -55,7 +55,7 @@
 
   <!-- fab placed to the (vertical) center and end -->
   <ion-fab vertical="end" horizontal="end" slot="fixed" class="sendButton">
-    <ion-fab-button color="primary" (click)="onSendMessage()">
+    <ion-fab-button (click)="onSendMessage()">
       <ion-icon name="send"></ion-icon>
     </ion-fab-button>
   </ion-fab>

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

@@ -11,6 +11,10 @@
     transform: translateX(-50%);
 }
 
+ion-fab-button{
+    --background: var(--basic-blue);
+}
+
 .previewSelected {
     width: 100%;
     height: auto;

package/src/chat21-core/providers/firebase/firebase-typing.service.ts

@@ -12,11 +12,11 @@ import 'firebase/database';
 import { TypingService } from '../abstract/typing.service';
 import { CustomLogger } from '../logger/customLogger';
 import { LoggerInstance } from '../logger/loggerInstance';
+import { TIME_TYPING_MESSAGE } from 'src/chat21-core/utils/constants';
 
 
 export class TypingModel {
  
-
   constructor(
       public uid: string,
       public timestamp: any,
@@ -35,14 +35,11 @@ export class FirebaseTypingService extends TypingService {
   BSIsTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
   BSSetTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
-  // public params
-  // public tenant: string;
-  private tenant: string;
-
-  // private params
   private urlNodeTypings: string;
   private setTimeoutWritingMessages: any;
+  private tenant: string;
   private logger: LoggerService = LoggerInstance.getInstance();
+  private ref: firebase.database.Query;
 
   constructor() {
     super();
@@ -64,10 +61,11 @@ export class FirebaseTypingService extends TypingService {
       urlTyping = this.urlNodeTypings + idCurrentUser + '/' + idConversation;
     }
     this.logger.debug('[FIREBASETypingSERVICE] urlTyping: ', urlTyping);
-    const ref = firebase.database().ref(urlTyping);
-    ref.on('child_changed', (childSnapshot) => {
+    this.ref = firebase.database().ref(urlTyping);
+    this.ref.on('child_changed', (childSnapshot) => {
       const precence: TypingModel = childSnapshot.val();
-      this.BSIsTyping.next({uid: idConversation, uidUserTypingNow: precence.uid, nameUserTypingNow: precence.name});
+      this.logger.debug('[FIREBASETypingSERVICE] child_changed: ', precence);
+      this.BSIsTyping.next({uid: idConversation, uidUserTypingNow: precence.uid, nameUserTypingNow: precence.name, waitTime: TIME_TYPING_MESSAGE});
     });
   }
 

package/src/chat21-core/utils/constants.ts

@@ -43,8 +43,12 @@ export const CHANNEL_TYPE_GROUP = 'group';
 // TYPES MESSAGES
 export const TYPE_MSG_TEXT = 'text';
 export const TYPE_MSG_IMAGE = 'image';
+export const TYPE_MSG_FILE = 'file';
+export const TYPE_MSG_BUTTON = 'button';
+
 export const MAX_WIDTH_IMAGES = 300;
 export const MIN_WIDTH_IMAGES = 130;
+export const TIME_TYPING_MESSAGE = 2000;
 export const TYPE_DIRECT = 'direct';
 export const TYPE_GROUP = 'group';
 export const SYSTEM = 'system';

package/src/chat21-core/utils/user-typing/user-typing.component.html

@@ -1,6 +1,9 @@
-<div class="tile-typing-now" [class.active]="isTyping">
-  <span *ngIf="nameUserTypingNow">
-    {{nameUserTypingNow}}
-  </span>
-  {{ translationMap?.get('LABEL_IS_WRITING') }}
+<div class="tile-typing-now" *ngIf="typingLocation === 'header'">
+  <span *ngIf="nameUserTypingNow">{{nameUserTypingNow}} </span>
+  {{ translationMap?.get('LABEL_WRITING') }}
+</div>
+<div class="spinner" *ngIf="typingLocation === 'content'">
+  <div class="bounce1"></div>
+  <div class="bounce2"></div>
+  <div class="bounce3"></div>
 </div>

package/src/chat21-core/utils/user-typing/user-typing.component.scss

@@ -1,10 +1,24 @@
+:root {
+    --themeColor: rgb(240, 242, 247);
+    --foregroundColor: black;
+}
+
+
 .tile-typing-now {
-    font-size: 12px;
-    background-color: #fff;
-    display: none;
-    &.active {
-        display: block;
-    }
+    position: absolute;
+    left: 40px;
+    right: 40px;
+    bottom: 3px;
+    width: auto;
+    text-align: center;
+    margin: 0px;
+    padding: 0px;
+    font-size: 1.1em;
+    color: var(--foregroundColor);
+    //display: none;
+    // &.active {
+    //     display: block;
+    // }
 }
 
 /* BEGIN LOADING */
@@ -14,49 +28,105 @@
     left: 0;
     top: 0;
     margin: 0;
-    &.active {
-        display: inline-block;
-        width: 30px;
-    }
+    // &.active {
+    //     display: inline-block;
+    //     width: 30px;
+    // }
 }
 #tile-spinner > div {
     width: 6px;
     height: 6px;
     background-color: var(--basic-blue);
 }
+// .spinner {
+//     margin: 100px auto 0;
+//     width: 70px;
+//     text-align: center;
+// }
+// .spinner > div {
+//     width: 18px;
+//     height: 18px;
+//     background-color: #333;
+//     border-radius: 100%;
+//     display: inline-block;
+//     -webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both;
+//     animation: sk-bouncedelay 1.4s infinite ease-in-out both;
+// }
+// .spinner .bounce1 {
+//     -webkit-animation-delay: -0.32s;
+//     animation-delay: -0.32s;
+// }
+// .spinner .bounce2 {
+//     -webkit-animation-delay: -0.16s;
+//     animation-delay: -0.16s;
+// }
+// @-webkit-keyframes sk-bouncedelay {
+//     0%, 80%, 100% { -webkit-transform: scale(0) }
+//     40% { -webkit-transform: scale(1.0) }
+// }
+// @keyframes sk-bouncedelay {
+//     0%, 80%, 100% { 
+//     -webkit-transform: scale(0);
+//     transform: scale(0);
+//     } 40% { 
+//         -webkit-transform: scale(1.0);
+//         transform: scale(1.0);
+//     }
+// }
+/* END LOADING */
+
+
+/* ******BOUNCE SPINNER START****** */
 .spinner {
-    margin: 100px auto 0;
+    margin: 15px 10px; //remove it if activate avatar image 
     width: 70px;
-    text-align: center;
+    // text-align: center;
+    min-height: 20px;
+    display: block;
 }
+
 .spinner > div {
-    width: 18px;
-    height: 18px;
+    width: 9px;
+    height: 9px;
     background-color: #333;
+
     border-radius: 100%;
     display: inline-block;
     -webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both;
     animation: sk-bouncedelay 1.4s infinite ease-in-out both;
 }
+
 .spinner .bounce1 {
     -webkit-animation-delay: -0.32s;
     animation-delay: -0.32s;
+    background-color: var(--themeColor)
 }
+
 .spinner .bounce2 {
     -webkit-animation-delay: -0.16s;
     animation-delay: -0.16s;
+    background-color: var(--themeColor);
+    opacity: 0.4
 }
+
+.spinner .bounce3 {
+    background-color: var(--themeColor);
+    opacity: 0.6
+}
+
+
 @-webkit-keyframes sk-bouncedelay {
     0%, 80%, 100% { -webkit-transform: scale(0) }
     40% { -webkit-transform: scale(1.0) }
 }
+
 @keyframes sk-bouncedelay {
     0%, 80%, 100% { 
-    -webkit-transform: scale(0);
-    transform: scale(0);
+        -webkit-transform: scale(0);
+        transform: scale(0);
     } 40% { 
         -webkit-transform: scale(1.0);
         transform: scale(1.0);
     }
 }
-/* END LOADING */
+/* ******BOUNCE SPINNER END****** */

package/src/chat21-core/utils/user-typing/user-typing.component.ts

@@ -1,113 +1,31 @@
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
-
-// services
-import { TypingService } from '../../providers/abstract/typing.service';
-
-// Logger
-import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
-import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { Component, OnInit, OnDestroy, Input, ElementRef } from '@angular/core';
 
 @Component({
-  selector: 'app-user-typing',
+  selector: 'user-typing',
   templateUrl: './user-typing.component.html',
   styleUrls: ['./user-typing.component.scss'],
 })
 export class UserTypingComponent implements OnInit, OnDestroy {
 
-  @Input() idConversation: string;
-  @Input() idCurrentUser: string;
-  @Input() isDirect: boolean;
+ // @Input() idConversation: string;
+  // @Input() idCurrentUser: string;
+  // @Input() isDirect: boolean;
+  @Input() typingLocation: string = 'content'
   @Input() translationMap: Map<string, string>;
-  @Input() color: string;
-  @Input() membersConversation: [string];
-
-  public status = '';
-  public isTyping = false;
-  public nameUserTypingNow: string;
-
-  private setTimeoutWritingMessages: any;
-  private subscriptions = [];
-
-  private logger: LoggerService = LoggerInstance.getInstance();
+  @Input() themeColor: string;
+  @Input() idUserTypingNow: string;
+  @Input() nameUserTypingNow: string;
+  // @Input() membersConversation: [string];
 
-  constructor(
-    public typingService: TypingService
-  ) { }
+  constructor(private elementRef: ElementRef) { }
 
   /** */
   ngOnInit() {
-    this.logger.log('[USER-TYPING-COMPONENT] - ngOnInit');
-    this.initialize();
+    this.elementRef.nativeElement.style.setProperty('--themeColor', this.themeColor);
   }
 
   /** */
   ngOnDestroy() {
-    this.logger.log('UserTypingComponent - ngOnDestroy');
-    // this.unsubescribeAll();
-  }
-
-  /** */
-  initialize() {
-    this.status = ''; // this.translationMap.get('LABEL_AVAILABLE');
-    this.logger.log('this.translationMap', this.translationMap);
-    this.logger.log('this.status', this.status);
-    this.setSubscriptions();
-    this.typingService.isTyping(this.idConversation, this.idCurrentUser, this.isDirect);
-  }
-
-  /** */
-  private setSubscriptions() {
-    const that = this;
-    const conversationSelected = this.subscriptions.find(item => item.key === this.idConversation);
-    if (!conversationSelected) {
-      const subscribeBSIsTyping =  this.typingService.BSIsTyping.subscribe((data: any) => {
-        this.logger.log('***** BSIsTyping *****', data);
-        if (data) {
-          const isTypingUid = data.uid;
-          if (this.idConversation === isTypingUid) {
-            that.subscribeTypings(data);
-          }
-        }
-      });
-      const subscribe = {key: this.idConversation, value: subscribeBSIsTyping };
-      this.subscriptions.push(subscribe);
-    }
-  }
-
-  /** */
-  subscribeTypings(data: any) {
-    const that = this;
-    try {
-      const key = data.uidUserTypingNow;
-      this.nameUserTypingNow = null;
-      if (data.nameUserTypingNow) {
-        this.nameUserTypingNow = data.nameUserTypingNow;
-      }
-      this.logger.log('subscribeTypings data:', data);
-      const userTyping = this.membersConversation.includes(key);
-      if ( !userTyping ) {
-        this.isTyping = true;
-        this.logger.log('child_changed key', key);
-        this.logger.log('child_changed name', this.nameUserTypingNow);
-        clearTimeout(this.setTimeoutWritingMessages);
-        this.setTimeoutWritingMessages = setTimeout(() => {
-            that.isTyping = false;
-        }, 2000);
-      }
-    } catch (error) {
-      this.logger.log('error: ', error);
-    }
-  }
-
-
-  /** */
-  private unsubescribeAll() {
-    this.logger.log('UserTypingComponent unsubescribeAll: ', this.subscriptions);
-    this.subscriptions.forEach((subscription: any) => {
-      this.logger.log('unsubescribe: ', subscription);
-      subscription.unsubescribe();
-    });
-    this.subscriptions = [];
   }