@chat21/chat21-web-widget 5.0.83-rc.3 → 5.0.83

package/CHANGELOG.md

@@ -6,6 +6,11 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.0.83 in PROD
+
+# 5.0.83-rc.4
+- **added**: confirm-close modal before close a chat
+
 # 5.0.83-rc.3
 - **added**: send '/start' info message on restart header menu option
 - **bug-fixed**: close header menu option not send the last conversation id to close

package/deploy_amazon_beta.sh

@@ -4,10 +4,6 @@ echo "version $version"
 
 ng build --configuration="pre" --aot=true --base-href --build-optimizer=true
 
-### SET HASHING : START ###
-cp ./src/launch_template.js ./dist/launch.js
-node ./src/build_launch.js
-### SET HASHING : END ###
 
 # ########## --->>>> NATIVE-MQTT folder START <<<<<------ ########## #
 
@@ -28,10 +24,11 @@ node ./src/build_launch.js
 
 # ########## --->>>> FIREBASE folder START <<<<<------ ########## #
 cd dist
-aws s3 sync . s3://tiledesk-widget-pre/v5/$version/ --cache-control max-age=300 --exclude='launch.js' #7days
-aws s3 sync . s3://tiledesk-widget-pre/v5/$version/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
-aws s3 sync . s3://tiledesk-widget-pre/v5/ --cache-control max-age=300 --exclude='launch.js' #7days
-aws s3 sync . s3://tiledesk-widget-pre/v5/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
+aws s3 sync . s3://tiledesk-widget-pre/v5/$version/ --cache-control max-age=300
+aws s3 sync . s3://tiledesk-widget-pre/v5/ --cache-control max-age=300
+cd ..
+
+#aws  cloudfront create-invalidation --distribution-id E3EJDWEHY08CZZ --paths "/*"
 cd ..
 
 aws  cloudfront create-invalidation --distribution-id E2V5O0YPR61V8P --paths "/*"

package/deploy_amazon_prod.sh

@@ -4,12 +4,6 @@ echo "version $version"
 
 # --build-optimizer=false if localstorage is disabled (webview) appears https://github.com/firebase/angularfire/issues/970
 ng build --configuration="prod" --aot=true   --build-optimizer=true --vendor-chunk=true
-##--base-href='./v5/' --output-hashing none
-
-### SET HASHING : START ###
-cp ./src/launch_template.js ./dist/launch.js
-node ./src/build_launch.js
-### SET HASHING : END ###
 
 #### FIREBASE #####
 # cd dist
@@ -21,12 +15,11 @@ node ./src/build_launch.js
 # #### MQTT #####
 cd dist
 # aws s3 sync . s3://tiledesk-widget/v5/latest/
-aws s3 sync . s3://tiledesk-widget/v6/$version/ --cache-control max-age=86400 --exclude='launch.js' #8days
-aws s3 sync . s3://tiledesk-widget/v6/$version/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
-aws s3 sync . s3://tiledesk-widget/v6/ --cache-control max-age=86400 --exclude='launch.js' #8days
-aws s3 sync . s3://tiledesk-widget/v6/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
+aws s3 sync . s3://tiledesk-widget/v6/$version/ --cache-control max-age=300
+aws s3 sync . s3://tiledesk-widget/v6/ --cache-control max-age=300
 cd ..
 
+
 aws  cloudfront create-invalidation --distribution-id E3EJDWEHY08CZZ --paths "/*"
 echo new version deployed $version on s3://tiledesk-widget/v5
 echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-widget/v5/index.html

package/package.json

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

package/src/app/app.module.ts

@@ -15,7 +15,6 @@ import { ConversationContentComponent } from './component/conversation-detail/co
 import { ConversationFooterComponent } from './component/conversation-detail/conversation-footer/conversation-footer.component';
 import { ConversationInternalFrameComponent } from './component/conversation-detail/conversation-internal-frame/conversation-internal-frame.component';
 import { ConversationPreviewComponent } from './component/conversation-detail/conversation-preview/conversation-preview.component';
-import { ConversationAudioRecorderComponent } from './component/conversation-detail/conversation-audio-recorder/conversation-audio-recorder.component';
 /** CONVERSATION-DETAIL COMPONENTS */
 import { BubbleMessageComponent } from './component/message/bubble-message/bubble-message.component';
 import { AvatarComponent } from './component/message/avatar/avatar.component';
@@ -24,7 +23,7 @@ import { ImageComponent } from './component/message/image/image.component';
 import { InfoMessageComponent } from './component/message/info-message/info-message.component';
 import { HtmlComponent } from './component/message/html/html.component';
 import { FrameComponent } from './component/message/frame/frame.component';
-import { AudioTrackComponent } from './component/message/audio-track/audio-track.component';
+import { AudioComponent } from './component/message/audio/audio.component';
 import { UserTypingComponent } from './../chat21-core/utils/user-typing/user-typing.component';
 /** MESSAGE ATTACHMENTS COMPONENTS */
 import { MessageAttachmentComponent } from './component/message-attachment/message-attachment.component';
@@ -139,7 +138,6 @@ import { ConfirmCloseComponent } from './modals/confirm-close/confirm-close.comp
 
 
 
-
 const appInitializerFn = (appConfig: AppConfigService, brandService: BrandService, logger: NGXLogger) => {
   return async() => {
     let customLogger = new CustomLogger(logger)
@@ -278,7 +276,6 @@ export function uploadFactory(http: HttpClient, appConfig: AppConfigService, app
     ConversationFooterComponent,
     ConversationPreviewComponent,
     ConversationInternalFrameComponent,
-    ConversationAudioRecorderComponent,
     BubbleMessageComponent,
     AvatarComponent,
     FrameComponent,
@@ -290,7 +287,6 @@ export function uploadFactory(http: HttpClient, appConfig: AppConfigService, app
     ActionButtonComponent,
     LinkButtonComponent,
     TextButtonComponent,
-    AudioTrackComponent,
     UserTypingComponent,
     /**DIRECTIVES */
     HtmlEntitiesEncodePipe,
@@ -299,6 +295,7 @@ export function uploadFactory(http: HttpClient, appConfig: AppConfigService, app
     SafeHtmlPipe,
     LikeUnlikeComponent,
     TooltipDirective,
+    AudioComponent,
     CarouselComponent,
     NetworkOfflineComponent,
     ConfirmCloseComponent

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

@@ -92,8 +92,10 @@
 
 
     <dialog #mydialog>
-        <chat-confirm-close>
-        
+        <chat-confirm-close
+            [translationMap]="translationMapCloseChatDialog"
+            [stylesMap]="stylesMap"
+            (onDiaglogClosed)="onCloseDialog($event)">
         </chat-confirm-close>
     </dialog>
 

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

@@ -160,6 +160,17 @@
     }
 }
 
+dialog:-internal-dialog-in-top-layer{
+    border: 0px;
+    border-radius: 16px;
+    padding: 15px 15px;
+    &::backdrop {
+        border-radius: 16px;
+    }
+}
+
+
+
 /* ==================== MOBILE VERSION ==================== */ 
 @media (max-width: 451px) {
     #chat21-conversation-component {

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

@@ -138,6 +138,7 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   translationMapFooter: Map<string, string>;
   translationMapContent: Map<string, string>;
   translationMapPreview: Map<string, string>;
+  translationMapCloseChatDialog: Map<string, string>;
 
   // ========== begin:: typying =======
   public isTypings = false;
@@ -257,11 +258,18 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       'LABEL_PREVIEW'
     ];
 
+    const keysCloseChatDialog= [
+      'BACK', 
+      'CLOSE',
+      'CLOSE_CHAT'
+    ];
+
     
     this.translationMapHeader = this.customTranslateService.translateLanguage(keysHeader);
     this.translationMapFooter = this.customTranslateService.translateLanguage(keysFooter);
     this.translationMapContent = this.customTranslateService.translateLanguage(keysContent);
     this.translationMapPreview = this.customTranslateService.translateLanguage(keysPreview);
+    this.translationMapCloseChatDialog = this.customTranslateService.translateLanguage(keysCloseChatDialog)
   }
 
   ngAfterViewInit() {
@@ -980,22 +988,38 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   }
   /** CALLED BY: conv-header component */
   onCloseChat(){
-    // this.mydialog.nativeElement.showModal()
     this.logger.debug('[CONV-COMP] close chat with uid ', this.conversation.uid, this.conversationId)
-    this.tiledeskRequestService.closeSupportGroup(this.conversationId).then(data => {
-      if(data === 'closed'){
-        this.isMenuShow = false
-        this.logger.debug('[CONV-COMP] chat closed successfully with uid ', this.conversationId)
-      }
-    }).catch(error => {
-      this.logger.error('[CONV-COMP] ERROR while closing chat with id: ', this.conversationId, error)
-    })
+    this.mydialog.nativeElement.showModal();
+    this.isMenuShow = false
+  }
+  /** CALLED BY: confirm-close modal component */
+  onCloseDialog(event: {type: string, data: any}){
+    this.logger.debug('[CONV-COMP] onCloseDialog data returned ', event)
+    switch(event.type){
+      case 'back':
+        this.mydialog.nativeElement.close()
+        break;
+      case 'confirm':
+        this.tiledeskRequestService.closeSupportGroup(this.conversationId).then(data => {
+          if(data === 'closed'){
+            this.mydialog.nativeElement.close()
+            this.logger.debug('[CONV-COMP] chat closed successfully with uid ', this.conversationId) 
+          }
+        }).catch(error => {
+          this.logger.error('[CONV-COMP] ERROR while closing chat with id: ', this.conversationId, error)
+        })
+        break;
+    }
+    
+    
   }
+
   /** CALLED BY: conv-header component */
   onRestartChat(){
     //restart SAME conversation calling /start againg
     let attributes = {
       subtype: 'info',
+      action: 'start',
       ... this.g.attributes
     }
     this.conversationFooter.sendMessage('/start', TYPE_MSG_TEXT, null, attributes) 

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

@@ -7,7 +7,7 @@
 <!-- TEXTAREA + ICONS: conv active-->
 <div class="textarea-container" *ngIf="!hideTextAreaContent && !hideTextReply">
     
-    <div *ngIf="!isStopRec" class="icons-container">
+    <div class="icons-container">
         <!-- ICON ATTACHMENT -->
         <label *ngIf="showAttachmentButton == true" tabindex="1502" aria-label="allegati" for="chat21-file" class="chat21-textarea-button" [class.active]="!isFilePendingToUpload && !hideTextReply" id="chat21-start-upload-doc">
             <span class="v-align-center">
@@ -44,7 +44,7 @@
 
 
 
-    <div *ngIf="!isStopRec" class="visible-text-area"  [class.disabled] = "( isConversationArchived || hideTextReply)? true : null">
+    <div class="visible-text-area"  [class.disabled] = "( isConversationArchived || hideTextReply)? true : null">
         <!-- isFilePendingToUpload || -->
       <textarea 
         [attr.disabled] = "(hideTextReply)? true : null"
@@ -67,24 +67,13 @@
     </div>
 
     <!-- ICON SEND -->
-    <div *ngIf="textInputTextArea && !isStopRec" tabindex="-1" class="chat21-textarea-button" [class.active]="textInputTextArea && !hideTextReply" id="chat21-button-send" (click)="onSendPressed($event)">
+    <div tabindex="-1" class="chat21-textarea-button" [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"/>
             </svg>
         </span>
     </div>
-
-    <!-- ICON REC -->
-    <div *ngIf="!textInputTextArea" tabindex="-1" class="chat21-audio-button" [class.active]="isStopRec" id="chat21-button-rec">
-        <chat-audio-recorder
-            (startRecordingEvent)="onStartRecording()"
-            (deleteRecordingEvent)="onDeleteRecording()"
-            (endRecordingEvent)="onEndRecording($event)"
-            (sendRecordingEvent)="onSendRecording($event)"
-            [stylesMap]="stylesMap">
-        </chat-audio-recorder>
-    </div>
 </div>
 
 

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

@@ -7,16 +7,14 @@
     display: flex;
     width: 100%;
     align-items: center;
-    gap: 0px;
+    gap: 10px;
     justify-content: space-between;
 }
 
 .icons-container{
     display: flex;
     align-self: flex-end;
-    margin-left: 8px;
-    gap: 2px;
-    margin-right: 8px;
+    margin-left: 8px
 }
 
 .visible-text-area {
@@ -33,6 +31,7 @@
 .chat21-textarea-button {
     fill: var(--icon-fill-color);
     pointer-events: auto;
+
     height: var(--chat-footer-height);
     bottom: 22px;
     opacity: 0.3;
@@ -186,29 +185,11 @@ textarea:active{
 }
 
 #chat21-button-send {
+    // right: 8px;
+    // bottom: 0;
     display: flex;
     align-self: flex-end;
-    margin: 0 8px;
-    width: 34px;
-    text-align: center;
-    justify-content: center;
-}
-
-#chat21-button-rec {
-    display: flex;
-    width: 34px;
-    text-align: center;
-    justify-content: center;
-    height: var(--chat-footer-height);
-    &.active{
-        width: 100%;
-    }
-    chat-audio-recorder {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
+    margin: 0 8px
 }
 
 #chat21-file{
@@ -356,4 +337,7 @@ textarea:active{
     // left: 10px;
     border: none;
     margin: -2px -2px 0px;
-}
+
+}
+
+