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

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # chat21-ionic ver 3.0
 
+### 3.0.86 in PROD
+
+### 3.0.86-rc.2
+- bug-fixed: undefined reading 'channel' while render email icon in ion-conversation-detail component
+
 ### 3.0.86-rc.1
 - added: send-email modal on Email footer option click
 - added: handle window['analytics'] error

package/package.json

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

package/src/app/app.component.ts

@@ -1,6 +1,6 @@
 
 import { TYPE_DIRECT, TYPE_SUPPORT_GROUP, URL_SOUND_CONVERSATION_UNASSIGNED } from 'src/chat21-core/utils/constants';
-import { tranlatedLanguage, URL_SOUND_CONVERSATION_ADDED, URL_SOUND_LIST_CONVERSATION } from './../chat21-core/utils/constants';
+import { tranlatedLanguage, URL_SOUND_CONVERSATION_ADDED, URL_SOUND_LIST_CONVERSATION } from 'src/chat21-core/utils/constants';
 import { ArchivedConversationsHandlerService } from 'src/chat21-core/providers/abstract/archivedconversations-handler.service';
 import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
@@ -39,8 +39,8 @@ import { LoginPage } from './pages/authentication/login/login.page';
 import { ConversationListPage } from './pages/conversations-list/conversations-list.page';
 
 // utils
-import { checkPlatformIsMobile, isGroup, getParameterByName, searchIndexInArrayForUid, compareValues, stripTags } from '../chat21-core/utils/utils';
-import { STORAGE_PREFIX, PLATFORM_MOBILE, PLATFORM_DESKTOP, CHAT_ENGINE_FIREBASE, AUTH_STATE_OFFLINE, AUTH_STATE_ONLINE } from '../chat21-core/utils/constants';
+import { checkPlatformIsMobile, isGroup, getParameterByName, searchIndexInArrayForUid, compareValues, stripTags } from 'src/chat21-core/utils/utils';
+import { STORAGE_PREFIX, PLATFORM_MOBILE, PLATFORM_DESKTOP, CHAT_ENGINE_FIREBASE, AUTH_STATE_OFFLINE, AUTH_STATE_ONLINE } from 'src/chat21-core/utils/constants';
 import { environment } from '../environments/environment';
 import { UserModel } from '../chat21-core/models/user';
 import { ConversationModel } from 'src/chat21-core/models/conversation';

package/src/app/chatlib/conversation-detail/conversation-content/conversation-content.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild, SimpleChanges } from '@angular/core';
-import { MessageModel } from '../../../../chat21-core/models/message';
-import { isPopupUrl, popupUrl, stripTags } from '../../../../chat21-core/utils/utils';
-import { MSG_STATUS_SENT, MSG_STATUS_RETURN_RECEIPT, MSG_STATUS_SENT_SERVER, MAX_WIDTH_IMAGES, MESSAGE_TYPE_INFO, MESSAGE_TYPE_MINE, MESSAGE_TYPE_OTHERS } from '../../../../chat21-core/utils/constants';
+import { MessageModel } from 'src/chat21-core/models/message';
+import { isPopupUrl, popupUrl, stripTags } from 'src/chat21-core/utils/utils';
+import { MSG_STATUS_SENT, MSG_STATUS_RETURN_RECEIPT, MSG_STATUS_SENT_SERVER, MAX_WIDTH_IMAGES, MESSAGE_TYPE_INFO, MESSAGE_TYPE_MINE, MESSAGE_TYPE_OTHERS } from 'src/chat21-core/utils/constants';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { UploadService } from 'src/chat21-core/providers/abstract/upload.service';

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

@@ -102,7 +102,7 @@
       <!--backgroundColor non viene ancora usato -->
       <div style="display: contents;">
 
-        <div class="email-logo" *ngIf="message.attributes.channel && message.attributes.channel === TYPE_MSG_EMAIL">
+        <div class="email-logo" *ngIf="message?.attributes?.channel && message?.attributes?.channel === TYPE_MSG_EMAIL">
           <ion-icon name="mail"></ion-icon>
         </div>
 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts

@@ -13,10 +13,6 @@ import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service'
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
-import {
-  setConversationAvatar,
-  setChannelType,
-} from 'src/chat21-core/utils/utils'
 import { Platform } from '@ionic/angular'
 
 import { ModalController } from '@ionic/angular'

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

@@ -14,8 +14,6 @@ import { UploadService } from 'src/chat21-core/providers/abstract/upload.service
 import { TYPE_MSG_EMAIL, TYPE_MSG_TEXT, TYPE_SUPPORT_GROUP } from 'src/chat21-core/utils/constants';
 // Models
 import { UploadModel } from 'src/chat21-core/models/upload';
-import { Observable } from 'rxjs';
-import { checkPlatformIsMobile } from 'src/chat21-core/utils/utils';
 
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';

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

@@ -2,7 +2,7 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { EventsService } from 'src/app/services/events-service';
 import { ProjectsService } from './../../services/projects/projects.service';
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { Project } from 'src/chat21-core/models/projects';
@@ -22,7 +22,7 @@ export class NavbarComponent implements OnInit {
   private tiledeskToken: string;
 
   public projects: Project[];
-  public project: any;
+  public project: any = [];
   private USER_ROLE: string;
 
   public translationsMap: Map<string, string> = new Map();
@@ -37,7 +37,8 @@ export class NavbarComponent implements OnInit {
     private tiledeskAuthService: TiledeskAuthService,
     private appConfigProvider: AppConfigProvider,
     private translateService: CustomTranslateService, 
-    private events: EventsService,  
+    private events: EventsService,
+    private cdref: ChangeDetectorRef, 
   ) { }
 
   ngOnInit() {
@@ -47,6 +48,10 @@ export class NavbarComponent implements OnInit {
     this.getOSCODE();
   }
 
+  ngAfterContentChecked() {
+    this.cdref.detectChanges();
+  }
+
   initTranslations(){
     let keys= [
       "NAVBAR.SIMULATE_VISITOR",

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

@@ -1,5 +1,3 @@
-import { TYPE_DIRECT } from 'src/chat21-core/utils/constants';
-import { URL_SOUND_LIST_CONVERSATION } from './../../../chat21-core/utils/constants'
 import {
   Component,
   OnInit,
@@ -47,7 +45,7 @@ import { ArchivedConversationsHandlerService } from 'src/chat21-core/providers/a
 import { ConversationHandlerService } from 'src/chat21-core/providers/abstract/conversation-handler.service'
 import { ContactsService } from 'src/app/services/contacts/contacts.service'
 import { CannedResponsesService } from '../../services/canned-responses/canned-responses.service'
-import { compareValues, getDateDifference, htmlEntities } from '../../../chat21-core/utils/utils'
+import { compareValues, getDateDifference, htmlEntities } from 'src/chat21-core/utils/utils'
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service'
 import { PresenceService } from 'src/chat21-core/providers/abstract/presence.service'
 import { CreateCannedResponsePage } from 'src/app/modals/create-canned-response/create-canned-response.page'
@@ -57,7 +55,9 @@ import {
   MESSAGE_TYPE_INFO,
   MESSAGE_TYPE_MINE,
   MESSAGE_TYPE_OTHERS,
-} from '../../../chat21-core/utils/constants'
+  URL_SOUND_LIST_CONVERSATION, 
+  TYPE_DIRECT 
+} from 'src/chat21-core/utils/constants'
 import {
   checkPlatformIsMobile,
   checkWindowWidthIsLessThan991px,
@@ -521,10 +521,10 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.initConversationHandler()
       this.initGroupsHandler()
       this.initSubscriptions()
+      this.startConversation()
       this.getLeadDetail()
     }
     this.addEventsKeyboard()
-    this.startConversation()
     this.updateConversationBadge() // AGGIORNO STATO DELLA CONVERSAZIONE A 'LETTA' (is_new = false)
   
     this.initializeTyping();
@@ -887,20 +887,22 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
 
   getLeadDetail(){
-    const tiledeskToken= this.tiledeskAuthService.getTiledeskToken();
-    const projectId = this.getProjectIdSelectedConversation(this.conversationWith)
-    this.logger.debug('[CONVS-DETAIL] getLeadDetail - section ', projectId)
-    this.tiledeskService.getRequest(this.conversationWith, projectId, tiledeskToken).subscribe((request: any)=>{
-      this.logger.debug('[CONVS-DETAIL] getLeadDetail - selected REQUEST detail', request)
-      if(request.lead && request.lead.email){
-        this.leadInfo = {lead_id: request.lead.lead_id, hasEmail: true, email: request.lead.email, projectId: projectId}
-        this.presenceService.userIsOnline(this.leadInfo.lead_id);
-      }
-    }, (error)=>{
-      this.logger.error('[CONVS-DETAIL] - getLeadDetail - GET REQUEST DETAIL - ERROR  ', error)
-    }, ()=>{
-      this.logger.debug('[CONVS-DETAIL] - getLeadDetail - GET REQUEST DETAIL * COMPLETE *')
-    })
+    if(this.channelType !== TYPE_DIRECT){
+      const tiledeskToken= this.tiledeskAuthService.getTiledeskToken();
+      const projectId = this.getProjectIdSelectedConversation(this.conversationWith)
+      this.logger.debug('[CONVS-DETAIL] getLeadDetail - section ', projectId)
+      this.tiledeskService.getRequest(this.conversationWith, projectId, tiledeskToken).subscribe((request: any)=>{
+        this.logger.debug('[CONVS-DETAIL] getLeadDetail - selected REQUEST detail', request)
+        if(request.lead && request.lead.email){
+          this.leadInfo = {lead_id: request.lead.lead_id, hasEmail: true, email: request.lead.email, projectId: projectId}
+          this.presenceService.userIsOnline(this.leadInfo.lead_id);
+        }
+      }, (error)=>{
+        this.logger.error('[CONVS-DETAIL] - getLeadDetail - GET REQUEST DETAIL - ERROR  ', error)
+      }, ()=>{
+        this.logger.debug('[CONVS-DETAIL] - getLeadDetail - GET REQUEST DETAIL * COMPLETE *')
+      })
+    }
     
   }
 
@@ -1002,8 +1004,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.channelType,
         attributes,
       )
-      
-      if(!this.leadIsOnline && this.leadInfo.email){
+
+      if(!this.leadIsOnline && this.leadInfo && this.leadInfo.email){
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
         this.sendEmail(msg)
       }

package/src/app/services/websocket/websocket.service.ts

@@ -41,7 +41,7 @@ export class WebsocketService {
 
       self.webSocketJs.ref(path, 'subscriptionToWsCurrentUser_allProject',
         function (data, notification) {
-          console.log("[WS-SERV] SUBSCR TO WS CURRENT PROJECT-USER AVAILABILITY - CREATE - data ", data);
+          // console.log("[WS-SERV] SUBSCR TO WS CURRENT PROJECT-USER AVAILABILITY - CREATE - data ", data);
           resolve(data)
           // self.currentUserWsAvailability$.next(data.user_available);
           self.currentProjectUserAvailability$.next(data)

package/src/chat21-core/providers/logger/customLogger.ts

@@ -20,7 +20,7 @@ export class CustomLogger implements LoggerService {
         this.isLogEnabled = isLogEnabled;
         if (logLevel) {
             this.logLevel = LogLevel[logLevel.toUpperCase()];
-            console.log('LoggerService this.logLevel  ', this.logLevel)
+            // console.log('LoggerService this.logLevel  ', this.logLevel)
         }
     }
 

package/deploy_amazon_beta.sh

@@ -1,29 +0,0 @@
-#npm version prerelease --preid=beta
-version=`node -e 'console.log(require("./package.json").version)'`
-echo "version $version"
-
-URL_VER=${version//[.]//}
-echo 'URL_VER: ---->'$URL_VER
-
-sed -i -e "s/$URL_VER/g" src/utils/constants.ts
-
-# ng build --prod --base-href /$NEW_BUILD/
-#ionic cordova build browser --prod
-
-ionic cordova platform add browser --save
-#ionic cordova build browser --prod --release
-ionic cordova build --configuration="pre" browser #--prod  --verbose 
-
-cp -p src/firebase-messaging-sw.js platforms/browser/www/
-cp -p src/manifest.json platforms/browser/www/
-cp -p src/chat-config.json platforms/browser/www/
-
-cd platforms/browser/www
-aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/$version/ --cache-control max-age=300
-aws s3 sync . s3://tiledesk-dashboard-pre/chat-ionic5/ --cache-control max-age=300
-cd ../../../
-
-#aws cloudfront create-invalidation --distribution-id E13L8CUUKUWAJF --paths "/*"
-
-echo new version deployed on s3://tiledesk-dashboard-pre/chat-ionic5/$version/
-echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-dashboard-pre/chat-ionic5/$version/index.html

package/deploy_amazon_prod.sh

@@ -1,30 +0,0 @@
-# npm version patch
-version=`node -e 'console.log(require("./package.json").version)'`
-echo "version $version"
-
-URL_VER=${version//[.]//}
-echo 'URL_VER: ---->'$URL_VER
-
-# sed -i -e "s/$start$ver.$build/$start$NEW_VER.$NEW_BUILD/g" src/utils/constants.ts
-sed -i -e "s/$URL_VER/g" src/utils/constants.ts
-
-
-ionic cordova platform add browser --save
-#ionic cordova build --env=prod browser  -- --base-href /www/ --prod
-ionic cordova build --env=prod browser --prod 
-
-cp -p src/firebase-messaging-sw.js platforms/browser/www/
-cp -p src/manifest.json platforms/browser/www/
-cp -p src/chat-config.json platforms/browser/www/
-
-cd platforms/browser/www
-aws s3 sync . s3://tiledesk-console/v2/chat/ --cache-control max-age=172800
-aws s3 sync . s3://tiledesk-console/v2/chat/$version/ --cache-control max-age=172800
-# aws s3 sync . s3://tiledesk-console/v2/chat/latest/ --cache-control max-age=172800
-cd ../../../
-
-# aws cloudfront create-invalidation --distribution-id E36UIP90GOSFPM --paths "/*"
-
-# echo new version deployed on s3://tiledesk-dashboard/chat/$NEW_BUILD/
-echo new version deployed on s3://tiledesk-console/v2/chat/$version/
-echo available on https://console.tiledesk.com/v2/chat/$version/index.html