From dcc4a57b5f071a293664a68c709d430d393952ea Mon Sep 17 00:00:00 2001
From: Gabriele Panico <gabriele.panico@gmail.com>
Date: Mon, 28 Oct 2024 10:47:42 +0100
Subject: [PATCH 1/6] minor css improvement

---
 src/app/modals/confirm-close/confirm-close.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/modals/confirm-close/confirm-close.component.html b/src/app/modals/confirm-close/confirm-close.component.html
index a5fe331d..a6013b59 100644
--- a/src/app/modals/confirm-close/confirm-close.component.html
+++ b/src/app/modals/confirm-close/confirm-close.component.html
@@ -20,7 +20,7 @@
 
             <!-- BUTTON CLOSE-->
             <button tabindex="1040" aflistconv #aflistconv class="c21-button-primary" (click)="onConfirm()" [ngStyle]="{'background-color': stylesMap?.get('themeColor'), 'border-color': stylesMap?.get('themeColor'), 'color': stylesMap?.get('themeForegroundColor') }">
-                <span *ngIf="isLoadingActive">
+                <span *ngIf="isLoadingActive" style="height: inherit; width: inherit;">
                     <svg xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" with="25" height="25"
                         viewBox="0 0 100 100" enable-background="new 0 0 0 0" xml:space="preserve">
                         <path fill="#fff" d="M73,50c0-12.7-10.3-23-23-23S27,37.3,27,50 M30.9,50c0-10.5,8.5-19.1,19.1-19.1S69.1,39.5,69.1,50">

From 37653f446e3b2cae4ae96d5d8094c83c762de1c3 Mon Sep 17 00:00:00 2001
From: Gabriele Panico <gabriele.panico@gmail.com>
Date: Mon, 28 Oct 2024 10:57:25 +0100
Subject: [PATCH 2/6] # 5.0.86 in PROD

---
 CHANGELOG.md      | 2 ++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e84e2c5..56573463 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.0.86 in PROD
+
 # 5.0.85 in PROD
 
 # 5.0.83 in PROD
diff --git a/package-lock.json b/package-lock.json
index 74859c12..d443e3f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@chat21/chat21-web-widget",
-  "version": "5.0.85",
+  "version": "5.0.86",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@chat21/chat21-web-widget",
-      "version": "5.0.85",
+      "version": "5.0.86",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^15.0.4",
diff --git a/package.json b/package.json
index aa48fecb..2c346ada 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.0.85",
+  "version": "5.0.86",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

From 17356d483a921dba332f2ccb12c312a72ec08f1b Mon Sep 17 00:00:00 2001
From: Gabriele Panico <gabriele.panico@gmail.com>
Date: Mon, 28 Oct 2024 11:26:41 +0100
Subject: [PATCH 3/6] minor css improvement

---
 .../modals/confirm-close/confirm-close.component.html  |  2 +-
 .../modals/confirm-close/confirm-close.component.scss  | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/modals/confirm-close/confirm-close.component.html b/src/app/modals/confirm-close/confirm-close.component.html
index a6013b59..7d2a78f0 100644
--- a/src/app/modals/confirm-close/confirm-close.component.html
+++ b/src/app/modals/confirm-close/confirm-close.component.html
@@ -14,7 +14,7 @@
         <div class="options">
 
             <!-- BUTTON CANCEL-->
-            <span class="v-align-center c21-label-button back-button" (click)="onBack()">
+            <span class="v-align-center c21-label-button back-button" [class.disabled]="isLoadingActive" (click)="onBack()">
                 {{translationMap?.get('BACK')}}
             </span> 
 
diff --git a/src/app/modals/confirm-close/confirm-close.component.scss b/src/app/modals/confirm-close/confirm-close.component.scss
index 49b607aa..d6fd762e 100644
--- a/src/app/modals/confirm-close/confirm-close.component.scss
+++ b/src/app/modals/confirm-close/confirm-close.component.scss
@@ -28,12 +28,16 @@
         }
 
         .back-button{
-            color: #777777
+            color: #777777;
+
+            &.disabled{
+                cursor: not-allowed;
+                pointer-events: none;
+                opacity: 0.6
+            }
         }
 
     }
-
-    
 }
 
 .c21-header-button{

From 47dae4433b3ee0d64c0ff33201067d5f228a480e Mon Sep 17 00:00:00 2001
From: Gabriele Panico <gabriele.panico@gmail.com>
Date: Mon, 28 Oct 2024 12:46:46 +0100
Subject: [PATCH 4/6] minor fix

---
 .../conversation/conversation.component.html  |  1 +
 .../conversation/conversation.component.ts    | 12 +++++++--
 .../confirm-close.component.html              |  6 ++---
 .../confirm-close.component.scss              |  7 +++++
 .../confirm-close/confirm-close.component.ts  | 26 ++++++++++++++++---
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/app/component/conversation-detail/conversation/conversation.component.html b/src/app/component/conversation-detail/conversation/conversation.component.html
index 45465035..e6e346b2 100644
--- a/src/app/component/conversation-detail/conversation/conversation.component.html
+++ b/src/app/component/conversation-detail/conversation/conversation.component.html
@@ -93,6 +93,7 @@
 
     <dialog #mydialog>
         <chat-confirm-close
+            [conversationId]="conversationId"
             [translationMap]="translationMapCloseChatDialog"
             [stylesMap]="stylesMap"
             (onDiaglogClosed)="onCloseDialog($event)">
diff --git a/src/app/component/conversation-detail/conversation/conversation.component.ts b/src/app/component/conversation-detail/conversation/conversation.component.ts
index d7763e2b..fe780db7 100644
--- a/src/app/component/conversation-detail/conversation/conversation.component.ts
+++ b/src/app/component/conversation-detail/conversation/conversation.component.ts
@@ -84,6 +84,7 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   isEmojiiPickerShow: boolean = false;
   
   isButtonsDisabled = true;
+  isClosingConversation: boolean = false;
   // isConversationArchived = false;
   hideFooterTextReply: boolean = false;
   hideTextAreaContent: boolean = false;
@@ -186,6 +187,7 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
     // this.initAll();
     this.logger.debug('[CONV-COMP] ngOnInit: ', this.senderId);
     this.showMessageWelcome = false;
+    this.isClosingConversation = false;
     // const subscriptionEndRenderMessage = this.appComponent.obsEndRenderMessage.subscribe(() => {
     //   this.ngZone.run(() => {
     //     // that.scrollToBottom();
@@ -261,7 +263,8 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
     const keysCloseChatDialog= [
       'BACK', 
       'CLOSE',
-      'CLOSE_CHAT'
+      'CLOSE_CHAT',
+      'CONFIRM_CLOSE_CHAT'
     ];
 
     
@@ -988,8 +991,10 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   }
   /** CALLED BY: conv-header component */
   onCloseChat(){
-    this.logger.debug('[CONV-COMP] close chat with uid ', this.conversation.uid, this.conversationId)
+    this.isClosingConversation = false;
+    this.logger.debug('[CONV-COMP] close chat with uid ', this.conversation.uid, this.conversationId, this.isClosingConversation)
     this.mydialog.nativeElement.showModal();
+    // this.isClosingConversation = false;
     this.isMenuShow = false
   }
   /** CALLED BY: confirm-close modal component */
@@ -997,15 +1002,18 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
     this.logger.debug('[CONV-COMP] onCloseDialog data returned ', event)
     switch(event.type){
       case 'back':
+        this.isClosingConversation = false;
         this.mydialog.nativeElement.close()
         break;
       case 'confirm':
         this.tiledeskRequestService.closeSupportGroup(this.conversationId).then(data => {
           if(data === 'closed'){
+            this.isClosingConversation = false;
             this.mydialog.nativeElement.close()
             this.logger.debug('[CONV-COMP] chat closed successfully with uid ', this.conversationId) 
           }
         }).catch(error => {
+          this.isClosingConversation = false;
           this.logger.error('[CONV-COMP] ERROR while closing chat with id: ', this.conversationId, error)
         })
         break;
diff --git a/src/app/modals/confirm-close/confirm-close.component.html b/src/app/modals/confirm-close/confirm-close.component.html
index 7d2a78f0..e7a7f3e1 100644
--- a/src/app/modals/confirm-close/confirm-close.component.html
+++ b/src/app/modals/confirm-close/confirm-close.component.html
@@ -10,7 +10,7 @@
         </button>
     </div>
     <div class="content">
-        <div class="text">Are you sure you wanna close this chat?</div>
+        <div class="text">{{ translationMap?.get('CONFIRM_CLOSE_CHAT') }} - {{isLoadingActive}}</div>
         <div class="options">
 
             <!-- BUTTON CANCEL-->
@@ -20,8 +20,8 @@
 
             <!-- BUTTON CLOSE-->
             <button tabindex="1040" aflistconv #aflistconv class="c21-button-primary" (click)="onConfirm()" [ngStyle]="{'background-color': stylesMap?.get('themeColor'), 'border-color': stylesMap?.get('themeColor'), 'color': stylesMap?.get('themeForegroundColor') }">
-                <span *ngIf="isLoadingActive" style="height: inherit; width: inherit;">
-                    <svg xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" with="25" height="25"
+                <span *ngIf="isLoadingActive" class="spinner-container">
+                    <svg xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="25" height="25"
                         viewBox="0 0 100 100" enable-background="new 0 0 0 0" xml:space="preserve">
                         <path fill="#fff" d="M73,50c0-12.7-10.3-23-23-23S27,37.3,27,50 M30.9,50c0-10.5,8.5-19.1,19.1-19.1S69.1,39.5,69.1,50">
                         <animateTransform 
diff --git a/src/app/modals/confirm-close/confirm-close.component.scss b/src/app/modals/confirm-close/confirm-close.component.scss
index d6fd762e..ee93827d 100644
--- a/src/app/modals/confirm-close/confirm-close.component.scss
+++ b/src/app/modals/confirm-close/confirm-close.component.scss
@@ -37,6 +37,13 @@
             }
         }
 
+        .spinner-container{
+            width: inherit;
+            height: inherit;
+            display: flex;
+            align-items: center;
+        }
+
     }
 }
 
diff --git a/src/app/modals/confirm-close/confirm-close.component.ts b/src/app/modals/confirm-close/confirm-close.component.ts
index 99600931..196259b8 100644
--- a/src/app/modals/confirm-close/confirm-close.component.ts
+++ b/src/app/modals/confirm-close/confirm-close.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, SimpleChange, SimpleChanges, ViewChild, OnDestroy } from '@angular/core';
 
 
 @Component({
@@ -7,8 +7,9 @@ import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild }
   styleUrls: ['./confirm-close.component.scss']
 })
 export class ConfirmCloseComponent implements OnInit{
-  
-  isLoadingActive: boolean = false;
+
+  @Input() isLoadingActive: boolean;
+  @Input() conversationId: string;
 
   @Input() translationMap: Map< string, string>;
   @Input() stylesMap: Map<string, string>;
@@ -17,10 +18,22 @@ export class ConfirmCloseComponent implements OnInit{
   constructor() { }
 
   ngOnInit(): void {
-    console.log('[CONFIRM CLOSE MODAL] onInit');
+    console.log('[CONFIRM CLOSE MODAL] onInit', this.isLoadingActive);
     // this.dialog.showModal();
   }
 
+  ngOnChanges(changes: SimpleChanges){
+    console.log('changesssssss', changes, this.isLoadingActive)
+    if(changes && 
+      changes['conversationId'] && 
+      changes['conversationId'].previousValue !== undefined && 
+      (changes['conversationId'].previousValue !== changes['conversationId'].currentValue) &&
+      changes['conversationId'].currentValue
+    ){
+    this.isLoadingActive = false;
+  }
+  }
+
   ngAfterViewInit(){
   }
 
@@ -33,4 +46,9 @@ export class ConfirmCloseComponent implements OnInit{
     this.onDiaglogClosed.emit({type: 'confirm', data: null});
   }
 
+  ngOnDestroy(){
+    this.isLoadingActive = false;
+    console.log('destroyyy', this.isLoadingActive)
+  }
+
 }

From 2a99332475fb7dd286e3b9c57f01a92689eb0048 Mon Sep 17 00:00:00 2001
From: Gabriele Panico <gabriele.panico@gmail.com>
Date: Mon, 28 Oct 2024 12:49:16 +0100
Subject: [PATCH 5/6] # 5.0.87 in PROD

---
 CHANGELOG.md      | 2 ++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56573463..b7364cb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.0.87 in PROD
+
 # 5.0.86 in PROD
 
 # 5.0.85 in PROD
diff --git a/package-lock.json b/package-lock.json
index d443e3f9..f5d42c57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@chat21/chat21-web-widget",
-  "version": "5.0.86",
+  "version": "5.0.87",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@chat21/chat21-web-widget",
-      "version": "5.0.86",
+      "version": "5.0.87",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^15.0.4",
diff --git a/package.json b/package.json
index 2c346ada..58b640ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.0.86",
+  "version": "5.0.87",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

From 0882339c94a3a1ef54d47c5b34ca50feb468229e Mon Sep 17 00:00:00 2001
From: Gabriele Panico <gabriele.panico@gmail.com>
Date: Mon, 28 Oct 2024 13:19:35 +0100
Subject: [PATCH 6/6] # 5.0.88 in PROD

---
 CHANGELOG.md                                  | 24 ++++++++++++++++++-
 package-lock.json                             |  4 ++--
 package.json                                  |  2 +-
 .../confirm-close.component.html              |  2 +-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7364cb4..7caecc15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,33 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.0.88 in PROD
+
 # 5.0.87 in PROD
 
 # 5.0.86 in PROD
 
-# 5.0.85 in PROD
+# 5.0.85-rc.2
+- **added**: loading progress indicator while closing a conversation
+
+# 5.0.85-rc.1
+- **added**: hide header restart menu option if conversation is closed
+- **removed**: continueConversationBeforeTime settings property
+
+# 5.0.84 in PROD
+
+# 5.0.84-rc.4
+- **added**: checkAcceptedFile fn on dragleave event conversation-content component
+- **added**: checkAcceptedFile fn  in conversation-footer component
+
+# 5.0.84-rc.3
+- **changed**: index-dev lib order import
+
+# 5.0.84-rc.2
+- **changed**: bootstrap, jquery and font-awesome libs
+
+# 5.0.84-rc.1
+- **removed**: innerHtml from document element
 
 # 5.0.83 in PROD
 
diff --git a/package-lock.json b/package-lock.json
index f5d42c57..ce26f2fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@chat21/chat21-web-widget",
-  "version": "5.0.87",
+  "version": "5.0.88",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@chat21/chat21-web-widget",
-      "version": "5.0.87",
+      "version": "5.0.88",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^15.0.4",
diff --git a/package.json b/package.json
index 58b640ba..1af14dc0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.0.87",
+  "version": "5.0.88",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {
diff --git a/src/app/modals/confirm-close/confirm-close.component.html b/src/app/modals/confirm-close/confirm-close.component.html
index 274eee0b..57598ef9 100644
--- a/src/app/modals/confirm-close/confirm-close.component.html
+++ b/src/app/modals/confirm-close/confirm-close.component.html
@@ -20,7 +20,7 @@
 
             <!-- BUTTON CLOSE-->
             <button tabindex="1040" aflistconv #aflistconv class="c21-button-primary" (click)="onConfirm()" [ngStyle]="{'background-color': stylesMap?.get('themeColor'), 'border-color': stylesMap?.get('themeColor'), 'color': stylesMap?.get('foregroundColor') }">
-                <span  class="spinner-container">
+                <span *ngIf="isLoadingActive" class="spinner-container">
                     <svg xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="25" height="25" [ngStyle]="{'fill': stylesMap?.get('foregroundColor') }"
                         viewBox="0 0 100 100" enable-background="new 0 0 0 0" xml:space="preserve">
                         <path fill="inherit" d="M73,50c0-12.7-10.3-23-23-23S27,37.3,27,50 M30.9,50c0-10.5,8.5-19.1,19.1-19.1S69.1,39.5,69.1,50">