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

package/src/app/modals/send-whatsapp-template/send-whatsapp-template.page.ts

@@ -1,8 +1,13 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, SecurityContext, ViewChild } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
 import { ModalController } from '@ionic/angular';
 import { TemplatesService } from 'src/app/services/templates/templates.service';
+import { UploadModel } from 'src/chat21-core/models/upload';
+import { UserModel } from 'src/chat21-core/models/user';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { UploadService } from 'src/chat21-core/providers/abstract/upload.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { MapsPage } from '../maps/maps.page';
 
 @Component({
   selector: 'send-whatsapp-template-modal',
@@ -11,7 +16,8 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 })
 export class SendWhatsappTemplateModal implements OnInit {
 
-  @Input() enableBackdropDismiss: any
+  @Input() loggedUser: UserModel;
+  @Input() enableBackdropDismiss: any;
   @Input() conversationWith: string;
   @Input() projectId: string;
   @Input() stylesMap: Map<string, string>;
@@ -22,26 +28,43 @@ export class SendWhatsappTemplateModal implements OnInit {
   editTemplateView: Boolean = false;
   displayError: Boolean = false;
   labelError: string;
+  templates = [];
 
   selected_template: any;
   header_component: any;
   body_component: any;
   footer_component: any;
   buttons_component: any;
+  url_button_component: any;
+  url_button_component_temp: any;
   header_component_temp: any;
   body_component_temp: any;
   body_params = [];
   header_params = [];
-  templates = [];
+  url_button_params = [];
+
+
+  previsioning_url: string;
+  sanitizedUrl: any;
 
   sendButtonDisabled: Boolean = true;
   display_loader: Boolean = true;
+  invalidUrl: Boolean = false;
+  fileUploadAccept: string = "image/*";
+
+  displayFileUploaded: Boolean = false;
+  fileUploadedName: string;
+  src: any;
+  displayMapModal: Boolean = true;
 
   private logger: LoggerService = LoggerInstance.getInstance()
 
   constructor(
     private templatesService: TemplatesService,
-    public viewCtrl: ModalController
+    public viewCtrl: ModalController,
+    public sanitizer: DomSanitizer,
+    private uploadService: UploadService,
+    public modalController: ModalController,
   ) { }
 
   ngOnInit() {
@@ -54,12 +77,11 @@ export class SendWhatsappTemplateModal implements OnInit {
       this.logger.debug('[SEND-TEMPLATE-MODAL] subscribe to getTemplates API response -->', res)
       //this.selectionView = true;
       this.templates = res;
-      console.log("templates: ", this.templates);
     }, (error) => {
       this.logger.error('[SEND-TEMPLATE-MODAL] subscribe to getTemplates API  - ERROR  ', error)
       this.displayError = true;
       this.display_loader = false;
-      if(error.error && error.error.code === '01'){
+      if (error.error && error.error.code === '01') {
         this.labelError = this.translationMap.get('WHATSAPP.ERROR_WHATSAPP_NOT_INSTALLED')
       } else {
         this.labelError = this.translationMap.get('WHATSAPP.ERROR_WHATSAPP_GENERIC_ERROR')
@@ -80,29 +102,80 @@ export class SendWhatsappTemplateModal implements OnInit {
     this.body_component = this.selected_template.components.find(c => c.type === 'BODY');
     this.footer_component = this.selected_template.components.find(c => c.type === 'FOOTER');
     this.buttons_component = this.selected_template.components.find(c => c.type === 'BUTTONS');
-    
+    if (this.buttons_component) {
+      this.url_button_component = this.buttons_component.buttons.find(c => c.type === 'URL')
+    }
+
+    if (this.header_component) {
+      this.header_component_temp = JSON.parse(JSON.stringify(this.header_component));
+      if (this.header_component.example) {
+
+        if (this.header_component.example.header_text) {
+          this.header_component.example.header_text.forEach((p, i) => {
+            this.header_params.push({ index: i + 1, type: "text", text: null })
+          })
+        }
+
+        if (this.header_component.example.header_handle) {
+          if (this.header_component.format === 'IMAGE') {
+            this.header_component.example.header_handle.forEach((p, i) => {
+              this.header_params.push({ index: i + 1, type: this.header_component.format, image: { link: null } })
+            })
+          }
+          if (this.header_component.format === 'DOCUMENT') {
+            this.fileUploadAccept = ".pdf"
+            this.src = this.header_component.example.header_handle[0];
+            this.sanitizeUrl(this.header_component.example.header_handle[0]);
+            this.header_component.example.header_handle.forEach((p, i) => {
+              this.header_params.push({ index: i + 1, type: this.header_component.format, document: { link: null } })
+            })
+          }
+        }
+
+      } else {
+
+        if (this.header_component.format === 'LOCATION') {
+          this.header_params.push({ index: 1, type: this.header_component.format, location: { latitude: null, longitude: null, name: null, address: null } })
+        }
+        else {
+          this.logger.log("[SEND-TEMPLATE-MODAL] Check unrecognized Header: ", this.header_component)
+          //this.sendButtonDisabled = false;
+        }
+
+      }
+    }
+
     if (this.body_component) {
       this.body_component_temp = JSON.parse(JSON.stringify(this.body_component));
       if (this.body_component.example) {
         this.body_component.example.body_text[0].forEach((p, i) => {
           this.body_params.push({ index: i + 1, type: "text", text: null })
         })
-      } else {
-        this.sendButtonDisabled = false;
       }
-
+      // else {
+      //   //this.sendButtonDisabled = false;
+      // }
     }
 
-    if (this.header_component) {
-      this.header_component_temp = JSON.parse(JSON.stringify(this.header_component));
-      if (this.header_component.example) {
-        this.header_component.example.header_text.forEach((p, i) => {
-          this.header_params.push({ index: i + 1, type: "text", text: null })
+    if (this.url_button_component) {
+      this.url_button_component_temp = JSON.parse(JSON.stringify(this.url_button_component));
+      if (this.url_button_component.example) {
+        this.url_button_component.example.forEach((p, i) => {
+          this.url_button_params.push({ index: i + 1, type: "text", text: null })
+          this.previsioning_url = this.url_button_component.url;
         })
-      } else {
-        this.sendButtonDisabled = false;
       }
+      // else {
+      //   this.sendButtonDisabled = false;
+      // }
     }
+
+    this.checkParameters();
+
+  }
+
+  sanitizeUrl(url) {
+    this.sanitizedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(url);
   }
 
   onParamBodyChange(event, param_num) {
@@ -120,7 +193,19 @@ export class SendWhatsappTemplateModal implements OnInit {
 
   onParamHeaderChange(event, param_num) {
     this.header_component = JSON.parse(JSON.stringify(this.header_component_temp));
-    this.header_params[param_num - 1].text = event;
+    if (this.header_params[param_num - 1].type === 'TEXT') {
+      this.header_params[param_num - 1].text = event;
+    }
+    if (this.header_params[param_num - 1].type === 'IMAGE') {
+      this.header_params[param_num - 1].image.link = event;
+      this.invalidUrl = false;
+    }
+    if (this.header_params[param_num - 1].type === 'DOCUMENT') {
+      this.header_params[param_num - 1].document.link = event;
+      this.sanitizeUrl(event);
+      this.invalidUrl = false;
+    }
+
     this.header_params.forEach((param, i) => {
       let index = i + 1;
       let regex = '{{' + index + '}}';
@@ -131,22 +216,41 @@ export class SendWhatsappTemplateModal implements OnInit {
     this.checkParameters();
   }
 
+  onParamButtonChange(event, param_num) {
+    this.url_button_component = JSON.parse(JSON.stringify(this.url_button_component_temp));
+    this.url_button_params[param_num - 1].text = event;
+    this.url_button_params.forEach((param, i) => {
+      let index = i + 1;
+      let regex = '{{' + index + '}}';
+      if (param.text) {
+        this.url_button_component.url = this.url_button_component.url.replace(regex, param.text);
+      }
+      let button_index = this.buttons_component.buttons.findIndex(b => b.type === 'URL');
+      this.buttons_component.buttons[button_index] = this.url_button_component;
+      this.previsioning_url = this.url_button_component.url;
+    })
+  }
+
   backToSelection() {
     this.selectionView = true;
     this.editTemplateView = false;
     this.body_params = [];
     this.header_params = [];
+    this.url_button_params = [];
     this.header_component = null;
     this.body_component = null;
     this.footer_component = null;
     this.buttons_component = null;
     this.header_component_temp = null;
     this.body_component_temp = null;
+    this.url_button_component = null;
+    this.url_button_component_temp = null;
   }
 
   sendTemplate() {
     const new_header_params = this.header_params.map(({ index, ...keepAttrs }) => keepAttrs)
     const new_body_params = this.body_params.map(({ index, ...keepAttrs }) => keepAttrs)
+    const new_buttons_param = this.url_button_params.map(({ index, ...keepAttrs }) => keepAttrs)
     let attachment = {
       type: "wa_template",
       template: {
@@ -154,7 +258,8 @@ export class SendWhatsappTemplateModal implements OnInit {
         language: this.selected_template.language,
         params: {
           header: new_header_params,
-          body: new_body_params
+          body: new_body_params,
+          buttons: new_buttons_param
         }
       }
     }
@@ -167,12 +272,72 @@ export class SendWhatsappTemplateModal implements OnInit {
     this.viewCtrl.dismiss(data);
   }
 
+  onHeaderImageError(event) {
+    this.invalidUrl = true;
+    this.sendButtonDisabled = true;
+    event.target.src = this.header_component.example.header_handle[0];
+  }
+
+  onHeaderDocumentError(event) {
+    this.logger.log("ERROR EVENT CATCHED - onHeaderDocumentError");
+  }
+
+  // evaluate async
+  onFileSelected(e: any) {
+    this.displayFileUploaded = true;
+    this.fileUploadedName = e.target.files.item(0).name;
+    this.logger.log('[SEND-TEMPLATE-MODAL] on file selected -->', e)
+
+    this.uploadFile(e).then((file_url) => {
+      if (this.header_params[0].image) {
+        this.header_params[0].image.link = file_url;
+      }
+      if (this.header_params[0].document) {
+        this.header_params[0].document.link = file_url;
+        this.sanitizeUrl(file_url);
+      }
+      this.invalidUrl = false;
+    }).catch((err) => {
+      this.logger.log('[SEND-TEMPLATE-MODAL] unable to upload file -->', err)
+      this.displayFileUploaded = false;
+    })
+
+  }
+
+  private async uploadFile(e: any) {
+
+    return new Promise((resolve, reject) => {
+      // evaluate drop and paste cases other than change
+      let file = e.target.files.item(0);
+      const currentUpload = new UploadModel(file);
+      this.logger.log('[SEND-TEMPLATE-MODAL] currentUpload -->', currentUpload);
+      this.uploadService.upload(this.loggedUser.uid, currentUpload).then((downloadURL) => {
+        this.logger.log('[SEND-TEMPLATE-MODAL] downloadURL -->', downloadURL);
+        resolve(downloadURL);
+      }).catch((err) => {
+        this.logger.log('[SEND-TEMPLATE-MODAL] uploading error ', err);
+        reject(err);
+      })
+    })
+  }
+
+  removeHeaderFile() {
+    this.displayFileUploaded = false;
+    this.fileUploadedName = "";
+    this.header_params[0].url = "";
+    this.checkParameters();
+  }
+
   checkParameters() {
     this.sendButtonDisabled = true;
-    let header_result = this.header_params.find(p => !p.text || p.text == '')
-    let body_result = this.body_params.find(p => !p.text || p.text == '')
-    if (!header_result && !body_result) {
-      this.sendButtonDisabled = false;
+    let text_header_result = this.header_params.find(p => !p.text || p.text == '');
+    let media_header_result = this.header_params.find(p => (p.image && (!p.image.link || p.image.link == '')) || (p.document && (!p.document.link || p.document.link == '')) || (p.location && (!p.location.name || !p.location.address || !p.location.latitude || !p.location.longitude)));
+    let body_result = this.body_params.find(p => !p.text || p.text == '');
+
+    if ((!text_header_result || !media_header_result) && !body_result) {
+      if (this.invalidUrl === false) {
+        this.sendButtonDisabled = false;
+      }
     }
   }
 
@@ -180,4 +345,32 @@ export class SendWhatsappTemplateModal implements OnInit {
     this.viewCtrl.dismiss()
   }
 
+
+  // MAPS - START
+
+  displayMap() {
+    this.displayMapModal = true;
+    this.prensentTemplateModal();
+  }
+
+  private async prensentTemplateModal(): Promise<any> {
+    this.logger.log('[SEND-TEMPLATE-MODAL] openTemplateModal');
+    const attributes = {};
+    const modal: HTMLIonModalElement =
+      await this.modalController.create({
+        component: MapsPage,
+        componentProps: attributes,
+        swipeToClose: false,
+        backdropDismiss: true
+      })
+    modal.onDidDismiss().then((maps_detail: any) => {
+      this.logger.log('[SEND-TEMPLATE-MODAL] open map returned ', maps_detail);
+      this.header_params[0].location = maps_detail.data;
+      this.checkParameters();
+    });
+    return await modal.present();
+  }
+
+  // MAPS - END
+
 }

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

@@ -857,7 +857,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             null,
             conv.attributes['projectId'],
             conv.attributes['project_name'],
-            conv.attributes['channel']
+            conv.attributes['request_channel']
           )
 
         }
@@ -875,7 +875,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 null,
                 conv.attributes['projectId'],
                 conv.attributes['project_name'],
-                conv.attributes['channel']
+                conv.attributes['request_channel']
               )
               let duration = getDateDifference(conv.timestamp, Date.now())
               duration.days > 10 && conv.channel_type !== TYPE_DIRECT ? this.disableTextarea = true : this.disableTextarea = false
@@ -897,7 +897,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             null,
             conv.attributes['projectId'],
             conv.attributes['project_name'],
-            conv.attributes['channel']
+            conv.attributes['request_channel']
           )
           let duration = getDateDifference(conv.timestamp, Date.now())
           duration.days > 10 && conv.channel_type !== TYPE_DIRECT ? this.disableTextarea = true : this.disableTextarea = false
@@ -913,7 +913,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 null,
                 conv.attributes['projectId'],
                 conv.attributes['project_name'],
-                conv.attributes['channel']
+                conv.attributes['request_channel']
               )
             }
             this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar)
@@ -1072,7 +1072,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         msg = `[${metadata.name}](${metadata.src})`
       }
     }
-    this.conversation.attributes && this.conversation.attributes['request_channel'] ? attributes.channel = this.conversation.attributes['request_channel'] : null;
+    this.conversation.attributes && this.conversation.attributes['request_channel'] ? attributes.request_channel = this.conversation.attributes['request_channel'] : null;
     metadata ? (metadata = metadata) : (metadata = '')
     this.logger.log('[CONVS-DETAIL] attributes--->>>> 1111', this.conversation.attributes, attributes)
     this.logger.log('[CONVS-DETAIL] - SEND MESSAGE msg: ', msg, ' - messages: ', this.messages, ' - loggedUser: ', this.loggedUser)
@@ -1271,7 +1271,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         null,
         this.conversation.attributes['projectId'],
         this.conversation.attributes['project_name'],
-        this.conversation.attributes['channel']
+        this.conversation.attributes['request_channel']
       )
     }
     if (msg.attributes && msg.attributes.hasOwnProperty("updateUserEmail")) {
@@ -1284,7 +1284,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         userEmail,
         this.conversation.attributes['projectId'],
         this.conversation.attributes['project_name'],
-        this.conversation.attributes['channel']
+        this.conversation.attributes['request_channel']
       )
       this.getLeadDetail()
     }

package/src/assets/i18n/ar.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"قوالب WhatsApp",
     "SELECT_MESSAGE_TEMPLATE":"حدد قالب رسالة",
     "ERROR_WHATSAPP_NOT_INSTALLED":"قم بتثبيت Whatsapp من App Store لاستخدام القوالب",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"حدثت مشكلة أثناء الحصول على القوالب من whatsapp. أعد المحاولة لاحقًا!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"حدثت مشكلة أثناء الحصول على القوالب من whatsapp.\nتحقق من التكوين الخاص بك أو اتصل بالمسؤول."
   },
   "EMAIL":{
     "EMAIL_OFFLINE_TIP":"تحذير: المستخدم غير متصل! سيتم إرسال الرسالة عبر البريد الإلكتروني",

package/src/assets/i18n/az.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"WhatsApp şablonları",
     "SELECT_MESSAGE_TEMPLATE":"Mesaj şablonu seçin",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Şablonlardan istifadə etmək üçün App Store-dan Whatsapp-ı quraşdırın",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Whatsapp-dan şablonları əldə edərkən problem yarandı. Daha sonra yenidən cəhd edin!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Whatsapp-dan şablonları əldə edərkən problem yarandı.\nKonfiqurasiyanızı yoxlayın və ya administratorunuzla əlaqə saxlayın."
   },
   "EMAIL":{
     "EMAIL_OFFLINE_TIP":"Xəbərdarlıq: istifadəçi oflayndır! Mesaj e-poçt vasitəsilə göndəriləcək",

package/src/assets/i18n/de.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"WhatsApp-Vorlagen",
     "SELECT_MESSAGE_TEMPLATE":"Wählen Sie eine Nachrichtenvorlage aus",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Installieren Sie WhatsApp aus dem App Store, um Vorlagen zu verwenden",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Beim Abrufen von Vorlagen von WhatsApp ist ein Problem aufgetreten. Versuchen Sie es später noch einmal!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Beim Abrufen von Vorlagen von WhatsApp ist ein Problem aufgetreten.\nÜberprüfen Sie Ihre Konfiguration oder wenden Sie sich an Ihren Administrator."
   },
   "EMAIL":{
     "EMAIL_OFFLINE_TIP":"Achtung: Benutzer ist offline! Die Nachricht wird per E-Mail versendet",

package/src/assets/i18n/en.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"WhatsApp Templates",
     "SELECT_MESSAGE_TEMPLATE":"Select a message template",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Install Whatsapp from the App Store to use templates",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"A problem occurred while getting templates from whatsapp. Retry later!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"A problem occurred while getting templates from whatsapp.\nCheck your configuration or contact your administrator."
   },
   "EMAIL":{
     "EMAIL_OFFLINE_TIP":"Warning: user is offline! The message will be sent by email",

package/src/assets/i18n/es.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"Plantillas de WhatsApp",
     "SELECT_MESSAGE_TEMPLATE":"Seleccione una plantilla de mensaje",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Instale Whatsapp desde la App Store para usar plantillas",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Ocurrió un problema al obtener plantillas de WhatsApp. ¡Vuelve a intentarlo más tarde!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Ocurrió un problema al obtener plantillas de WhatsApp.\nVerifique su configuración o contacte a su administrador."
   },
   "EMAIL":{
     "EMAIL_OFFLINE_TIP":"Advertencia: ¡el usuario está desconectado! El mensaje será enviado por correo electrónico",

package/src/assets/i18n/fr.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"Modèles WhatsApp",
     "SELECT_MESSAGE_TEMPLATE":"Sélectionnez un modèle de message",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Installez Whatsapp depuis l'App Store pour utiliser des modèles",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Un problème est survenu lors de l'obtention des modèles de WhatsApp. Réessayez plus tard !"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Un problème est survenu lors de l'obtention des modèles de WhatsApp.\nVérifiez votre configuration ou contactez votre administrateur."
   },
   "EMAIL":{
     "EMAIL_OFFLINE_TIP":"Attention : l'utilisateur est hors ligne ! Le message sera envoyé par email",

package/src/assets/i18n/it.json

@@ -290,7 +290,7 @@
         "LABEL_WA_TEMPLATES":"WhatsApp Templates",
         "SELECT_MESSAGE_TEMPLATE":"Seleziona un template di messaggio",
         "ERROR_WHATSAPP_NOT_INSTALLED":"Installa Whatsapp dall'App Store per utilizzare i template",
-        "ERROR_WHATSAPP_GENERIC_ERROR":"Si è verificato un problema durante l'acquisizione dei template da whatsapp. Riprova più tardi!"
+        "ERROR_WHATSAPP_GENERIC_ERROR":"Si è verificato un problema durante il recupero dei modelli da whatsapp.\nControlla la tua configurazione o contatta il tuo amministratore."
     },
     "EMAIL":{
         "EMAIL_OFFLINE_TIP":"Attenzione: l'utente è offline! Il messaggio sarà mandato per email",

package/src/assets/i18n/kk.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"WhatsApp шаблондары",
     "SELECT_MESSAGE_TEMPLATE":"Хабарлама үлгісін таңдаңыз",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Үлгілерді пайдалану үшін App Store дүкенінен Whatsapp қолданбасын орнатыңыз",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Whatsapp-тан үлгілерді алу кезінде мәселе туындады. Әрекетті кейінірек қайталаңыз!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Whatsapp-тан үлгілерді алу кезінде ақаулық орын алды.\n Конфигурацияңызды тексеріңіз немесе әкімшіге хабарласыңыз."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Ескерту: пайдаланушы желіден тыс! Хабарлама электрондық пошта арқылы жіберіледі",

package/src/assets/i18n/pt.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"Modelos do WhatsApp",
     "SELECT_MESSAGE_TEMPLATE":"Selecione um modelo de mensagem",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Instale o Whatsapp da App Store para usar modelos",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Ocorreu um problema ao obter modelos do whatsapp. Tente novamente mais tarde!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Ocorreu um problema ao obter modelos do whatsapp.\nVerifique sua configuração ou entre em contato com seu administrador."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Aviso: o usuário está offline! A mensagem será enviada por e-mail",

package/src/assets/i18n/ru.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"Шаблоны WhatsApp",
     "SELECT_MESSAGE_TEMPLATE":"Выберите шаблон сообщения",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Установите Whatsapp из App Store, чтобы использовать шаблоны",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Возникла проблема при получении шаблонов из WhatsApp. Повторите попытку позже!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Возникла проблема при получении шаблонов из WhatsApp.\n Проверьте конфигурацию или обратитесь к администратору."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Внимание: пользователь не в сети! Сообщение будет отправлено по электронной почте",

package/src/assets/i18n/sr.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"ВхатсАпп шаблони",
     "SELECT_MESSAGE_TEMPLATE":"Изаберите шаблон поруке",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Инсталирајте Вхатсапп из Апп Сторе-а да бисте користили шаблоне",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Дошло је до проблема при преузимању шаблона из ВхатсАпп-а. Покушајте поново касније!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Дошло је до проблема при преузимању шаблона из ВхатсАпп-а.\n Проверите своју конфигурацију или се обратите администратору."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Упозорење: корисник није на мрежи! Порука ће бити послата е-поштом",

package/src/assets/i18n/sv.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"WhatsApp-mallar",
     "SELECT_MESSAGE_TEMPLATE":"Välj en meddelandemall",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Installera Whatsapp från App Store för att använda mallar",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Ett problem uppstod när mallar hämtades från WhatsApp. Försök igen senare!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Ett problem uppstod när mallar hämtades från WhatsApp.\nKontrollera din konfiguration eller kontakta din administratör."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Varning: användaren är offline! Meddelandet kommer att skickas via e-post",

package/src/assets/i18n/tr.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"WhatsApp Şablonları",
     "SELECT_MESSAGE_TEMPLATE":"Bir mesaj şablonu seçin",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Şablonları kullanmak için App Store'dan Whatsapp'ı yükleyin",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"WhatsApp'tan şablonlar alınırken bir sorun oluştu. Daha sonra tekrar deneyin!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"WhatsApp'tan şablonlar alınırken bir sorun oluştu.\nYapılandırmanızı kontrol edin veya yöneticinizle iletişime geçin."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Uyarı: kullanıcı çevrimdışı! Mesaj e-posta ile gönderilecek",

package/src/assets/i18n/uk.json

@@ -290,7 +290,7 @@
     "LABEL_WA_TEMPLATES":"Шаблони WhatsApp",
     "SELECT_MESSAGE_TEMPLATE":"Виберіть шаблон повідомлення",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Установіть Whatsapp з App Store, щоб використовувати шаблони",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Виникла проблема під час отримання шаблонів із WhatsApp. Спробуйте пізніше!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Виникла проблема під час отримання шаблонів із WhatsApp.\n Перевірте конфігурацію або зверніться до адміністратора."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Попередження: користувач офлайн! Повідомлення буде надіслано електронною поштою",

package/src/assets/i18n/uz.json

@@ -291,7 +291,7 @@
     "LABEL_WA_TEMPLATES":"WhatsApp shablonlar",
     "SELECT_MESSAGE_TEMPLATE":"Xabar shablonini tanlang",
     "ERROR_WHATSAPP_NOT_INSTALLED":"Shablonlardan foydalanish uchun App Store'dan Whatsapp-ni o'rnating",
-    "ERROR_WHATSAPP_GENERIC_ERROR":"Whatsapp’dan shablonlarni olishda muammo yuz berdi. Keyinroq qayta urining!"
+    "ERROR_WHATSAPP_GENERIC_ERROR":"Whatsapp’dan shablonlarni olishda muammo yuz berdi.\nKonfiguratsiyangizni tekshiring yoki administratoringizga murojaat qiling."
   },
   "EMAIL": {
     "EMAIL_OFFLINE_TIP":"Ogohlantirish: foydalanuvchi oflayn! Xabar elektron pochta orqali yuboriladi",

package/src/chat-config-template.json

@@ -36,5 +36,6 @@
     "wsUrlRel": "${WS_URL_RELATIVE}",
     "storage_prefix": "${CHAT_STORAGE_PREFIX}",
     "emailSection": "${EMAIL_SECTION}",
-    "whatsappTemplatesSection":"${WHATSAPP_TEMPLATES_SECTION}"
+    "whatsappTemplatesSection":"${WHATSAPP_TEMPLATES_SECTION}",
+    "googleMapsApiKey":"${GOOGLE_MAPS_APIKEY}"
 }

package/src/chat-config.json

@@ -36,5 +36,6 @@
     "writeToButton": false,
     "archivedButton": false,
     "emailSection": true,
-    "whatsappTemplatesSection":true
+    "whatsappTemplatesSection":true,
+    "googleMapsApiKey":"CHANGEIT"
 }

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -99,6 +99,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         }
         this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
             if (!err) {
+                this.logger.log('[MQTTConversationHandlerSERVICE] message lastMessages:', messages);
                 messages.sort(compareValues('timestamp', 'asc'));
                 messages.forEach(message => {
                     const msg: MessageModel = message;        

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

@@ -573,13 +573,13 @@ export function setConversationAvatar(
   conversationWithEmail?: string,
   projectId?: string,
   project_name?: string,
-  channel?: string,
+  request_channel?: string,
   width?: string,
   height?: string,
 ): any {
   const conversationWidth = (width) ? width : '40px';
   const conversationHeight = (height) ? height : '40px';
-  const conversationChannel = (channel) ? channel : 'chat21';
+  const conversationChannel = (request_channel) ? request_channel : 'chat21';
 
   const conversationAvatar = {
     uid: conversationWith,
@@ -591,7 +591,7 @@ export function setConversationAvatar(
     color: getColorBck(conversationWithFullname),
     projectId: projectId,
     project_name: project_name,
-    channel: conversationChannel,
+    request_channel: conversationChannel,
     width: conversationWidth,
     height: conversationHeight
   };

package/src/index.html

@@ -11,7 +11,8 @@
 
   <!-- <meta name="color-scheme" content="light dark" /> disable dark mode: Note in theme/variable.scss is also commented all the code that referts to dark-mode -->
   <meta name="color-scheme" content="light" />
-  <meta name="viewport" content="width=device-width, height=device-height ,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+  <meta name="viewport"
+    content="width=device-width, height=device-height ,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
   <meta name="format-detection" content="telephone=no" />
   <meta name="msapplication-tap-highlight" content="no" />