@chat21/chat21-ionic 3.0.82-rc.7 → 3.0.82

package/src/chat-config-mqtt-localhost.json

@@ -21,9 +21,9 @@
         "APIendpoint": "http://localhost:8004/api",
         "_log": true
     },
-    "apiUrl": "http://localhost:8081/api/",
+    "apiUrl": "http://localhost:3000/",
     "baseImageUrl": "http://localhost:3000/",
-    "dashboardUrl": "http://localhost:8081/dashboard/",
+    "dashboardUrl": "http://localhost:8081/",
     "testsiteBaseUrl": "http://localhost:8081/widget/assets/twp/index.html",
     "logLevel": "DEBUG",
     "authPersistence": "LOCAL",

package/src/chat-config-native-mqtt.json

@@ -28,8 +28,5 @@
     "dashboardUrl": "https://console.native.tiledesk.com/dashboard/",
     "testsiteBaseUrl":"https://console.native.tiledesk.com/widget/assets/twp/index.html",
     "authPersistence": "LOCAL",
-    "supportMode": true,
-    "archivedButton": true,
-    "writeToButton": true,
     "wsUrl":"wss://console.native.tiledesk.com/mqws/ws"
 }

package/src/chat21-core/models/conversation.ts

@@ -16,6 +16,7 @@ export class ConversationModel {
     public sender_fullname: string,
     public status: string,
     public timestamp: number,
+    public time_last_message: string,
     // public selected: boolean,
     public color: string,
     public avatar: string,

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,11 +35,14 @@ 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();
@@ -61,11 +64,10 @@ export class FirebaseTypingService extends TypingService {
       urlTyping = this.urlNodeTypings + idCurrentUser + '/' + idConversation;
     }
     this.logger.debug('[FIREBASETypingSERVICE] urlTyping: ', urlTyping);
-    this.ref = firebase.database().ref(urlTyping);
-    this.ref.on('child_changed', (childSnapshot) => {
+    const ref = firebase.database().ref(urlTyping);
+    ref.on('child_changed', (childSnapshot) => {
       const precence: TypingModel = childSnapshot.val();
-      this.logger.debug('[FIREBASETypingSERVICE] child_changed: ', precence);
-      this.BSIsTyping.next({uid: idConversation, uidUserTypingNow: precence.uid, nameUserTypingNow: precence.name, waitTime: TIME_TYPING_MESSAGE});
+      this.BSIsTyping.next({uid: idConversation, uidUserTypingNow: precence.uid, nameUserTypingNow: precence.name});
     });
   }
 

package/src/chat21-core/providers/mqtt/mqtt-auth-service.ts

@@ -64,14 +64,15 @@ export class MQTTAuthService extends MessagingAuthService {
 
   // logout(callback) {
   logout(): Promise<boolean> {
-    this.logger.debug("[MQTTAuthService] logout: closing mqtt connection...");
+    this.logger.log("[MQTTAuthService] logout: closing mqtt connection...");
     return new Promise((resolve, reject) => {
       this.chat21Service.chatClient.close(() => {
+        console.log("[MQTTAuthService] logout: mqtt connection closed. OK");
         // remove
         // this.appStorage.removeItem('tiledeskToken');
         // this.appStorage.removeItem('currentUser');
         this.currentUser = null;
-        this.logger.debug("[MQTTAuthService] logout: mqtt connection closed. user removed. OK");
+        console.log("[MQTTAuthService] logout: user removed");
         this.BSSignOut.next(true);
         this.BSAuthStateChanged.next('offline');
         resolve(true)
@@ -93,7 +94,7 @@ z
 
   /** */
   getToken(): string {
-    this.logger.debug('[MQTTAuthService]::getToken');
+    this.logger.log('[MQTTAuthService]::getToken');
     return this.token;
   }
 
@@ -254,19 +255,19 @@ z
     // const that = this;
     this.http.post(this.URL_TILEDESK_CREATE_CUSTOM_TOKEN, postData, { headers, responseType})
     .subscribe(data =>  {
-      this.logger.debug("[MQTTAuthService] connectWithCustomToken: **** data", data)
+      this.logger.log("[MQTTAuthService] connectWithCustomToken: **** data", data)
       const result = JSON.parse(data);
       this.connectMQTT(result);
     }, error => {
-      this.logger.error(error);
+      this.logger.log(error);
     });
   }
 
   connectMQTT(credentials: any): any {
-    this.logger.debug('[MQTTAuthService] connectMQTT: **** credentials:', credentials);
+    this.logger.log('[MQTTAuthService] connectMQTT: **** credentials:', credentials);
     const userid = credentials.userid;
     this.chat21Service.chatClient.connect(userid, credentials.token, () => {
-      this.logger.debug('[MQTTAuthService] connectMQTT: Chat connected.');
+      this.logger.log('[MQTTAuthService] connectMQTT: Chat connected.');
       this.BSAuthStateChanged.next('online');
     });
   }

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

@@ -43,12 +43,8 @@ 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';
@@ -73,8 +69,7 @@ export const TOUCHING_OPERATOR = "TOUCHING_OPERATOR";
 // URLS
 // export const URL_SOUND = 'assets/sounds/pling.mp3';
 export const URL_SOUND_LIST_CONVERSATION = '/assets/sounds/pling.mp3';
-export const URL_SOUND_CONVERSATION_ADDED = '/assets/sounds/wheep-wheep.mp3';
-export const URL_SOUND_CONVERSATION_UNASSIGNED = '/assets/sounds/interface-start.mp3'
+export const URL_SOUND_CONVERSATION_DETAIL = '/assets/sounds/justsaying.mp3';
 // export const CHAT_SEND_BY_EMAIL_LINK =
 // 'mailto:?subject=Transcript Chat Conversation&body=Salve,%0D%0A%0D%0Adi
 // seguito potrà scaricare il transcript della conversazione intercorsa con il nostro servizio di

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

@@ -1,9 +1,6 @@
-<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 class="tile-typing-now" [class.active]="isTyping">
+  <span *ngIf="nameUserTypingNow">
+    {{nameUserTypingNow}}
+  </span>
+  {{ translationMap?.get('LABEL_IS_WRITING') }}
 </div>

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

@@ -1,24 +1,10 @@
-:root {
-    --themeColor: rgb(240, 242, 247);
-    --foregroundColor: black;
-}
-
-
 .tile-typing-now {
-    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;
-    // }
+    font-size: 12px;
+    background-color: #fff;
+    display: none;
+    &.active {
+        display: block;
+    }
 }
 
 /* BEGIN LOADING */
@@ -28,105 +14,49 @@
     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: 15px 10px; //remove it if activate avatar image 
+    margin: 100px auto 0;
     width: 70px;
-    // text-align: center;
-    min-height: 20px;
-    display: block;
+    text-align: center;
 }
-
 .spinner > div {
-    width: 9px;
-    height: 9px;
+    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;
-    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);
     }
 }
-/* ******BOUNCE SPINNER END****** */
+/* END LOADING */

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

@@ -1,31 +1,113 @@
-import { Component, OnInit, OnDestroy, Input, ElementRef } from '@angular/core';
+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';
 
 @Component({
-  selector: 'user-typing',
+  selector: 'app-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() typingLocation: string = 'content'
+  @Input() idConversation: string;
+  @Input() idCurrentUser: string;
+  @Input() isDirect: boolean;
   @Input() translationMap: Map<string, string>;
-  @Input() themeColor: string;
-  @Input() idUserTypingNow: string;
-  @Input() nameUserTypingNow: string;
-  // @Input() membersConversation: [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();
 
-  constructor(private elementRef: ElementRef) { }
+  constructor(
+    public typingService: TypingService
+  ) { }
 
   /** */
   ngOnInit() {
-    this.elementRef.nativeElement.style.setProperty('--themeColor', this.themeColor);
+    this.logger.log('[USER-TYPING-COMPONENT] - ngOnInit');
+    this.initialize();
   }
 
   /** */
   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 = [];
   }
 
 

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

@@ -590,10 +590,8 @@ export function setConversationAvatar(
   conversationWith: string,
   conversationWithFullname: string,
   conversationChannelType: string,
-  projectId?: string,
-  project_name?: string,
   width?: string,
-  height?: string,
+  height?: string
 ): any {
   const conversationWidth = (width) ? width : '40px';
   const conversationHeight = (height) ? height : '40px';
@@ -604,8 +602,6 @@ export function setConversationAvatar(
     channelType: conversationChannelType,
     avatar: avatarPlaceholder(conversationWithFullname),
     color: getColorBck(conversationWithFullname),
-    projectId: projectId,
-    project_name: project_name,
     width: conversationWidth,
     height: conversationHeight
   };
@@ -698,35 +694,15 @@ export function isURL(str: string) {
   }
 }
 
-export function convertColorToRGBA(color, opacity) {
-  let result = color;
-  // console.log('convertColorToRGBA' + color, opacity);
-  if ( color.indexOf('#') > -1 ) {
-    color = color.replace('#', '');
-    const r = parseInt(color.substring(0, 2), 16);
-    const g = parseInt(color.substring(2, 4), 16);
-    const b = parseInt(color.substring(4, 6), 16);
-    result = 'rgba(' + r + ',' + g + ',' + b + ',' + opacity / 100 + ')';
-  } else if ( color.indexOf('rgba') > -1 ) {
-    const rgb = color.split(',');
-    const r = rgb[0].substring(5);
-    const g = rgb[1];
-    const b = rgb[2];
-    // const b = rgb[2].substring(1, rgb[2].length - 1);
-    result = 'rgba(' + r + ',' + g + ',' + b + ',' + opacity / 100 + ')';
-  } else if ( color.indexOf('rgb(') > -1 ) {
-    const rgb = color.split(',');
-    // console.log(rgb);
-    const r = rgb[0].substring(4);
-    const g = rgb[1];
-    const b = rgb[2].substring(0, rgb[2].length - 1);
-    // console.log(b);
-    // console.log(rgb[2].length);
-    result = 'rgba(' + r + ',' + g + ',' + b + ',' + opacity / 100 + ')';
-  }
-  // console.log('convertColorToRGBA' + color + result);
-  return result;
-}
+// export function isHostname() {
+
+
+//   if (environment.supportMode === true) {
+
+//     return true
+//   }
+//   return false
+// }
 
 export function getParameterByName(name: string) {
   var url = window.location.href;
@@ -834,10 +810,6 @@ export function redirect2(router, IDConv, conversationSelected) {
 /** */
 export function checkPlatformIsMobile() {
   // console.log('UTILS - checkPlatformIsMobile:: ', window.innerWidth);
-  // if (/Android|iPhone/i.test(window.navigator.userAgent)) {
-  //   return true
-  // }
-  // return false
   if (window.innerWidth < 768) {
     return true;
   }