@chat21/chat21-ionic 3.0.64-rc1 → 3.0.64

package/src/chat-config-pre.json

@@ -3,14 +3,7 @@
     "chatEngine": "firebase",
     "uploadEngine": "firebase",
     "pushEngine": "firebase",
-    "logLevel": "info",
-    "fileUploadAccept":"*/*",
-    "authPersistence": "LOCAL",
-    "supportMode": true,
-    "writeToButton": true,
-    "archivedButton": true,
     "firebaseConfig": {
-        "tenant": "tilechat",
         "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
         "authDomain": "chat21-pre-01.firebaseapp.com",
         "databaseURL": "https://chat21-pre-01.firebaseio.com",
@@ -19,17 +12,20 @@
         "messagingSenderId": "269505353043",
         "appId": "1:269505353043:web:b82af070572669e3707da6",
         "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
-        "vapidKey": "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c"
+        "tenant":"tilechat"
     },
     "chat21Config": {
         "appId": "tilechat",
         "MQTTendpoint": "ws://99.80.197.164:15675/ws",
-        "APIendpoint": "http://99.80.197.164:8004/api",
-        "loginServiceEndpoint": "http://99.80.197.164:/tilechat/signin"
+        "APIendpoint": "http://99.80.197.164:8004/api"
     },
     "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
-    "dashboardUrl": "/dashboard/",
+    "dashboardUrl": "https://support-pre.tiledesk.com/dashboard/",
+    "logLevel": "DEBUG",
+    "authPersistence": "LOCAL",
+    "supportMode": true,
+    "archivedButton": true,
+    "writeToButton": true,
     "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/"
-}
-
+}

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

@@ -15,7 +15,7 @@ export class ConversationModel {
     public senderAuthInfo: any,
     public sender_fullname: string,
     public status: string,
-    public timestamp: number,
+    public timestamp: string,
     public time_last_message: string,
     public selected: boolean,
     public color: string,

package/src/chat21-core/providers/abstract/conversations-handler.service.ts

@@ -29,7 +29,7 @@ export abstract class ConversationsHandlerService {
   // functions
   abstract initialize(tenant: string, userId: string, translationMap: Map<string, string>): void;
   // abstract connect(): void;
-  abstract subscribeToConversations(lastConversatioTimestamp: number, callback: any): void;
+  abstract subscribeToConversations(callback: any): void;
   abstract countIsNew(): number;
   abstract setConversationRead(conversationId: string): void;
   abstract dispose(): void;

package/src/chat21-core/providers/firebase/firebase-conversations-handler.ts

@@ -114,62 +114,21 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     // ---------------------------------------------------------------------------------
     // New connect - renamed subscribeToConversation
     //----------------------------------------------------------------------------------
-    subscribeToConversations(lastConversationTimestamp: number, callback) {
+    subscribeToConversations(callback) {
         const that = this;
         const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId);
         this.logger.debug('[FIREBASEConversationsHandlerSERVICE] SubscribeToConversations conversations::ACTIVE urlNodeFirebase', urlNodeFirebase)
         this.ref = firebase.database().ref(urlNodeFirebase).orderByChild('timestamp').limitToLast(200);
-        
-        // this.ref.once('value').then(snapshot => {
-        //     snapshot.forEach(childSnapshot => {
-        //         const childData: ConversationModel = childSnapshot.val();
-        //         childData.uid = childSnapshot.key
-        //         that.added(childData)
-        //         lastConversationTimestamp = childData.timestamp
-        //     });
-            
-        //     callback(that.conversations)
-        //     return lastConversationTimestamp
-        // }).then((timestamp)=> {
-        //     console.log('timestampppppp',timestamp)
-        //     this.ref.startAt(timestamp).on('child_changed', (childSnapshot) => {
-        //         const conv: ConversationModel = childSnapshot.val();
-        //         conv.uid = childSnapshot.key
-        //         that.changed(conv);
-        //     });
-        //     this.ref.startAt(timestamp).on('child_removed', (childSnapshot) => {
-        //         const conv: ConversationModel = childSnapshot.val();
-        //         conv.uid = childSnapshot.key
-        //         that.removed(conv);
-        //     });
-        //     this.ref.startAt(timestamp).on('child_added', (childSnapshot) => {
-        //         const conv: ConversationModel = childSnapshot.val();
-        //         console.log('addedddd', conv)
-        //         conv.uid = childSnapshot.key
-        //         that.added(conv);
-        //     });
-        // });
-        // this.ref.on('value', (snaps) => {
-        //     if(snaps){
-        //         console.log('convvvvvv', snaps.val(), snaps.val().length)
-        //         for(let item=0; item<snaps.val().length; item++){
-        //             that.added(snaps.val()[item])
-        //         }
-        //         callback(this.conversations)
-        //     }
-        // })
-        this.ref.startAt(lastConversationTimestamp).on('child_changed', (childSnapshot) => {
+        this.ref.on('child_changed', (childSnapshot) => {
             that.changed(childSnapshot);
         });
-        this.ref.startAt(lastConversationTimestamp).on('child_removed', (childSnapshot) => {
+        this.ref.on('child_removed', (childSnapshot) => {
             that.removed(childSnapshot);
         });
-        this.ref.startAt(lastConversationTimestamp).on('child_added', (childSnapshot) => {
+        this.ref.on('child_added', (childSnapshot) => {
             that.added(childSnapshot);
         });
 
-        
-
         setTimeout(() => {
             callback()
         }, 2000);
@@ -380,7 +339,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         childData.uid = childSnapshot.key;
         const conversation = this.completeConversation(childData);
         if (this.isValidConversation(conversation)) {
-            this.setClosingConversation(conversation.uid, false);
+            this.setClosingConversation(childSnapshot.key, false);
             const index = searchIndexInArrayForUid(this.conversations, conversation.uid);
             if (index > -1) {
                 this.conversations.splice(index, 1, conversation);
@@ -532,6 +491,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
                 this.translateInfoSupportMessages(conv);
             }
         }
+
         // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the convesations list
         // conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
         conv.conversation_with = conversation_with;
@@ -543,7 +503,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         // getImageUrlThumbFromFirebasestorage(conversation_with, this.FIREBASESTORAGE_BASE_URL_IMAGE, this.urlStorageBucket);
         return conv;
     }
-
+    
 
     /**BUG-FIX: on Conversation-list, when conversation start, it continuosly change the sender_fullname info from Guest to others name */
     private changeSenderFullName(conversation: ConversationModel): string {
@@ -560,6 +520,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         return conversation_with_fullname
     }
 
+
     translateInfoSupportMessages(conv) {
         const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
         // console.log('[FIREBASEConversationsHandlerSERVICE] INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU', INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU) 

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

@@ -85,8 +85,9 @@ export function messageType(msgType: string, message: any) {
   }
 }
 
-export function isEmojii(message: any){
-  
+export function isEmojii(message: any) {
+  // https://localcoder.org/javascript-detect-if-a-string-contains-only-unicode-emojis
+
   // let emoji = '';
   // try {
   //   emoji = message.trim(); // .charAt(0);

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

@@ -1 +0,0 @@
-<div id="htmlCode" #htmlCode [innerHTML]="htmlText | safeHtml"></div>

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

@@ -1,79 +0,0 @@
-// @import '../../../../sass/variables';
-
-:root {
-    --themeColor: #62a8ea;
-    --foregroundColor: #ffffff;
-    --buttonFontSize: 12px;
-}
-
-
-::ng-deep {
-
-    .button-html {
-        padding: 8px 16px!important;
-        position: relative;
-        max-width: 300px;
-        min-width: inherit;
-        cursor: pointer !important;
-        border: 1px solid #62a8ea;
-        border-radius: 20px;
-        margin: 3px;
-        background: transparent;
-        overflow: hidden;
-        font-family: 'Muli', sans-serif !important;
-        font-size: 12px !important;
-        -o-text-overflow: ellipsis;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        letter-spacing: -0.24px;
-        -webkit-font-smoothing: antialiased;
-        color: #62a8ea;
-        line-height: 16px;
-
-    }
-
-    .url {
-        transition: background-color .6s ease;
-        .icon-button-action {
-            position: absolute;
-            top: -1px;
-            right: 1px;
-            svg {
-                fill: #62a8ea;
-            }
-        }
-        .icon-button-action-self{
-            position: absolute;
-            right: 1px;
-            svg {
-                fill: #62a8ea;
-            }
-        }
-        &:focus,
-        &:hover {
-            color: white;
-            background:  #62a8ea;
-            .icon-button-action, .icon-button-action-self {
-                svg {
-                    fill: white;
-                }
-            }
-        }
-        &:active{
-            font-size: 20px;
-        }
-    }
-    
-    .text-html{
-        font-size: 1.4em;
-        margin: 0;
-        padding: 8px;
-        font-style: normal;
-        letter-spacing: normal;
-        font-stretch: normal;
-        font-variant: normal;
-        font-weight: 300;
-        overflow: hidden;
-    }
-
-}

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

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HtmlComponent } from './html.component';
-
-describe('HtmlComponent', () => {
-  let component: HtmlComponent;
-  let fixture: ComponentFixture<HtmlComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ HtmlComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HtmlComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -1,33 +0,0 @@
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
-import { Component, ElementRef, Input, OnInit, SimpleChange, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core';
-
-@Component({
-  selector: 'chat-html',
-  templateUrl: './html.component.html',
-  styleUrls: ['./html.component.scss']
-})
-export class HtmlComponent implements OnInit {
-
-  @Input() htmlText: string;
-  @Input() fontSize: string;
-  @Input() themeColor: string;
-  @Input() foregroundColor: string;
-
-  @ViewChild('htmlCode', {static: true}) container;
-  
-  constructor(private elementRef: ElementRef) { }
-
-  ngOnInit(){
-
-  }
-
-  ngOnChanges(changes: SimpleChanges){
-    //decomment if element should have same color of themeColor and fregroundColor
-    if(this.fontSize) this.elementRef.nativeElement.style.setProperty('--buttonFontSize', this.fontSize);
-    if(this.themeColor) this.elementRef.nativeElement.style.setProperty('--themeColor', this.themeColor);
-    if(this.foregroundColor) this.elementRef.nativeElement.style.setProperty('--foregroundColor', this.foregroundColor);
-  }
-
-  
-
-}

package/src/chat-config-pre-test.json

@@ -1,37 +0,0 @@
-{
-    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T-PAY:T-ANA:T-ACT:T-APP:T",
-    "chatEngine": "firebase",
-    "uploadEngine": "firebase",
-    "pushEngine": "firebase",
-    "logLevel": "info",
-    "fileUploadAccept":"*/*",
-    "authPersistence": "LOCAL",
-    "supportMode": true,
-    "writeToButton": true,
-    "archivedButton": true,
-    "firebaseConfig": {
-        "tenant": "tilechat",
-        "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
-        "authDomain": "chat21-pre-01.firebaseapp.com",
-        "databaseURL": "https://chat21-pre-01.firebaseio.com",
-        "projectId": "chat21-pre-01",
-        "storageBucket": "chat21-pre-01.appspot.com",
-        "messagingSenderId": "269505353043",
-        "appId": "1:269505353043:web:b82af070572669e3707da6",
-        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
-        "vapidKey": "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c"
-    },
-    "chat21Config": {
-        "appId": "tilechat",
-        "MQTTendpoint": "ws://99.80.197.164:15675/ws",
-        "APIendpoint": "http://99.80.197.164:8004/api",
-        "loginServiceEndpoint": "http://99.80.197.164:/tilechat/signin"
-    },
-    "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
-    "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
-    "dashboardUrl": "/dashboard/",
-    "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/",
-    "storage_prefix": "chat_sv5"
-}
-
-