@chat21/chat21-web-widget 5.1.0-rc.4 → 5.1.0-rc10

package/CHANGELOG.md

@@ -6,13 +6,29 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
-# 5.1.0-rc.4
+# 5.1.0-rc10
+- **bug-fixed**: minor fix allowed urls
+
+# 5.1.0-rc9
+- **bug-fixed**: minor fix allowed urls
+
+# 5.1.0-rc8
+- **added**: ability to filter on urls attached to message textarea 
+
+# 5.1.0-rc7
+- **added**: ability to allows emoji after message is sent
+
+# 5.1.0-rc6
+- **removed**: hideRestartConversationOptionsMenu
+
+# 5.1.0-rc5
+# 5.1.0-rc4
 - **bug-fixed**: Dockerfile for angular 18
 
-# 5.1.0-rc.3
+# 5.1.0-rc3
 - **added**: angular 18
 
-# 5.1.0-rc.2
+# 5.1.0-rc2
 - **added**: angular 17
 
 # 5.0.96

package/Dockerfile

@@ -1,7 +1,7 @@
 ### STAGE 1: Build ###
 
 # We label our stage as ‘builder’
-FROM node:18.19.1-alpine3.18 as builder
+FROM node:20.12.2-alpine3.19 as builder
 
 COPY package.json package-lock.json ./
 
@@ -15,7 +15,7 @@ COPY . .
 
 ## Build the angular app in production mode and store the artifacts in dist folder
 
-RUN npm run ng build -- --configuration="prod" --output-path=dist --base-href="./" --output-hashing=none
+RUN npx ng build --configuration="prod" --output-path=dist --base-href=./ --output-hashing=none
 
 
 ### STAGE 2: Setup ###
@@ -29,7 +29,7 @@ COPY nginx.conf /etc/nginx/nginx.conf
 RUN rm -rf /usr/share/nginx/html/*
 
 ## From ‘builder’ stage copy over the artifacts in dist folder to default nginx public folder
-COPY --from=builder /ng-app/dist /usr/share/nginx/html
+COPY --from=builder /ng-app/dist/browser /usr/share/nginx/html
 
 RUN echo "Chat21 Web Widget Started!!"
 

package/deploy_beta.sh

@@ -1,10 +1,21 @@
 # npm version prerelease --preid=beta
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
+echo "____________WIDGET-V5______________"
+echo "CREATING TAG ON GIT FOR version: $version"
+
+# Get curent branch name
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+remote_name=$(git config --get branch.$current_branch.remote)
+
+## Push commit to git
+git add .
+git commit -m "version added: ### $version"
+git push "$remote_name" "$current_branch"
 
 if [ "$version" != "" ]; then
     git tag -a "$version" -m "`git log -1 --format=%s`"
     echo "Created a new tag, $version"
-    git push remoteTiledesk --tags
+    git push --tags
     npm publish
 fi

package/deploy_prod.sh

@@ -1,12 +1,21 @@
-# npm version patch
+# npm version prerelease --preid=beta
 version=`node -e 'console.log(require("./package.json").version)'`
-ECHO "____________WIDGET-V5______________"
+echo "version $version"
+echo "____________WIDGET-V5______________"
 echo "CREATING TAG ON GIT FOR version: $version"
-# echo "version $version"
+
+# Get curent branch name
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+remote_name=$(git config --get branch.$current_branch.remote)
+
+## Push commit to git
+git add .
+git commit -m "version added: ### $version"
+git push "$remote_name" "$current_branch"
 
 if [ "$version" != "" ]; then
     git tag -a "$version" -m "`git log -1 --format=%s`"
     echo "Created a new tag, $version"
-    git push remoteTiledesk --tags
+    git push --tags
     npm publish
 fi

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.1.0-rc.4",
+  "version": "5.1.0-rc10",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

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

@@ -15,7 +15,6 @@
         [hideHeaderCloseButton]="g?.hideHeaderCloseButton"
         [hideHeaderBackButton]="g?.singleConversation"
         [hideCloseConversationOptionMenu]="(isConversationArchived || g?.hideCloseConversationOptionMenu)"
-        [hideRestartConversationOptionsMenu]="(isConversationArchived || (!g?.singleConversation && !hideTextAreaContent) || g?.hideRestartConversationOptionsMenu)"
         [hideHeaderConversationOptionsMenu]="g?.hideHeaderConversationOptionsMenu"
         [hideSignOutOptionMenu]="(!g?.singleConversation || !g?.showLogoutOption)"
         [hideChatDetailOptionMenu]="(!g?.isDevMode)"
@@ -113,7 +112,7 @@
             [attributes]="g?.attributes"
             [senderId]="senderId"
             [tenant]="g?.tenant"
-            [projectid]="g?.projectid"
+            [project]="g?.project"
             [channelType]="g?.channelType"
             [userFullname]="g?.userFullname"
             [userEmail]="g?.userEmail"

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

@@ -231,7 +231,9 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       'LABEL_PLACEHOLDER',
       'GUEST_LABEL',
       'LABEL_START_NW_CONV',
-      'CONTINUE'
+      'CONTINUE',
+      'EMOJI_NOT_ELLOWED',
+      'DOMAIN_NOT_ALLOWED'
     ];
 
     const keysContent = [

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.html

@@ -1,7 +1,23 @@
-<!-- LOGO-->
-<div id="hiddenFooter" *ngIf="!hideTextAreaContent && poweredBy" class="fade-in-bottom" 
-    [class.hideTextReply]="hideTextReply">
-    <div tabindex="-1" class="c21-powered-by" [innerHTML]="poweredBy" (click)="managePoweredBy($event)"></div>
+<div class="footerContainerAlert">
+    <!-- LOGO-->
+    <div id="hiddenFooter" *ngIf="!hideTextAreaContent && poweredBy" class="fade-in-bottom" [class.hideTextReply]="hideTextReply">
+        <div tabindex="-1" class="c21-powered-by" [innerHTML]="poweredBy" (click)="managePoweredBy($event)"></div>
+    </div>
+
+    <!-- ALERT EMOJI & URLS -->
+    <div id="textAlert" *ngIf="!hideTextAreaContent && showAlertEmoji" class="fade-in-bottom" [class.hideTextReply]="hideTextReply">
+        <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" version="1.1" viewBox="0 0 110 135">
+            <path d="M55,25.8c-23,0-41.7,18.7-41.7,41.7s18.7,41.7,41.7,41.7,41.7-18.7,41.7-41.7-18.7-41.7-41.7-41.7ZM55,91.5c-3.4,0-6.2-2.8-6.2-6.2s2.8-6.2,6.2-6.2,6.2,2.8,6.2,6.2-2.8,6.2-6.2,6.2ZM60.3,70.1c-.2,2.8-2.5,4.9-5.3,4.9s-5.1-2.2-5.3-4.9l-1.6-22.3c-.3-4,2.9-7.4,6.9-7.4s7.2,3.4,6.9,7.4l-1.6,22.3Z"/>
+          </svg>
+        <div tabindex="-1" class="alertText">{{translationMap.get('EMOJI_NOT_ELLOWED')}}</div>
+    </div>
+
+    <div id="textAlert" *ngIf="!hideTextAreaContent && showAlertUrl" class="fade-in-bottom" [class.hideTextReply]="hideTextReply">
+        <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" version="1.1" viewBox="0 0 110 135">
+            <path d="M55,25.8c-23,0-41.7,18.7-41.7,41.7s18.7,41.7,41.7,41.7,41.7-18.7,41.7-41.7-18.7-41.7-41.7-41.7ZM55,91.5c-3.4,0-6.2-2.8-6.2-6.2s2.8-6.2,6.2-6.2,6.2,2.8,6.2,6.2-2.8,6.2-6.2,6.2ZM60.3,70.1c-.2,2.8-2.5,4.9-5.3,4.9s-5.1-2.2-5.3-4.9l-1.6-22.3c-.3-4,2.9-7.4,6.9-7.4s7.2,3.4,6.9,7.4l-1.6,22.3Z"/>
+          </svg>
+        <div tabindex="-1" class="alertText">{{translationMap.get('DOMAIN_NOT_ALLOWED')}}</div>
+    </div>
 </div>
 
 <!-- TEXTAREA + ICONS: conv active-->
@@ -44,7 +60,7 @@
 
 
 
-    <div *ngIf="!isStopRec" class="visible-text-area"  [class.disabled] = "( isConversationArchived || hideTextReply)? true : null">
+    <div *ngIf="!isStopRec" class="visible-text-area" [class.hasError]="showAlertEmoji || showAlertUrl" [class.disabled] = "( isConversationArchived || hideTextReply)? true : null">
         <!-- isFilePendingToUpload || -->
       <textarea 
         [attr.disabled] = "(hideTextReply)? true : null"
@@ -67,7 +83,7 @@
     </div>
 
     <!-- ICON SEND -->
-    <div *ngIf="(textInputTextArea !== '' && !isStopRec) || !showAudioRecorderFooterButton" tabindex="-1" class="chat21-textarea-button" [class.active]="textInputTextArea && !hideTextReply" id="chat21-button-send" (click)="onSendPressed($event)">
+    <div *ngIf="(textInputTextArea !== '' && !isStopRec) || !showAudioRecorderFooterButton" tabindex="-1" class="chat21-textarea-button" [class.disabled]="showAlertEmoji || showAlertUrl" [class.active]="textInputTextArea && !hideTextReply" id="chat21-button-send" (click)="onSendPressed($event)">
         <span class="v-align-center">
             <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  height="24" width="24" viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
                 <path d="M1.8,18.9V1.7L22,10.3L1.8,18.9z M3.9,15.6l12.6-5.4L3.9,4.9v3.7l6.4,1.6l-6.4,1.6V15.6z M3.9,15.6V4.9v7V15.6z"/>

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.scss

@@ -39,6 +39,9 @@
     &.disabled {
         background-color: rgb(232, 233, 237);
     }
+    &.hasError{
+        box-shadow: 0 0 0 1px var(--chat-footer-border-color-error) inset;
+    }
 }
 
 .chat21-textarea-button {
@@ -52,6 +55,12 @@
         opacity: 1;
         cursor: pointer;
     }
+    &.disabled{
+        opacity: 0.3 !important;
+        pointer-events: none !important;
+        cursor: not-allowed !important;
+
+    }
 }
 
 .chat21-textarea-button span svg:hover {
@@ -273,16 +282,18 @@ textarea:active{
 
 }
 
+.footerContainerAlert{
+    position: relative;
+}
 
 #hiddenFooter{
-    // position: absolute;
+    position: absolute;
     bottom: 100%;
     width: 100%;
     height: var(--chat-footer-logo-height);
     display: flex;
     align-items: center;
     justify-content: center;
-    // position: absolute;
     // box-shadow: inset 0px -22px 16px -15px rgba(0,0,0,0.1);
     &.hideTextReply{
         height: var(--chat-footer-height);
@@ -344,6 +355,37 @@ textarea:active{
     }
 }
 
+#textAlert{
+    bottom: 100%;
+    width: 100%;
+    height: var(--chat-footer-logo-height);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--content-background-color);
+    position: absolute;
+    svg{
+        fill: var(--chat-footer-border-color-error);
+    }
+    // box-shadow: inset 0px -22px 16px -15px rgba(0,0,0,0.1);
+    div.alertText{
+        color: var(--dark-gray);
+        font-size: 1.2em;
+        font-weight: 500;
+        line-height: 22px;
+        font-family: Mulish, sans-serif;
+        letter-spacing: 0.24px;
+        -webkit-font-smoothing: antialiased;
+        padding: 4px 12px;
+        color: var(--chat-footer-border-color-error);
+    }
+    &.hideTextReply{
+        height: var(--chat-footer-height);
+        position: unset;
+        box-shadow: none;
+    }
+}
+
 .fade-in-bottom {
     -webkit-animation: fade-in-bottom 0.5s cubic-bezier(0.600, -0.280, 0.735, 0.045) 0.0s;
     animation: fade-in-bottom 0.5s cubic-bezier(0.600, -0.280, 0.735, 0.045) 0.0s;
@@ -367,4 +409,4 @@ textarea:active{
     // left: 10px;
     border: none;
     margin: -2px -2px 0px;
-}
+}

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.ts

@@ -10,8 +10,9 @@ import { UploadService } from 'src/chat21-core/providers/abstract/upload.service
 import { ChatManager } from 'src/chat21-core/providers/chat-manager';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { TYPE_MSG_FILE, TYPE_MSG_IMAGE, TYPE_MSG_TEXT } from 'src/chat21-core/utils/constants';
-import { convertColorToRGBA } from 'src/chat21-core/utils/utils';
-import { isImage } from 'src/chat21-core/utils/utils-message';
+import { convertColorToRGBA, isAllowedUrlInText, isEmoji } from 'src/chat21-core/utils/utils';
+import { findAndRemoveEmoji, isImage } from 'src/chat21-core/utils/utils-message';
+import { ProjectModel } from 'src/models/project';
 
 @Component({
   selector: 'chat-conversation-footer',
@@ -24,7 +25,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
   @Input() attributes: string;
   @Input() senderId: string;
   @Input() tenant: string;
-  @Input() projectid: string;
+  @Input() project: ProjectModel;
   @Input() channelType: string;
   @Input() userFullname: string;
   @Input() userEmail: string;
@@ -81,10 +82,12 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
     include: [ 'recent', 'people', 'nature', 'activity', 'flags']
   }
 
+  showAlertEmoji: boolean = false
+  showAlertUrl: boolean = false;
+
   convertColorToRGBA = convertColorToRGBA;
   private logger: LoggerService = LoggerInstance.getInstance()
-  constructor(public g: Globals,
-              private chatManager: ChatManager,
+  constructor(private chatManager: ChatManager,
               private typingService: TypingService,
               private uploadService: UploadService) { }
 
@@ -253,7 +256,6 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
       //     return snapshot.ref.getDownloadURL();   // Will return a promise with the download link
       // }).then(downloadURL => {
       //     that.logger.log('[CONV-FOOTER] AppComponent::uploadSingle:: downloadURL', downloadURL]);
-      //     that.g.wdLog([`Successfully uploaded file and got download link - ${downloadURL}`]);
 
       //     metadata.src = downloadURL;
       //     let type_message = TYPE_MSG_TEXT;
@@ -321,6 +323,13 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
     (metadata) ? metadata = metadata : metadata = '';
     this.onEmojiiPickerShow.emit(false)
     this.logger.log('[CONV-FOOTER] SEND MESSAGE: ', msg, type, metadata, additional_attributes);
+
+
+    let checkUrlDomain = this.checkForUrlDomain(this.textInputTextArea)
+    if(!checkUrlDomain){
+      return
+    }
+
     if (msg && msg.trim() !== '' || type === TYPE_MSG_IMAGE || type === TYPE_MSG_FILE ) {
 
       // msg = htmlEntities(msg);
@@ -345,7 +354,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
         // fine-sponziello
       // this.conversationHandlerService = this.chatManager.getConversationHandlerByConversationId(this.conversationWith)
       const senderId = this.senderId;
-      const projectid = this.projectid;
+      const projectid = this.project.id;
       const channelType = this.channelType;
       const userFullname = this.userFullname;
       const userEmail = this.userEmail;
@@ -514,11 +523,49 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
     //}, false);
   }
 
+
+  checkForEmojii(text){
+    //remove emojii only if "emojii" exist and is set to false
+    if(this.project && this.project.settings?.allow_send_emoji === false){
+      this.showAlertEmoji = isEmoji(text);
+      if(this.showAlertEmoji){
+        return false
+      }
+      this.showAlertEmoji = false;
+      return true
+    }
+    this.showAlertEmoji = false;
+    return true
+  }
+
+  checkForUrlDomain(text){
+    if(this.project && this.project.settings?.allowed_urls === true){
+      this.showAlertUrl = !isAllowedUrlInText(text, this.project.settings?.allowed_urls_list);
+      if(this.showAlertUrl){
+        return false
+      }
+      this.showAlertUrl = false
+      return true
+    }
+    this.showAlertUrl = false
+    return true
+
+
+  }
+
   
 
   onTextAreaChange(){
     this.resizeInputField()
     this.setWritingMessages(this.textInputTextArea)
+
+    //reset alert to defalt values before checking again
+    this.showAlertEmoji= false;
+    this.showAlertUrl = false;
+    let check = this.checkForEmojii(this.textInputTextArea)
+    if(!check){
+      return;
+    }
   }
 
   onSendPressed(event) {
@@ -587,6 +634,12 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
 
   addEmoji(event){
     this.onEmojiiPickerShow.emit(false); //de-activate emojii picker on select
+
+    let check = this.checkForEmojii(this.textInputTextArea)
+    if(!check){
+      return;
+    }
+
     this.textInputTextArea = this.textInputTextArea.trimStart() + event.emoji.native + " "
     this.setFocusOnId('chat21-main-message-context')
   }
@@ -632,7 +685,6 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
    * @param str
    */
   setWritingMessages(str) {
-    //this.messagingService.setWritingMessages(str, this.g.channelType);
     this.typingService.setTyping(this.conversationWith, str, this.senderId, this.userFullname )
   }
 

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

@@ -112,7 +112,7 @@
 
 
     <!-- ICON RESTART CONVERSATION -->
-    <div class="c21-header-button c21-right"  *ngIf="!hideRestartConversationOptionsMenu" (click)="restartChat()">
+    <!-- <div class="c21-header-button c21-right"  *ngIf="!hideRestartConversationOptionsMenu" (click)="restartChat()">
         <svg role="img" id="refresh" aria-labelledby="altIconTitle" class="icon-menu" xmlns="http://www.w3.org/2000/svg" 
             width="20px" height="20px" viewBox="0 0 20 20">
             <path d="M9.6,18.2c0.6,0,1-0.7,1-1.5s-0.5-1.5-1-1.5H6c-0.6,0-1-0.7-1-1.5V7.8h1c0.4,0,0.8-0.4,1-0.9c0.2-0.6,0.1-1.2-0.2-1.6  l-2.1-3c-0.4-0.6-1.1-0.6-1.5,0l-2.1,3C0.9,5.7,0.8,6.3,1,6.9s0.5,0.9,1,0.9h1v5.9c0,2.5,1.4,4.4,3.1,4.4H9.6z"/>
@@ -120,7 +120,7 @@
             <title id="altIconTitle">{{ translationMap?.get('RESTART') }}</title>
         </svg>
         <span class="label-menu-item">{{ translationMap?.get('RESTART') }}</span>
-    </div>
+    </div> -->
     
     <!-- ICON MAXIMIZE -->
     <!-- <div class="c21-header-button c21-right" *ngIf="heightStatus==='min'" (click)="maximizeMinimize('max')">

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

@@ -23,7 +23,6 @@ export class ConversationHeaderComponent implements OnInit, OnChanges {
   @Input() typingLocation: string;
   @Input() isTrascriptDownloadEnabled: boolean;
   @Input() hideCloseConversationOptionMenu: boolean;
-  @Input() hideRestartConversationOptionsMenu: boolean;
   @Input() hideHeaderCloseButton: boolean;
   @Input() hideHeaderBackButton: boolean;
   @Input() hideHeaderConversationOptionsMenu: boolean;

package/src/app/component/message/audio/audio.component.ts

@@ -1,5 +1,7 @@
 import { Component, ElementRef, AfterViewInit, Input, ViewChild } from '@angular/core';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { convertColorToRGBA } from 'src/chat21-core/utils/utils';
 
 @Component({
@@ -26,13 +28,13 @@ export class AudioComponent implements AfterViewInit {
   currentTime: number = 0;
   isPlaying: boolean = false;
 
+  private logger: LoggerService = LoggerInstance.getInstance();
   constructor(
     private sanitizer: DomSanitizer,
     private elementRef: ElementRef
   ) {}
 
   ngAfterViewInit() {
-    console.log('stylesssss', this.stylesMap)
     if (this.audioBlob) {
       this.rawAudioUrl = URL.createObjectURL(this.audioBlob);
       this.audioUrl = this.sanitizer.bypassSecurityTrustUrl(this.rawAudioUrl);
@@ -136,21 +138,33 @@ export class AudioComponent implements AfterViewInit {
     return `${minutes}:${sec < 10 ? '0' + sec : sec}`;
   }
 
-  getAudioDuration() {
-    const audio = new Audio();
-    audio.src = this.rawAudioUrl!;
-    audio.addEventListener('loadedmetadata', () => {
-      if (audio.duration === Infinity) {
-        audio.currentTime = Number.MAX_SAFE_INTEGER;
-        audio.ontimeupdate = () => {
-          audio.ontimeupdate = null; 
-          audio.currentTime = 0;
-          this.audioDuration = audio.duration;
-        };
-      } else {
-        this.audioDuration = audio.duration;
-      }
-    });
+  async getAudioDuration() {
+    // const audio = new Audio();
+    // audio.src = this.rawAudioUrl!;
+    // audio.addEventListener('loadedmetadata', () => {
+    //   if (audio.duration === Infinity) {
+    //     audio.currentTime = Number.MAX_SAFE_INTEGER;
+    //     audio.ontimeupdate = () => {
+    //       audio.ontimeupdate = null; 
+    //       audio.currentTime = 0;
+    //       this.audioDuration = audio.duration;
+    //     };
+    //   } else {
+    //     this.audioDuration = audio.duration;
+    //   }
+    // });
+
+    const response = await fetch(this.rawAudioUrl!);
+    this.logger.debug('getAudioDuration: response ---> ', response)
+    const arrayBuffer = await response.arrayBuffer();
+    this.logger.debug('getAudioDuration: arrayBuffer ---> ', arrayBuffer)
+    const audioContext = new (window.AudioContext || (window as any).webkitAudioContext)();
+    this.logger.debug('getAudioDuration: audioContext ---> ', audioContext)
+    const audioBuffer = await audioContext.decodeAudioData(arrayBuffer);
+    this.logger.debug('getAudioDuration: audioBuffer ---> ', audioBuffer)
+    this.audioDuration = audioBuffer.duration;
+    this.logger.debug('getAudioDuration: audioDuration ---> ', this.audioDuration)
+
   }
 
   extractFirstColor(gradient: string): string | null {

package/src/app/providers/global-settings.service.ts

@@ -93,6 +93,7 @@ export class GlobalSettingsService {
                     project['trialDaysLeft'],
                     project['trialExpired'],
                     project['updatedAt'],
+                    project['settings'],
                     project['versions']
                 );
             }
@@ -865,11 +866,6 @@ export class GlobalSettingsService {
         if (TEMP !== undefined) {
             globals.hideCloseConversationOptionMenu = (TEMP === true) ? true : false;;
         }
-        TEMP = tiledeskSettings['hideRestartConversationOptionsMenu'];
-        // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > hideHeaderConversationOptionsMenu:: ', TEMP]);
-        if (TEMP !== undefined) {
-            globals.hideRestartConversationOptionsMenu = (TEMP === true) ? true : false;;
-        }
         TEMP = tiledeskSettings['hideHeaderConversationOptionsMenu'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > hideHeaderConversationOptionsMenu:: ', TEMP]);
         if (TEMP !== undefined) {
@@ -1240,10 +1236,6 @@ export class GlobalSettingsService {
         if (TEMP !== null) {
             this.globals.hideCloseConversationOptionMenu = TEMP;
         }
-        TEMP = el.nativeElement.getAttribute('hideRestartConversationOptionsMenu');
-        if (TEMP !== null) {
-            this.globals.hideRestartConversationOptionsMenu = TEMP;
-        }
         TEMP = el.nativeElement.getAttribute('hideSettings');
         if (TEMP !== null) {
             this.globals.hideSettings = TEMP;
@@ -1637,11 +1629,6 @@ export class GlobalSettingsService {
             globals.hideCloseConversationOptionMenu = stringToBoolean(TEMP); 
         }
 
-        TEMP = getParameterByName(windowContext, 'tiledesk_hideRestartConversationOptionsMenu');
-        if (TEMP) {
-            globals.hideRestartConversationOptionsMenu = stringToBoolean(TEMP); 
-        }
-
         TEMP = getParameterByName(windowContext, 'tiledesk_hideSettings');
         if (TEMP) {
             globals.hideSettings = stringToBoolean(TEMP); 

package/src/app/sass/_variables.scss

@@ -31,8 +31,13 @@
     --chat-footer-border-radius: 16px;
     --chat-footer-background-color: #f6f7fb;
     --chat-footer-color: #1a1a1a;
+    --chat-footer-border-color-error: #aa0404;
 
-    --icon-fill-color: #5f6368
+    --icon-fill-color: #5f6368;
+
+
+    --content-background-color: #fff;
+    --content-text-color: var(--black);
 }
 
 $trasp-black:rgba(0,0,0,0.8);

package/src/app/utils/globals.ts

@@ -163,7 +163,6 @@ export class Globals {
   openExternalLinkButton: boolean;
   hideHeaderConversationOptionsMenu: boolean;
   hideCloseConversationOptionMenu: boolean;
-  hideRestartConversationOptionsMenu: boolean;
   hideSettings: boolean;
   filterByRequester: boolean;
   persistence;
@@ -337,8 +336,6 @@ export class Globals {
     /** enable to close a conversation from upper-right header menu  */
     this.hideCloseConversationOptionMenu = false;
     /** enable to hide/show options menu in conversation detail header */
-    this.hideRestartConversationOptionsMenu = false;
-    /** enable to hide/show options menu in conversation detail header */
     this.hideSettings = false;
     /** enable to hide/show options menu in home component */
     this.filterByRequester = false;
@@ -528,7 +525,7 @@ export class Globals {
       'fullscreenMode': this.fullscreenMode,
       'filterByRequester': this.filterByRequester,
       'hideHeaderConversationOptionsMenu': this.hideHeaderConversationOptionsMenu, 'hideHeaderCloseButton': this.hideHeaderCloseButton,
-      'hideCloseConversationOptionMenu': this.hideCloseConversationOptionMenu, 'hideRestartConversationOptionsMenu': this.hideRestartConversationOptionsMenu,
+      'hideCloseConversationOptionMenu': this.hideCloseConversationOptionMenu,
       'hideSettings': this.hideSettings,
       'isLogEnabled': this.isLogEnabled,
       'isOpen': this.isOpen, 'isShown': this.isShown,

package/src/app/utils/utils.ts

@@ -200,15 +200,6 @@ export function avatarPlaceholder(name: string) {
   return initials;
 }
 
-export function isEmoji(str: string) {
-  // tslint:disable-next-line:max-line-length
-  const ranges = ['(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c[\ude32-\ude3a]|[\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])'];
-  if (str.match(ranges.join('|'))) {
-      return true;
-  } else {
-      return false;
-  }
-}
 
 export function setColorFromString(str: string) {
   const arrayBckColor = ['#fba76f', '#80d066', '#73cdd0', '#ecd074', '#6fb1e4', '#f98bae'];

package/src/assets/i18n/en.json

@@ -91,5 +91,7 @@
 
     "LABEL_PREVIEW": "Preview",
     "SWITCH_TO": "Or switch to:",
-    "CONNECTION_NETWORK_ERROR": "Our apologies. There was some trouble connecting to network"
+    "CONNECTION_NETWORK_ERROR": "Our apologies. There was some trouble connecting to network",
+    "EMOJI_NOT_ELLOWED":"Emoji not allowed",
+    "DOMAIN_NOT_ALLOWED":"URL contains a non-allowed domain"
 }

package/src/assets/twp/chatbot-panel.html

@@ -613,7 +613,7 @@
                     var brandJson = JSON.parse(xhr.response)
                     if(brandJson){
                         /** TITLE AND FAVICON **/
-                        brandJson['WIDGET'].META_TITLE? document.body.title = brandJson['WIDGET'].META_TITLE : null;
+                        brandJson['WIDGET'].META_TITLE? document.title = brandJson['WIDGET'].META_TITLE : null;
                         brandJson['WIDGET'].FAVICON_URL?  document.querySelector("link[rel~='icon']").setAttribute('href', brandJson['WIDGET'].FAVICON_URL) : null;
                         /** FOOTER-LOGO **/
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('footer-logo').src = brandJson['COMMON'].COMPANY_LOGO : null;
@@ -624,6 +624,13 @@
                         brandJson['COMMON'].BRAND_PRIMARY_COLOR? document.body.style.setProperty('--base-company-logo', brandJson['COMMON'].BRAND_PRIMARY_COLOR): null;
                         /** IFRAME TITLE**/
                         brandJson['COMMON'].COMPANY_NAME? document.getElementById('tiledeskiframe').title = brandJson['COMMON'].COMPANY_NAME + ' Widget' : null;
+                        /** META sharing ELEMENTS */
+                        if(brandJson['WIDGET'].META_SHARE_INFO && Object.keys(brandJson['WIDGET'].META_SHARE_INFO).length > 0){
+                            Object.keys(brandJson['WIDGET'].META_SHARE_INFO).forEach(key => {
+                                var meta = document.querySelector("meta[property^='og:"+key.toLowerCase()+"']");
+                                meta.setAttribute('content', brandJson['WIDGET'].META_SHARE_INFO[key])
+                            })
+                        }
                     }
                 }
                     

package/src/assets/twp/index-dev.html

@@ -719,7 +719,7 @@
                     var brandJson = JSON.parse(xhr.response)
                     if(brandJson){
                         /** TITLE AND FAVICON **/
-                        brandJson['WIDGET'].META_TITLE? document.body.title = brandJson['WIDGET'].META_TITLE : null;
+                        brandJson['WIDGET'].META_TITLE? document.title = brandJson['WIDGET'].META_TITLE : null;
                         brandJson['WIDGET'].FAVICON_URL?  document.querySelector("link[rel~='icon']").setAttribute('href', brandJson['WIDGET'].FAVICON_URL) : null;
                         /** FOOTER-LOGO **/    
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('footer-logo').src = brandJson['COMMON'].COMPANY_LOGO : null;
@@ -737,6 +737,13 @@
                         }
                         /** IFRAME TITLE**/
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('tiledeskiframe').title = brandJson['COMMON'].COMPANY_NAME + ' Widget' : null;
+                        /** META sharing ELEMENTS */
+                        if(brandJson['WIDGET'].META_SHARE_INFO && Object.keys(brandJson['WIDGET'].META_SHARE_INFO).length > 0){
+                            Object.keys(brandJson['WIDGET'].META_SHARE_INFO).forEach(key => {
+                                var meta = document.querySelector("meta[property^='og:"+key.toLowerCase()+"']");
+                                meta.setAttribute('content', brandJson['WIDGET'].META_SHARE_INFO[key])
+                            })
+                        }
                     }
                 }
             }
@@ -1263,13 +1270,6 @@
             window.Tiledesk('restart')
         }
 
-        function onClickHideRestartConversationOptionsMenu(){
-            let status = document.querySelector('input[name="hideRestartConversationOptionsMenu"]:checked').value
-            window.tiledeskSettings['hideRestartConversationOptionsMenu'] = stringToBoolean(status)
-            console.log('onClickHideRestartConversationOptionsMenu:', window.tiledeskSettings)
-            window.Tiledesk('restart')
-        }
-
         function onClickAllowTranscriptDownload(){
             let status = document.querySelector('input[name="allowTranscriptDownload"]:checked').value
             window.tiledeskSettings['allowTranscriptDownload'] = stringToBoolean(status)
@@ -2277,16 +2277,6 @@
                                 <button class="btn btn-light" onclick="onClickHideCloseConversationOptionMenu()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
                             </div>
                         </div>
-                        <div class="row">
-                            <div class="col-md-5 formElement"><span><em><strong>hideRestartConversationOptionsMenu</strong></em></span></div>
-                            <div class="col-md-5">
-                                <input class="form-check-input" type="radio" name="hideRestartConversationOptionsMenu" value="true"><label>True</label>
-                                <input class="form-check-input" type="radio" name="hideRestartConversationOptionsMenu" value="false" checked><label >False</label>
-                            </div>
-                            <div class="col-md-2">
-                                <button class="btn btn-light" onclick="onClickHideRestartConversationOptionsMenu()">Test this setting <i class="fa fa-magic" aria-hidden="true"></i></button>
-                            </div>
-                        </div>
                         <div class="row">
                             <div class="col-md-5 formElement"><span><em><strong>allowTranscriptDownload</strong></em></span></div>
                             <div class="col-md-5">

package/src/assets/twp/index.html

@@ -6,7 +6,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> 
 
-    <title>Widget test page </title>
+    <title>Widget test page</title>
     <style>
 
         @-moz-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Firefox */
@@ -295,7 +295,10 @@
         window.Tiledesk('onBeforeInit', function(event_data) {
             console.log("onBeforeInit Tiledesk FN", event_data);
 
-            var brandSrc = event_data.detail.appConfigs.brandSrc? getBrandResources(event_data.detail.appConfigs.brandSrc) : null;
+            if(event_data.detail.appConfigs.brandSrc){
+                getBrandResources(event_data.detail.appConfigs.brandSrc)
+            }
+            // var brandSrc = event_data.detail.appConfigs.brandSrc?  : null;
 
             setTimeout(() => {
                 if(event_data && event_data.detail && event_data.detail.appConfigs){
@@ -408,7 +411,7 @@
                     var brandJson = JSON.parse(xhr.response)
                     if(brandJson){
                         /** TITLE AND FAVICON **/
-                        brandJson['WIDGET'].META_TITLE? document.body.title = brandJson['WIDGET'].META_TITLE : null;
+                        brandJson['WIDGET'].META_TITLE? document.title = brandJson['WIDGET'].META_TITLE : null;
                         brandJson['WIDGET'].FAVICON_URL?  document.querySelector("link[rel~='icon']").setAttribute('href', brandJson['WIDGET'].FAVICON_URL) : null;
                         /** FOOTER-LOGO **/    
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('footer-logo').src = brandJson['COMMON'].COMPANY_LOGO : null;
@@ -421,6 +424,13 @@
                         brandJson['COMMON'].DOCS? null: document.getElementById('share').style.display = 'none'
                         /** IFRAME TITLE**/
                         brandJson['COMMON'].COMPANY_LOGO? document.getElementById('tiledeskiframe').title = brandJson['COMMON'].COMPANY_NAME + ' Widget' : null;
+                        /** META sharing ELEMENTS */
+                        if(brandJson['WIDGET'].META_SHARE_INFO && Object.keys(brandJson['WIDGET'].META_SHARE_INFO).length > 0){
+                            Object.keys(brandJson['WIDGET'].META_SHARE_INFO).forEach(key => {
+                                var meta = document.querySelector("meta[property^='og:"+key.toLowerCase()+"']");
+                                meta.setAttribute('content', brandJson['WIDGET'].META_SHARE_INFO[key])
+                            })
+                        }
                     }
                     
                 }

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

@@ -194,9 +194,13 @@ export function isEmojii(message: any){
   // https://localcoder.org/javascript-detect-if-a-string-contains-only-unicode-emojis
   try {
     if(!message) return false;
+    // Removes all characters that are NOT emojis (unicode > \u1eeff)
     const onlyEmojis = message.replace(new RegExp('[\u0000-\u1eeff]', 'g'), '')
+    // Removes spaces, line breaks, and carriage returns from the string
     const visibleChars = message.replace(new RegExp('[\n\r\s]+|( )+', 'g'), '')
+    // Removes Chinese characters from the string
     const chineseChars = message.replace(new RegExp('[\u4e00-\u9fa5]', 'g'), '')
+    
     if(onlyEmojis === '' || visibleChars == '' || chineseChars=='') return false
     return (onlyEmojis.length === visibleChars.length && onlyEmojis.length <= 2)
   } catch(e) {
@@ -204,6 +208,22 @@ export function isEmojii(message: any){
   }
 }
 
+export function findAndRemoveEmoji(text): string{
+
+  if (!text) return text;
+
+  // Regex to find most unicode emojis
+  // Source: https://thekevinscott.com/emojis-in-javascript/
+  const emojiRegex = /([\u2700-\u27BF]|[\uE000-\uF8FF]|[\uD83C-\uDBFF][\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83D[\uDE00-\uDE4F])/g;
+
+  // Removes all found emojis
+  text = text.replace(emojiRegex, '');
+
+  // Removes any multiple spaces left by the removal of emojis
+  text = text.replace(/\s{2,}/g, ' ').trim();
+  return text
+}
+
 export function isJustRecived(startedAt, time) {
   if (time > startedAt) {
     return true;

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

@@ -579,4 +579,87 @@ function componentFromStr(numStr, percent) {
 
 
 
+// export function isAllowedUrlInText(text: string, allowedUrls: string[]): boolean {
+//   // Regex per trovare URL o domini nudi nel testo
+//   const urlRegex = /https?:\/\/[^\s]+|www\.[^\s]+|(?:\b[\w-]+\.)+[a-z]{2,}(\/[^\s]*)?/gi;
+//   const foundUrls = text.match(urlRegex);
+
+//   if (!foundUrls) {
+//     return true; // Nessun URL => testo ammesso
+//   }
+
+//   // Normalizza dominio: rimuove schema, www., slash finali
+//   const normalize = (url: string) =>
+//     url
+//       .replace(/^https?:\/\//i, '')
+//       .replace(/^www\./i, '')
+//       .replace(/\/$/, '')
+//       .toLowerCase();
+
+//   // Normalizza tutti gli allowed pattern per confronto
+//   const normalizedAllowedPatterns = allowedUrls.map(pattern =>
+//     pattern
+//       .replace(/^https?:\/\//i, '')
+//       .replace(/^www\./i, '')
+//       .replace(/\/$/, '')
+//       .toLowerCase()
+//       .replace(/\./g, '\\.')
+//       .replace(/\//g, '\\/')
+//       .replace(/\*/g, '.*')
+//   );
+
+//   return foundUrls.every(rawUrl => {
+//     const url = normalize(rawUrl);
+//     return normalizedAllowedPatterns.some(pattern => {
+//       const regex = new RegExp(`^${pattern}$`, 'i');
+//       return regex.test(url);
+//     });
+//   });
+// }
+
+export function isAllowedUrlInText(text: string, allowedUrls: string[]) {
+  const urlsInMessage = extractUrls(text);
+  console.log('urlsInMessage ++++ :', urlsInMessage);
+
+  const allowedPatterns = allowedUrls.map((url) => {
+    try {
+      // Prova a estrarre il dominio da una URL completa
+      const hostname = new URL(url).hostname.toLowerCase();
+      return hostname;
+    } catch {
+      // Lascia il dominio nudo (es: "*.tiledesk.com" o "tiledesk.com")
+      return url.toLowerCase();
+    }
+  });
+
+  const matchesAllowed = (domain: string) => {
+    return allowedPatterns.some((pattern) => {
+      if (pattern.startsWith('*.')) {
+        const base = pattern.replace(/^\*\./, '');
+        return domain === base || domain.endsWith('.' + base);
+      } else {
+        return domain === pattern;
+      }
+    });
+  };
+
+  const nonWhitelistedDomains = urlsInMessage.filter((url) => {
+    try {
+      const domain = new URL(url).hostname.toLowerCase();
+      return !matchesAllowed(domain);
+    } catch (e) {
+      return true; // Considera URL non valido come non ammesso
+    }
+  });
+
+  return nonWhitelistedDomains.length === 0;
+}
+
+function extractUrls(text: string): string[] {
+  const urlRegex = /https?:\/\/[^\s]+/g;
+  return text.match(urlRegex) || [];
+}
+
+
+
 

package/src/models/project.ts

@@ -24,7 +24,8 @@ export class ProjectModel {
         public color?: string,
         public welcomeTitle?: string,
         public welcomeMsg?: string,
-        public attributes?: IRules
+        public attributes?: IRules,
+        public settings?:{ [key: string]: any },
     ) { }
 
     initialize (
@@ -43,6 +44,7 @@ export class ProjectModel {
         trialDaysLeft?: number,
         trialExpired?: boolean,
         updatedAt?: string,
+        settings?: { [key: string]: any },
         versions?: string,
     ) {
         this.id = id;
@@ -60,6 +62,7 @@ export class ProjectModel {
         this.trialDaysLeft = trialDaysLeft;
         this.trialExpired = trialExpired;
         this.updatedAt = updatedAt;
+        this.settings = settings;
         this.versions = versions;
     }