@chat21/chat21-web-widget 5.0.46-rc.4 → 5.0.47-rc.1

package/package.json

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

package/src/app/app.component.scss

@@ -679,7 +679,9 @@ chat-root {
                 .c21-title {
                     position: absolute;
                     left: 0;
-                    display: inline-block;
+                    // display: inline-block;
+                    display: flex;
+                    align-items: center;
                     width: calc(100% - 200px);
                     height: 1.6em;
                     line-height: 1.6em;

package/src/app/app.component.ts

@@ -602,7 +602,10 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
         this.logger.debug('[APP-COMP]  ============ idConversation ===============', recipientId, this.g.recipientId);
         // this.g.recipientId = null;
         this.logger.debug('[APP-COMP] singleConversation conv da ...', this.g.recipientId)
-        if(this.g.recipientId && this.g.singleConversation){
+        if(this.g.restartConversation && this.g.singleConversation){
+            this.logger.debug('[APP-COMP] RESTART-CONVERSARION::: start a new conversations...', this.g.restartConversation)
+            this.onNewConversation();
+        }else if(this.g.recipientId && this.g.singleConversation){
             //start widget from current recipientId conversation
             this.logger.debug('[APP-COMP] singleConversation conv da API', this.g.recipientId)
             this.isOpenHome = false;
@@ -781,6 +784,9 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
         if (location.href) {
             attributes['sourcePage'] = location.href;
         }
+        if(document.title){
+            attributes['sourceTitle'] = document.title;
+        }
         if (projectid) {
             attributes['projectId'] = projectid;
         }

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

@@ -38,7 +38,8 @@
         position: absolute;
         left: 50px;
         right: 100px;
-        display: inline-block;
+        display: flex;
+        align-items: center;
         width: auto;
         height: 42px;
         padding: 0px;

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

@@ -25,7 +25,8 @@
                 position: absolute;
                 left: 50px;
                 right: 100px;
-                display: inline-block;
+                display: flex;
+                align-items: center;
                 width: auto;
                 height: 42px;
                 padding: 0px;

package/src/app/component/conversation-detail/conversation-internal-frame/conversation-internal-frame.component.scss

@@ -16,7 +16,8 @@
           position: absolute;
           left: 50px;
           right: 100px;
-          display: inline-block;
+          display: flex;
+          align-items: center;
           width: auto;
           height: 42px;
           padding: 0px;

package/src/app/component/list-all-conversations/list-all-conversations.component.scss

@@ -27,7 +27,8 @@
             position: absolute;
             left: 50px;
             right: 100px;
-            display: inline-block;
+            display: flex;
+            align-items: center;
             width: auto;
             height: 42px;
             padding: 0px;

package/src/app/component/message/return-receipt/return-receipt.component.scss

@@ -9,6 +9,7 @@
         background-position: center;
         background-size: cover;
         overflow-x: hidden;
+        overflow-y: hidden;
     }
     .c21-ico-schedule {
         background-image: url("../../../../assets/images/f21ico-schedule.svg");

package/src/app/component/star-rating-widget/star-rating-widget.component.scss

@@ -44,7 +44,8 @@
           position: absolute;
           left: 45px;
           right: 45px;
-          display: inline-block;
+          display: flex;
+          align-items: center;
           width: auto;
           height: 1.6em;
           line-height: 1.6em;

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

@@ -962,6 +962,11 @@ export class GlobalSettingsService {
         if (TEMP !== undefined) {
             globals.singleConversation = (TEMP === true) ? true : false;
         }
+        TEMP = tiledeskSettings['restartConversation'];
+        // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > continueConversationBeforeTime:: ', TEMP]);
+        if (TEMP !== undefined) {
+            globals.restartConversation = (TEMP === true) ? true : false;
+        }
         TEMP = tiledeskSettings['nativeRating'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > nativeRating:: ', TEMP]);
         if (TEMP !== undefined) {
@@ -1226,6 +1231,10 @@ export class GlobalSettingsService {
         if (TEMP !== null) {
             this.globals.singleConversation = (TEMP === true) ? true : false;
         }
+        TEMP = el.nativeElement.getAttribute('restartConversation');
+        if (TEMP !== null) {
+            this.globals.restartConversation = (TEMP === true) ? true : false;;
+        }
         TEMP = el.nativeElement.getAttribute('nativeRating');
         if (TEMP !== null) {
             this.globals.nativeRating = (TEMP === true) ? true : false;
@@ -1653,6 +1662,11 @@ export class GlobalSettingsService {
             globals.singleConversation = stringToBoolean(TEMP);;
         }
 
+        TEMP = getParameterByName(windowContext, 'tiledesk_restartConversation');
+        if (TEMP) {
+            globals.restartConversation = TEMP;
+        }
+
         TEMP = getParameterByName(windowContext, 'tiledesk_nativeRating');
         if (TEMP) {
             globals.nativeRating = stringToBoolean(TEMP);

package/src/app/utils/globals.ts

@@ -210,6 +210,7 @@ export class Globals {
    buttonHoverBackgroundColor: string // *******  new ********
    buttonHoverTextColor: string // *******  new ********
    singleConversation: boolean; // *******  new ********
+   restartConversation: boolean; // *******  new ********
    nativeRating: boolean; // *******  new ********
    showInfoMessage: Array<string>; // *******  new ********
    typingLocation: string; // *******  new ********
@@ -377,6 +378,8 @@ export class Globals {
     /** set the text size of attachment-buttons */
     this.singleConversation = false;
     /** set the single conversation mode for the widget */
+    this.restartConversation = true;
+    /** allow you to always restart a new converazioe */
     this.nativeRating = true;
     /** set if native rating componet has to be shown */
     this.showInfoMessage = 'MEMBER_JOINED_GROUP'.split(',').map(key => { return key.trim()});
@@ -538,6 +541,7 @@ export class Globals {
       'preChatForm': this.preChatForm, 'preChatFormJson': this.preChatFormJson,
       'projectid': this.projectid,
       'recipientId': this.recipientId,
+      'restartConversation': this.restartConversation,
       'singleConversation': this.singleConversation,
       'showInfoMessage': this.showInfoMessage, 'showAllConversations': this.showAllConversations, 
       'showWaitTime': this.showWaitTime, 'showAvailableAgents': this.showAvailableAgents,
@@ -550,7 +554,6 @@ export class Globals {
       'userEmail': this.userEmail, 'userFullname': this.userFullname, 
       'widgetTitle': this.widgetTitle,
       'welcomeMsg': this.welcomeMsg, 'welcomeTitle': this.welcomeTitle, 
-
     };
   }
 

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

@@ -801,6 +801,13 @@
             window.Tiledesk('restart')
         }
 
+        function onClickRestartConversation(){
+            let status = document.querySelector('input[name="restartConversation"]:checked').value
+            window.tiledeskSettings['restart'] = stringToBoolean(status)
+            console.log('onClickRestartConversation: status-->',window.tiledeskSettings);
+            window.Tiledesk('restart')
+        }
+
         function onClickHideSettings(){
             let status = document.querySelector('input[name="hideSettings"]:checked').value
             window.tiledeskSettings['hideSettings'] = stringToBoolean(status)
@@ -1694,6 +1701,17 @@
                                 <button class="btn btn-light" onclick="onClickSingleConversation()">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>restartConversation</strong></em></span></div>
+                            <div class="col-md-5">
+                                <input class="form-check-input" type="radio" name="restartConversation" value="true"><label>True</label>
+                                <input class="form-check-input" type="radio" name="restartConversation" value="false" checked><label>False</label>
+                            </div>
+                            <div class="col-md-2">
+                                <button class="btn btn-light" onclick="onClickRestartConversation()">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>hideSettings</strong></em></span></div>

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

@@ -272,9 +272,9 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         if (index > -1) {
             this.updateConversationWithSnapshot(this.conversations[index], conversation);
             this.logger.debug('[MQTTConversationsHandler] conversationchanged.isnew', JSON.stringify(conversation))
-            this.conversations.sort(compareValues('timestamp', 'desc'));
-            this.conversations.splice(index, 1, this.conversations[index])
             this.conversationChanged.next(this.conversations[index]);
+            this.conversations.splice(index, 1, this.conversations[index])
+            this.conversations.sort(compareValues('timestamp', 'desc'));
         }
     }
 
@@ -282,44 +282,44 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         this.logger.debug('[MQTTConversationsHandler] updating conv', conv, 'with snap', snap)
         Object.keys(snap).forEach(k => {
             if (k === 'is_new') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.is_new = snap[k];
             }
             if (k === 'text') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.last_message_text = snap[k];
                 conv.text = snap[k];
             }
             if (k === 'recipient') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.recipient = snap[k];
             }
             if (k === 'recipient_fullname') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.recipient_fullname = snap[k];
             }
             if (k === 'sender') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.sender = snap[k];
             }
             if (k === 'sender_fullname') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.sender_fullname = snap[k];
             }
             if (k === 'attributes') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.attributes = snap[k];
             }
             if (k === 'timestamp') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.timestamp = snap[k];
             }
             if (k === 'status') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.status = this.setStatusConversation(conv.sender, conv.uid);
             }
             if (k === 'type') {
-                this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.type = snap[k];
             }
 

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

@@ -146,7 +146,8 @@ export function isEmojii(message: any){
     if(!message) return false;
     const onlyEmojis = message.replace(new RegExp('[\u0000-\u1eeff]', 'g'), '')
     const visibleChars = message.replace(new RegExp('[\n\r\s]+|( )+', 'g'), '')
-    if(onlyEmojis === '' || visibleChars == '') return false
+    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) {
     return false

package/src/launch.js

@@ -161,6 +161,7 @@ function loadIframe(tiledeskScriptBaseLocation) {
     }); 
     /**** END EVENST ****/
 
+    // ifrm.srcdoc = srcTileDesk
     iDiv.appendChild(ifrm);
     ifrm.contentWindow.document.open();
     ifrm.contentWindow.document.write(srcTileDesk);