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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # chat21-ionic ver 3.0
 
+### 3.0.88-rc.2
+- added: enable email only if active by env parameter
+- added: emailSection env variable
+- added: CHAT_STORAGE_PREFIX, EMAIL_SECTION env parameters
+
+### 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.2",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

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

@@ -8,7 +8,7 @@
       </ion-button>
     </div>
     <!-- EMAIL-OPTION -->
-    <div class="section-option" id="email"  tooltip="{{translationMap?.get('LABEL_EMAIL')}}" [options]="tooltipOptions" placement="top">
+    <div *ngIf="emailSection" class="section-option" id="email"  tooltip="{{translationMap?.get('LABEL_EMAIL')}}" [options]="tooltipOptions" placement="top">
       <ion-button fill="clear" [class.active]="section==='email'" (click)="onOpenSection('email')" [disabled]="channelType === 'direct'">
         <ion-icon name="mail-open"></ion-icon>
         {{translationMap.get('LABEL_EMAIL')}}

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

@@ -49,7 +49,8 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() areVisibleCAR: boolean;
   @Input() supportMode: boolean;
   @Input() leadInfo: {lead_id: string, hasEmail: boolean, email: string, projectId: string};
-  @Input() fileUploadAccept: string
+  @Input() fileUploadAccept: string;
+  @Input() emailSection: boolean;
   @Input() isOpenInfoConversation: boolean;
   @Input() translationMap: Map<string, string>;
   @Input() dropEvent: any;

package/src/app/components/navbar/navbar.component.html

@@ -8,7 +8,7 @@
         <ng-container *ngIf="project">
           <button class="btn simulate-visitor-btn btn-success-no-boxshadow " (click)="testWidgetPage()">
             <i class="material-icons" style="padding-top: 0px;font-size: 24px;">play_arrow</i>
-            {{translationsMap.get('NAVBAR.SIMULATE_VISITOR')}}
+            {{translationsMap?.get('NAVBAR.SIMULATE_VISITOR')}}
           </button>
         </ng-container>
 

package/src/app/components/navbar/navbar.component.ts

@@ -42,9 +42,9 @@ export class NavbarComponent implements OnInit {
   ) { }
 
   ngOnInit() {
+    this.initTranslations();
     this.listenToUserGoOnline();
     this.getStoredProjectAndUserRole();
-    this.initTranslations();
     this.getOSCODE();
   }
 

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

@@ -231,6 +231,7 @@
               [supportMode]="supportMode"
               [leadInfo]="leadInfo"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
+              [emailSection]="appConfigProvider.getConfig().emailSection"
               [isOpenInfoConversation]="openInfoConversation" 
               [translationMap]="translationsMap"
               [dropEvent]="dropEvent"

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) => {
@@ -251,8 +251,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.watchToConnectionStatus();
     this.getOSCODE();
     this.getStoredProjectAndUserRole();
-    this.listenToDsbrdPostMsgs();
-    
+    this.listenToDsbrdPostMsgs();    
   }
 
   listenToDsbrdPostMsgs() {
@@ -517,11 +516,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 +686,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 +802,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
   }
@@ -1003,7 +1020,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         attributes,
       )
 
-      if(!this.leadIsOnline && this.leadInfo && this.leadInfo.email){
+      let emailEnabled = this.appConfigProvider.getConfig().emailSection
+      if(emailEnabled && !this.leadIsOnline && this.leadInfo && this.leadInfo.email){
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
         this.sendEmail(msg)
       }
@@ -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/chat-config-mqtt-localhost.json

@@ -30,6 +30,7 @@
     "supportMode": true,
     "archivedButton": true,
     "writeToButton": true,
+    "emailSection":true,
     "wsUrl": "ws://localhost:8081/ws/",
     "showInfoMessage":"MEMBER_JOINED_GROUP,TOUCHING_OPERATOR"
 }

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

@@ -31,5 +31,6 @@
     "supportMode": true,
     "archivedButton": true,
     "writeToButton": true,
+    "emailSection":true,
     "wsUrl":"wss://console.native.tiledesk.com/mqws/ws"
 }

package/src/chat-config-pre.json

@@ -30,5 +30,6 @@
     "supportMode": true,
     "archivedButton": true,
     "writeToButton": true,
+    "emailSection":true,
     "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/"
 }

package/src/chat-config-template.json

@@ -31,5 +31,7 @@
     "dashboardUrl": "${DASHBOARD_URL}",
     "testsiteBaseUrl":"${WIDGET_TEST_LOCATION}",
     "wsUrl": "${WS_URL}",
-    "wsUrlRel": "${WS_URL_RELATIVE}"
+    "wsUrlRel": "${WS_URL_RELATIVE}",
+    "storage_prefix": "${CHAT_STORAGE_PREFIX}",
+    "emailSection": "${EMAIL_SECTION}"
 }

package/src/chat-config.json

@@ -29,7 +29,9 @@
     "testsiteBaseUrl": "https://widget-pre.tiledesk.com/v5/assets/twp/index.html",
     "wsUrl": "ws://localhost:3000/",
     "wsUrlRel": "${WS_URL_RELATIVE}",
+    "storage_prefix": "chat_sv5",
     "supportMode": false,
     "writeToButton": false,
-    "archivedButton": false
+    "archivedButton": false,
+    "emailSection": true
 }

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$() {