@chat21/chat21-ionic 3.0.86 → 3.0.88-rc.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # chat21-ionic ver 3.0
 
+### 3.0.88-rc.1
+- bug-fixed: projectId is undefined
+- bug-fixed: typing subscription block UI on first conversation click
+
+### 3.0.87 in PROD
+- restored version 3.0.85
+
 ### 3.0.86 in PROD
 
 ### 3.0.86-rc.6

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.86",
+    "version": "3.0.88-rc.1",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

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

@@ -1,3 +1,4 @@
+import { DomSanitizer } from '@angular/platform-browser';
 import {
   Component,
   OnInit,
@@ -225,8 +226,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     public tiledeskService: TiledeskService,
     private networkService: NetworkService,
     private events: EventsService,
-    private renderer: Renderer2,
-    private el: ElementRef
+    private sanitizer: DomSanitizer
   ) {
     // Change list on date change
     this.route.paramMap.subscribe((params) => {
@@ -247,11 +247,11 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   ngOnInit() {
     this.logger.log('[CONVS-DETAIL] > ngOnInit - window.location: ', window.location);
 
-    this.getConversations();
-    this.watchToConnectionStatus();
-    this.getOSCODE();
-    this.getStoredProjectAndUserRole();
-    this.listenToDsbrdPostMsgs();
+    // this.getConversations();
+    // this.watchToConnectionStatus();
+    // this.getOSCODE();
+    // this.getStoredProjectAndUserRole();
+    // this.listenToDsbrdPostMsgs();
     
   }
 
@@ -517,11 +517,12 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.initSubscriptions()
       this.startConversation()
       this.getLeadDetail()
+      this.initializeTyping();
     }
     this.addEventsKeyboard()
     this.updateConversationBadge() // AGGIORNO STATO DELLA CONVERSAZIONE A 'LETTA' (is_new = false)
   
-    this.initializeTyping();
+    
   }
 
   _getProjectIdByConversationWith(conversationWith: string) {
@@ -686,18 +687,27 @@ 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)')
+      // 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)')
+       this.styleMap.set('themeColor', '#2a69c1')
+                    .set('bubbleReceivedBackground','#f0f2f7')
+                    .set('bubbleReceivedTextColor', '#06132b')
+                    .set('bubbleSentBackground', '#2a6ac1')
+                    .set('bubbleSentTextColor', '#ffffff')
+                    .set('buttonFontSize','15px')
+                    .set('buttonBackgroundColor', '#ffffff')
+                    .set('buttonTextColor', '#2a6ac1')
+                    .set('buttonHoverBackgroundColor', '#2a6ac1')
+                    .set('buttonHoverTextColor', ' #ffffff')
   
   }
   // -------------------------------------------------------------------------------------
@@ -793,6 +803,14 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         conversation.attributes.project_name = project['name']
       }
 
+    }else {
+      const projectId = this.getProjectIdSelectedConversation(this.conversationWith)
+      let project = localStorage.getItem(projectId)
+      if(project){
+        project = JSON.parse(project)
+        conversation.attributes.projectId = project['_id']
+        conversation.attributes.project_name = project['name']
+      }
     }
     return conversation
   }
@@ -1059,7 +1077,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     subscription = this.subscriptions.find((item) => item.key === subscriptionKey)
     if (!subscription) {
       subscription = this.conversationHandlerService.messageInfo.pipe(takeUntil(this.unsubscribe$)).subscribe((msg: any) => {
-        this.logger.log('[CONVS-DETAIL] subscribe to messageInfo - messageId ', msg)
+        this.logger.log('[CONVS-DETAIL] subscribe to messageInfo - messageId ', msg, this.conversation)
         if (msg) {
           that.updateLeadInfo(msg)
           // this.setHeaderContent()

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

@@ -104,44 +104,6 @@ export class FirebaseAuthService extends MessagingAuthService {
       });
 
 
-  }
-
-  checkInternetConnection() {
-    this.logger.log('[FIREBASEAuthSERVICE] - checkInternetConnection');
-    // let connectSubscription = this.network.onConnect().subscribe(() => {
-    //   this.logger.log('[FIREBASEAuthSERVICE] - network connected!');
-    //   // We just got a connection but we need to wait briefly
-    //    // before we determine the connection type. Might need to wait.
-    //   // prior to doing any api requests as well.
-    //   setTimeout(() => {
-    //     if (this.network.type === 'wifi') {
-    //       this.logger.log('[FIREBASEAuthSERVICE] - we got a wifi connection, woohoo!');
-    //     }
-    //   }, 3000);
-    // });
-
-
-    // this.connectionService.monitor().subscribe(isConnected => {
-    //   this.isConnected = isConnected;
-    //   this.logger.log('[FIREBASEAuthSERVICE] - checkInternetConnection isConnected', isConnected);
-    //   if (this.isConnected) {
-    //     this.status = "ONLINE";
-
-    //     // this.onAuthStateChanged();
-    //     firebase.auth().onAuthStateChanged(user => {
-    //       this.logger.log('[FIREBASEAuthSERVICE] checkInternetConnection onAuthStateChanged', user)
-    //     })
-    //   }
-    //   else {
-    //     this.status = "OFFLINE";
-    //     // this.onAuthStateChanged();
-    //     firebase.auth().onAuthStateChanged(user => {
-    //       this.logger.log('[FIREBASEAuthSERVICE] checkInternetConnection onAuthStateChanged', user)
-    //     })
-    //   }
-    // })
-
-
   }
 
   // createOnline$() {