@chat21/chat21-ionic 3.1.0 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # chat21-ionic ver 3.0
 
+### 3.2.0 in PROD
+- changed: API_URL template key in favour of SERVER_BASE_URL
+
+### 3.2.0-rc.1
+- added: CONV_TYPE enum for all channel_type
+- bug-fixed: do not sent automatic offline message if channel_type is messanger
+- bug-fixed: disabled email section in conversation-detail footer if channel_type is whatsapp or messanger
+
 ### 3.1.0 in PROD
 
 ### 3.1.0-rc2

package/package.json

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

package/src/app/app.component.ts

@@ -826,7 +826,7 @@ export class AppComponent implements OnInit {
             this.hadBeenCalledOpenModal = true;
           }
         }, 1000)
-      }else{
+      }else {
         this.goToDashboardLogin()
       }
     }

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.html

@@ -95,23 +95,23 @@
     <ion-label>
       <div class="conversation_project truncate">
         <!-- DIRECT CONV -->
-        <div *ngIf="conversation.channel_type === TYPE_DIRECT">
+        <div *ngIf="conversation.channel_type === CHANNEL_TYPE.DIRECT">
           <img class="channel-icon" src="assets/images/channel_icons/direct.svg">
           <span  class="truncate">{{translationsMap.get('DIRECT_CHAT')}}</span>
         </div>
         <!-- GROUP CONV -->
-        <div *ngIf="conversation.uid.startsWith(TYPE_GROUP)">
+        <div *ngIf="conversation.uid.startsWith(CHANNEL_TYPE.GROUP)">
           <img class="channel-icon" src="assets/images/channel_icons/group.svg">
           <span class="truncate">{{translationsMap.get('GROUP_CHAT')}}</span>
         </div>
         <!-- SUPPORT-GROUP CONV -->
-        <div  *ngIf="conversation.uid.startsWith(TYPE_SUPPORT_GROUP) && !IS_ON_MOBILE_DEVICE">
-          <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="conversation?.attributes && ( (conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_CHAT21) ||  !conversation?.attributes?.request_channel) " >
-          <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_EMAIL" >
-          <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_FORM" >
-          <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_MESSANGER" >
-          <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_WHATSAPP" >
-          <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE_TELEGRAM" >
+        <div  *ngIf="conversation.uid.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) && !IS_ON_MOBILE_DEVICE">
+          <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="conversation?.attributes && ( (conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE.CHAT21) ||  !conversation?.attributes?.request_channel) " >
+          <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE.EMAIL" >
+          <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE.FORM" >
+          <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE.MESSENGER" >
+          <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE.WHATSAPP" >
+          <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.request_channel && conversation?.attributes?.request_channel === CHANNEL_TYPE.TELEGRAM" >
           <span *ngIf="conversation?.attributes?.project_name" class="truncate">{{conversation?.attributes?.project_name}}</span>
           <span *ngIf="!conversation?.attributes?.project_name" class="truncate">{{conversation?.attributes?.projectId}}</span>
         </div>

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.ts

@@ -1,8 +1,6 @@
-import { CHANNEL_TYPE_CHAT21, CHANNEL_TYPE_EMAIL, CHANNEL_TYPE_FORM, CHANNEL_TYPE_MESSANGER, CHANNEL_TYPE_TELEGRAM, CHANNEL_TYPE_WHATSAPP, TYPE_GROUP, TYPE_SUPPORT_GROUP } from './../../../../chat21-core/utils/constants';
-import { TYPE_DIRECT } from 'src/chat21-core/utils/constants';
+import { CHANNEL_TYPE } from 'src/chat21-core/utils/constants';
 import { Component, EventEmitter, Input, IterableDiffers, KeyValueDiffers, OnInit, Output, SimpleChange } from '@angular/core';
 import { ConversationModel } from 'src/chat21-core/models/conversation';
-import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
 import { convertMessage, isOnMobileDevice } from 'src/chat21-core/utils/utils';
 import { ListConversationsComponent } from '../list-conversations/list-conversations.component';
 import { Platform } from '@ionic/angular';
@@ -55,17 +53,8 @@ export class IonListConversationsComponent extends ListConversationsComponent im
   public youAreNoLongerAmongTheTeammatesManagingThisConversation_lbl: string;
   public ok_lbl: string;
 
-  TYPE_DIRECT = TYPE_DIRECT;
-  TYPE_GROUP = TYPE_GROUP;
-  TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP;
-
   //ATTRIBUTES CHANNEL
-  CHANNEL_TYPE_CHAT21 = CHANNEL_TYPE_CHAT21;
-  CHANNEL_TYPE_EMAIL = CHANNEL_TYPE_EMAIL;
-  CHANNEL_TYPE_FORM = CHANNEL_TYPE_FORM;
-  CHANNEL_TYPE_MESSANGER = CHANNEL_TYPE_MESSANGER;
-  CHANNEL_TYPE_WHATSAPP = CHANNEL_TYPE_WHATSAPP;
-  CHANNEL_TYPE_TELEGRAM = CHANNEL_TYPE_TELEGRAM;
+  CHANNEL_TYPE = CHANNEL_TYPE
   
   IS_ON_MOBILE_DEVICE: boolean
   /**

package/src/app/components/canned-response/canned-response.component.ts

@@ -62,7 +62,6 @@ export class CannedResponseComponent implements OnInit {
     if(this.currentString !== undefined){
       this.loadTagsCanned(this.currentString, this.conversationWith)
     }
-    console.log('can show canneddddddd', this.canShowCanned)
   }
 
   // getProjectIdSelectedConversation(conversationWith: string): string{

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

@@ -38,18 +38,18 @@
                 <span  class="truncate">{{translationsMap.get('DIRECT_CHAT')}}</span> -->
               </div>
               <!-- GROUP CONV -->
-              <div *ngIf="conversationUid?.startsWith(TYPE_GROUP)">
+              <div *ngIf="conversationUid?.startsWith(CHANNEL_TYPE.GROUP)">
                 <svg xmlns="http://www.w3.org/2000/svg" height="15"  width="15" viewBox="0 0 24 24" fill="#000000"><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/></svg>
                 <span  class="truncate">{{translationsMap.get('GROUP_CHAT')}}</span>
               </div>
               <!-- SUPPORT-GROUP CONV -->
-              <div  *ngIf="conversationUid?.startsWith(TYPE_SUPPORT_GROUP) && !IS_ON_MOBILE_DEVICE">
-                <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="( (conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE_CHAT21) ||  !conversationAvatar?.request_channel) " >
-                <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE_EMAIL" >
-                <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE_FORM" >
-                <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE_MESSANGER" >
-                <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE_WHATSAPP" >
-                <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE_TELEGRAM" >
+              <div  *ngIf="conversationUid?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) && !IS_ON_MOBILE_DEVICE">
+                <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="( (conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE.CHAT21) ||  !conversationAvatar?.request_channel) " >
+                <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE.EMAIL" >
+                <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE.FORM" >
+                <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE.MESSENGER" >
+                <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE.WHATSAPP" >
+                <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversationAvatar?.request_channel && conversationAvatar?.request_channel === CHANNEL_TYPE.TELEGRAM" >
                 <span *ngIf="conversationAvatar?.project_name" class="truncate">{{conversationAvatar?.project_name}}</span>
                 <span *ngIf="!conversationAvatar?.project_name" class="truncate">{{conversationAvatar?.projectId}}</span>
               </div>

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

@@ -1,4 +1,3 @@
-import { CHANNEL_TYPE_CHAT21, CHANNEL_TYPE_EMAIL, CHANNEL_TYPE_FORM, CHANNEL_TYPE_MESSANGER, CHANNEL_TYPE_TELEGRAM, CHANNEL_TYPE_WHATSAPP, TYPE_GROUP } from './../../../../chat21-core/utils/constants';
 import {
   Component,
   OnInit,
@@ -19,7 +18,7 @@ import { ModalController } from '@ionic/angular'
 import { EventsService } from 'src/app/services/events-service'
 import { CreateTicketPage } from 'src/app/modals/create-ticket/create-ticket.page'
 import { TiledeskService } from 'src/app/services/tiledesk/tiledesk.service'
-import { TYPE_DIRECT, TYPE_SUPPORT_GROUP } from 'src/chat21-core/utils/constants'
+import { CHANNEL_TYPE } from 'src/chat21-core/utils/constants'
 import { isOnMobileDevice } from 'src/chat21-core/utils/utils';
 
 @Component({
@@ -48,16 +47,8 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   IS_ON_MOBILE_DEVICE: boolean
   private logger: LoggerService = LoggerInstance.getInstance()
 
-  TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP
-  TYPE_GROUP = TYPE_GROUP
-
   //ATTRIBUTES CHANNEL
-  CHANNEL_TYPE_CHAT21 = CHANNEL_TYPE_CHAT21;
-  CHANNEL_TYPE_EMAIL = CHANNEL_TYPE_EMAIL;
-  CHANNEL_TYPE_FORM = CHANNEL_TYPE_FORM;
-  CHANNEL_TYPE_MESSANGER = CHANNEL_TYPE_MESSANGER;
-  CHANNEL_TYPE_WHATSAPP = CHANNEL_TYPE_WHATSAPP;
-  CHANNEL_TYPE_TELEGRAM = CHANNEL_TYPE_TELEGRAM;
+  CHANNEL_TYPE = CHANNEL_TYPE
   
   constructor(
     public imageRepoService: ImageRepoService,
@@ -96,7 +87,7 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   // ----------------------------------------------------
   initialize() {
     this.getPlatformName()
-    if ( this.conversationAvatar && this.conversationAvatar.channelType === TYPE_DIRECT ) {
+    if (this.conversationAvatar && this.conversationAvatar.channelType === CHANNEL_TYPE.DIRECT ) {
       this.isDirect = true
     }
   }

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

@@ -9,20 +9,20 @@
     </div>
     <!-- EMAIL-OPTION -->
     <div *ngIf="emailSection" class="section-option" id="email"  tooltip="{{translationMap?.get('EMAIL.LABEL_TOOLTIP')}}" placement="top">
-      <ion-button fill="clear" [class.active]="section==='email'" (click)="onOpenSection('email')" [disabled]="channelType === 'direct'">
+      <ion-button fill="clear" [class.active]="section==='email'" (click)="onOpenSection('email')" [disabled]="channelType === 'direct' || channel == CHANNEL_TYPE.WHATSAPP || channel == CHANNEL_TYPE.MESSENGER">
         <ion-icon name="mail-open"></ion-icon>
         {{translationMap.get('LABEL_EMAIL')}}
       </ion-button>
     </div>
 
     <div *ngIf="whatsappTemplatesSection" class="section-option" id="template" tooltip="{{translationMap?.get('WHATSAPP.LABEL_TOOLTIP')}}" placement="top">
-      <ion-button fill="clear" [class.active]="section==='templates'" (click)="onOpenSection('templates');onOpenTemplateModal()" [disabled]="channel !== CHANNEL_TYPE_WHATSAPP">
+      <ion-button fill="clear" [class.active]="section==='templates'" (click)="onOpenSection('templates');onOpenTemplateModal()" [disabled]="channel !== CHANNEL_TYPE.WHATSAPP">
         <ion-icon name="logo-whatsapp"></ion-icon>
         {{translationMap?.get('WHATSAPP.LABEL_TEMPLATES')}}
       </ion-button>
     </div>
     
-    <div *ngIf="section==='chat' && channel !== CHANNEL_TYPE_WHATSAPP && messageString && (leadInfo?.presence['status']==='offline' && leadInfo?.hasEmail)" class="section-option offline-lead-tip" >
+    <div *ngIf="section==='chat' && channel !== CHANNEL_TYPE.WHATSAPP && messageString && (leadInfo?.presence['status']==='offline' && leadInfo?.hasEmail)" class="section-option offline-lead-tip" >
       {{translationMap.get('EMAIL.EMAIL_OFFLINE_TIP')}}
     </div>
 
@@ -46,16 +46,16 @@
           <div class="canned-responses-btn-wpr"
             tooltip="{{translationMap?.get('CANNED_RESPONSES')}}" placement="top">
             <ion-button ion-button fill="clear" class="canned-responses-btn" (click)="openCannedResponses()"
-              [disabled]="!conversationWith?.startsWith(TYPE_SUPPORT_GROUP) || disableTextarea">
+              [disabled]="!conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) || disableTextarea">
               <ion-icon slot="icon-only" name="flash-outline" style="font-size: 24px;"></ion-icon>
             </ion-button>
           </div>
-          <div *ngIf="conversationWith?.startsWith(TYPE_SUPPORT_GROUP)  && tagsCannedCount === 0"
+          <div *ngIf="conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP)  && tagsCannedCount === 0"
             tooltip="{{translationMap?.get('NO_CANNED_RESPONSES')}}" placement="top"
             class="no-canned-responses-btn-badge">
             <ion-icon name="alert-sharp" style="vertical-align: middle;"></ion-icon>
           </div>
-          <div *ngIf="conversationWith?.startsWith(TYPE_SUPPORT_GROUP) && (tagsCannedCount > 0)"
+          <div *ngIf="conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) && (tagsCannedCount > 0)"
             tooltip="{{translationMap?.get('YES_CANNED_RESPONSES')}}" placement="top" class="canned-responses-btn-badge">
             <ion-icon name="information-sharp" style="vertical-align: middle;"></ion-icon>
           </div>

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

@@ -12,7 +12,7 @@ import { LoaderPreviewPage } from 'src/app/modals/loader-preview/loader-preview.
 // Services 
 import { UploadService } from 'src/chat21-core/providers/abstract/upload.service';
 // utils
-import { CHANNEL_TYPE_WHATSAPP, TYPE_MSG_EMAIL, TYPE_MSG_TEXT, TYPE_SUPPORT_GROUP } from 'src/chat21-core/utils/constants';
+import { TYPE_MSG_EMAIL, TYPE_MSG_TEXT, CHANNEL_TYPE } from 'src/chat21-core/utils/constants';
 // Models
 import { UploadModel } from 'src/chat21-core/models/upload';
 
@@ -74,9 +74,8 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   public countClicks: number = 0;
   public IS_ON_MOBILE_DEVICE: boolean;
 
-  TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP;
+  CHANNEL_TYPE = CHANNEL_TYPE;
   TYPE_MSG_TEXT = TYPE_MSG_TEXT;
-  CHANNEL_TYPE_WHATSAPP = CHANNEL_TYPE_WHATSAPP;
   msg: string
 
   section: string= 'chat'

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -11,8 +11,6 @@ import { ConversationsHandlerService } from 'src/chat21-core/providers/abstract/
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { ContactsService } from 'src/app/services/contacts/contacts.service';
 import { AppConfigProvider } from '../../../services/app-config';
-import { setChannelType } from '../../../../chat21-core/utils/utils';
-import { TYPE_SUPPORT_GROUP, TYPE_DIRECT, TYPE_GROUP } from '../../../../chat21-core/utils/constants';
 import { DomSanitizer } from '@angular/platform-browser';
 
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';

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

@@ -60,8 +60,7 @@ import {
   TYPE_DIRECT,
   TYPE_MSG_EMAIL,
   TYPE_MSG_FORM,
-  CHANNEL_TYPE_TELEGRAM,
-  CHANNEL_TYPE_WHATSAPP,
+  CHANNEL_TYPE,
   INFO_MESSAGE_TYPE
 } from 'src/chat21-core/utils/constants'
 import {
@@ -347,8 +346,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.channel_type,
             null,
             conv.attributes['projectId'],
-            conv.attributes['project_name']),
-            conv.attributes['channel']
+            conv.attributes['project_name'],
+            conv.attributes['request_channel'])
         }
 
       }
@@ -1113,17 +1112,18 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
 
     const emailSectionMsg = (attributes && attributes['offline_channel'] === TYPE_MSG_EMAIL)
-    const channelIsNotEmailOrFormOrWhatsappOrTelegram = (attributes && attributes['request_channel'] && (attributes['request_channel'] === TYPE_MSG_EMAIL || 
+    const channelIsNotWeb = (attributes && attributes['request_channel'] && (attributes['request_channel'] === TYPE_MSG_EMAIL || 
                                                                                                 attributes['request_channel'] === TYPE_MSG_FORM || 
-                                                                                                attributes['request_channel'] === CHANNEL_TYPE_WHATSAPP || 
-                                                                                                attributes['request_channel'] === CHANNEL_TYPE_TELEGRAM))
+                                                                                                attributes['request_channel'] === CHANNEL_TYPE.WHATSAPP || 
+                                                                                                attributes['request_channel'] === CHANNEL_TYPE.MESSENGER || 
+                                                                                                attributes['request_channel'] === CHANNEL_TYPE.TELEGRAM))
 
     if ((msg && msg.trim() !== '') || type !== TYPE_MSG_TEXT) {
 
 
       if (this.isEmailEnabled &&
         this.leadInfo && this.leadInfo.presence && this.leadInfo.presence['status'] === 'offline' &&
-        this.leadInfo.email && !emailSectionMsg && !channelIsNotEmailOrFormOrWhatsappOrTelegram) {
+        this.leadInfo.email && !emailSectionMsg && !channelIsNotWeb) {
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
         let msgText = this.createEmailText(msg)
         this.sendEmail(msgText).subscribe(status => {

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

@@ -78,7 +78,8 @@ export class BrandService {
       COMPANY_SITE_NAME:"tiledesk.com",
       COMPANY_SITE_URL:"https://www.tiledesk.com",
       CONTACT_US_EMAIL: "support@tiledesk.com",
-      COMPANY_PRIMARY_COLOR:""
+      COMPANY_PRIMARY_COLOR:"",
+      DOCS:false
     }
   }
 
@@ -184,17 +185,17 @@ export class BrandService {
       if (url && url !== 'CHANGEIT') {
         const data = await this.httpClient.get(url).toPromise();
 
-        console.log('[BRAND-SERV] **** GET BRAND FROM URL ****', url);
+        this.logger.log('[BRAND-SERV] **** GET BRAND FROM URL ****', url);
 
         this.brand =data
 
-        console.log('[BRAND-SERV] loadBrand - brand: ', this.brand);
+        this.logger.log('[BRAND-SERV] loadBrand - brand: ', this.brand);
 
         const resources = new BrandResources(this);
         resources.loadResources()
       }
     } catch (err) {
-      console.error('[BRAND-SERV] loadBrand error : ', err);
+      this.logger.error('[BRAND-SERV] loadBrand error : ', err);
 
       this.brand = this._brand;
     }
@@ -203,7 +204,7 @@ export class BrandService {
   }
 
   getBrand() {
-    console.log('BrandService getBrand has been called - brand: ', this.brand);
+    //this.logger.log('BrandService getBrand has been called - brand: ', this.brand);
     return { ...this.brand['CHAT'], ...this.brand['COMMON'] }
   }
 

package/src/app/services/triggerEvents/triggerEvents.ts

@@ -34,7 +34,7 @@ export class TriggerEvents {
             const windowContext = this.windowContext;
             if (windowContext){
                 // window.parent.dispatchEvent(onAuthStateChanged);
-                window.parent.postMessage({type: "onAuthStateChanged", detail: detailObj}, '*')
+                windowContext.postMessage({type: "onAuthStateChanged", detail: detailObj}, '*')
                 // this.el.nativeElement.dispatchEvent(onAuthStateChanged);
             }
         } catch (e) {
@@ -49,7 +49,7 @@ export class TriggerEvents {
             const windowContext = this.windowContext;
             if (windowContext){
                 // windowContext.document.dispatchEvent(onAfterMessageSend);
-                window.parent.postMessage({type: "onAfterMessageSend", detail: { message: messageSent }}, '*')
+                windowContext.postMessage({type: "onAfterMessageSend", detail: { message: messageSent }}, '*')
             }
         } catch (e) {
             this.logger.error('[TRIGGER-HANDLER] > Error:' + e);
@@ -65,7 +65,7 @@ export class TriggerEvents {
             const windowContext = this.windowContext;
             if (windowContext){
                 // windowContext.document.dispatchEvent(onAfterMessageReceived);
-                window.parent.postMessage({type: "onAfterMessageReceived", detail: { message: message }}, '*')
+                windowContext.postMessage({type: "onAfterMessageReceived", detail: { message: message }}, '*')
             }
         } catch (e) {
             this.logger.error('[TRIGGER-HANDLER] > Error:' + e);
@@ -80,7 +80,7 @@ export class TriggerEvents {
             const windowContext = this.windowContext;
             if (windowContext){
                 // windowContext.document.dispatchEvent(onNewConversation);
-                window.parent.postMessage({type: "onNewConversation", detail: { conversation: conversation}}, '*')
+                windowContext.postMessage({type: "onNewConversation", detail: { conversation: conversation}}, '*')
             }
         } catch (e) {
             this.logger.error('[TRIGGER-HANDLER] > Error:' + e);

package/src/app/utils/globals.ts

@@ -1,12 +1,4 @@
-import { style } from '@angular/animations';
 import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
-import { environment } from '../../environments/environment';
-
-/** CONSTANTS */
-import { CHANNEL_TYPE_GROUP } from 'src/chat21-core/utils/constants';
-import { getParameterByName } from 'src/chat21-core/utils/utils';
-
 
 @Injectable({
     providedIn: 'root'

package/src/chat-config-template.json

@@ -27,7 +27,7 @@
         "MQTTendpoint": "${MQTT_ENDPOINT}",
         "APIendpoint": "${MQTT_APIENDPOINT}"
     },
-    "apiUrl": "${API_URL}",
+    "apiUrl": "${SERVER_BASE_URL}",
     "brandSrc": "${BRAND_SRC}",
     "whatsappTemplatesBaseUrl":"${WHATSAPP_TEMPLATES_BASE_URL}",
     "baseImageUrl": "${API_BASEIMAGE_URL}",

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

@@ -40,14 +40,17 @@ export const PARENT_PAGE_DETAIL_CONVERSATION = 'dettaglio-conversazione ';
 export const BCK_COLOR_CONVERSATION_SELECTED = '#EEEEEE ';
 export const BCK_COLOR_CONVERSATION_UNSELECTED = '#FFFFFF ';
 
-export const TYPE_SUPPORT_GROUP = 'support-group';
-export const CHANNEL_TYPE_GROUP = 'group';
-export const CHANNEL_TYPE_CHAT21 = 'chat21';
-export const CHANNEL_TYPE_EMAIL = 'email';
-export const CHANNEL_TYPE_FORM = 'form';
-export const CHANNEL_TYPE_MESSANGER = 'messanger';
-export const CHANNEL_TYPE_WHATSAPP = 'whatsapp';
-export const CHANNEL_TYPE_TELEGRAM = 'telegram';
+export enum CHANNEL_TYPE {
+    SUPPORT_GROUP = 'support-group',
+    GROUP = 'group',
+    DIRECT = 'direct',
+    CHAT21 = 'chat21',
+    EMAIL = 'email',
+    FORM = 'form',
+    MESSENGER = 'messenger',
+    WHATSAPP = 'whatsapp',
+    TELEGRAM = 'telegram'
+}
 
 // TYPES MESSAGES
 export const TYPE_MSG_TEXT = 'text';
@@ -79,7 +82,8 @@ export enum INFO_MESSAGE_TYPE {
     MEMBER_LEFT_GROUP = "MEMBER_LEFT_GROUP",
     LEAD_UPDATED = "LEAD_UPDATED",
     TOUCHING_OPERATOR = "TOUCHING_OPERATOR",
-    LIVE_PAGE = "LIVE_PAGE"
+    LIVE_PAGE = "LIVE_PAGE",
+    PLAN_EXPIRED = "PLAN_EXPIRED"
 }
 
 

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

@@ -1,4 +1,4 @@
-import { TYPE_DIRECT, TYPE_SUPPORT_GROUP } from 'src/chat21-core/utils/constants';
+import { CHANNEL_TYPE } from 'src/chat21-core/utils/constants';
 import { ConversationModel } from 'src/chat21-core/models/conversation';
 import { Inject, Injectable, OnInit } from '@angular/core';
 import { avatarPlaceholder, getColorBck } from './utils-user';
@@ -17,7 +17,7 @@ export class ConvertRequestToConversation {
         return new ConversationModel(
             request.request_id,
             request.attributes,
-            request.request_id && (request.request_id.startsWith('group-') || request.request_id.startsWith('support-group'))? TYPE_SUPPORT_GROUP: TYPE_DIRECT,
+            request.request_id && (request.request_id.startsWith('group-') || request.request_id.startsWith('support-group'))? CHANNEL_TYPE.SUPPORT_GROUP: CHANNEL_TYPE.DIRECT,
             request.lead && request.lead.fullname ? request.lead.fullname: null,
             request.request_id,
             request.request_id,

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

@@ -6,9 +6,8 @@ import {
   MESSAGE_TYPE_MINE,
   MESSAGE_TYPE_OTHERS,
   MAX_WIDTH_IMAGES,
-  CHANNEL_TYPE_GROUP,
-  TYPE_SUPPORT_GROUP,
-  INFO_MESSAGE_TYPE
+  INFO_MESSAGE_TYPE,
+  CHANNEL_TYPE
 } from '../../chat21-core/utils/constants';
 
 /** */
@@ -153,7 +152,7 @@ export function getSizeImg(message: any, maxWidthImage?: number): any {
 
 /** */
 export function isChannelTypeGroup(channelType: string) {
-  if (channelType === CHANNEL_TYPE_GROUP || channelType === TYPE_SUPPORT_GROUP) {
+  if (channelType === CHANNEL_TYPE.GROUP || channelType === CHANNEL_TYPE.SUPPORT_GROUP) {
     return true;
   }
   return false;

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

@@ -2,15 +2,13 @@
 import * as moment from 'moment/moment';
 // import * as moment from 'moment-timezone';
 import 'moment/locale/it.js';
-import { FIREBASESTORAGE_BASE_URL_IMAGE, STORAGE_PREFIX, TYPE_GROUP } from './constants';
+import { CHANNEL_TYPE } from './constants';
 
 import { HttpClient } from '@angular/common/http';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-import { AngularDelegate, ModalController } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
 import { ConversationModel } from '../models/conversation';
 
-import { MAX_WIDTH_IMAGES, TYPE_DIRECT, TYPE_SUPPORT_GROUP } from './constants';
-
 import { avatarPlaceholder, getColorBck } from './utils-user';
 
 /**
@@ -536,9 +534,9 @@ export function setConversationAvatar(
 
 /** */
 export function setChannelType(conversationWith: string): string {
-  let channelType = TYPE_DIRECT;
-  if (conversationWith.includes(TYPE_GROUP + '-')) {
-    channelType = TYPE_GROUP;
+  let channelType = CHANNEL_TYPE.DIRECT;
+  if (conversationWith.includes(CHANNEL_TYPE.GROUP + '-')) {
+    channelType = CHANNEL_TYPE.GROUP;
   }
   return channelType;
 }