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

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 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
+
 # 5.0.83-rc.2
 - **changed**: ui improvements on audio elements 
 

package/deploy_amazon_beta.sh

@@ -2,7 +2,12 @@
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
 
-ng build --configuration="pre" --aot=true --base-href --output-hashing none --build-optimizer=true
+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 <<<<<------ ########## #
 
@@ -23,11 +28,13 @@ ng build --configuration="pre" --aot=true --base-href --output-hashing none --bu
 
 # ########## --->>>> FIREBASE folder START <<<<<------ ########## #
 cd dist
-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
+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'
 cd ..
 
-#aws  cloudfront create-invalidation --distribution-id E3EJDWEHY08CZZ --paths "/*"
+aws  cloudfront create-invalidation --distribution-id E2V5O0YPR61V8P --paths "/*"
 # echo new version deployed $NEW_VER/$NEW_BUILD/ on s3://tiledesk-widget-pre/v2
 echo new version deployed $version/ on s3://tiledesk-widget-pre/v5 and s3://tiledesk-widget-pre/v5/$version/
 echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-widget-pre/v5/index.html

package/deploy_amazon_prod.sh

@@ -3,7 +3,13 @@ version=`node -e 'console.log(require("./package.json").version)'`
 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 --base-href --output-hashing none --build-optimizer=true --vendor-chunk=true
+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
@@ -12,12 +18,13 @@ ng build --configuration="prod" --aot=true --base-href --output-hashing none --b
 # aws s3 sync . s3://tiledesk-widget/v5/ --cache-control max-age=300
 # cd ..
 
-
 # #### MQTT #####
 cd dist
 # aws s3 sync . s3://tiledesk-widget/v5/latest/
-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
+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'
 cd ..
 
 aws  cloudfront create-invalidation --distribution-id E3EJDWEHY08CZZ --paths "/*"

package/package.json

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

package/src/app/app.module.ts

@@ -135,6 +135,7 @@ import { ScriptService } from 'src/chat21-core/providers/scripts/script.service'
 import { CarouselComponent } from './component/message/carousel/carousel.component';
 import { BrandService } from './providers/brand.service';
 import { NetworkOfflineComponent } from './component/network-offline/network-offline.component';
+import { ConfirmCloseComponent } from './modals/confirm-close/confirm-close.component';
 
 
 
@@ -300,7 +301,7 @@ export function uploadFactory(http: HttpClient, appConfig: AppConfigService, app
     TooltipDirective,
     CarouselComponent,
     NetworkOfflineComponent,
-    
+    ConfirmCloseComponent
   ],
   imports: [
     BrowserModule,

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

@@ -90,6 +90,13 @@
         (onCloseModalPreview)="onCloseModalPreview()">
     </chat-conversation-attachment-preview>
 
+
+    <dialog #mydialog>
+        <chat-confirm-close>
+        
+        </chat-confirm-close>
+    </dialog>
+
     <!-- FOOTER -->
     <!-- [class.maximize-width]="(g?.singleConversation && hideTextAreaContent) || (isConversationArchived && !g?.allowReopen)" -->
     <div id="chat21-footer">

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

@@ -50,6 +50,8 @@ import { ConversationContentComponent } from '../conversation-content/conversati
 })
 export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   @ViewChild('afConversationComponent') private afConversationComponent: ElementRef; // l'ID del div da scrollare
+  @ViewChild('mydialog') mydialog: ElementRef;
+
   // @HostListener('window:resize', ['$event'])
   // ========= begin:: Input/Output values
   // @Input() elRoot: ElementRef;
@@ -978,19 +980,27 @@ 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.tiledeskRequestService.closeSupportGroup(this.conversation.uid).then(data => {
+    // 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.conversation.uid)
+        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.conversation.uid, error)
+      this.logger.error('[CONV-COMP] ERROR while closing chat with id: ', this.conversationId, error)
     })
   }
   /** CALLED BY: conv-header component */
   onRestartChat(){
-    this.hideTextAreaContent = true
+    //restart SAME conversation calling /start againg
+    let attributes = {
+      subtype: 'info',
+      ... this.g.attributes
+    }
+    this.conversationFooter.sendMessage('/start', TYPE_MSG_TEXT, null, attributes) 
+
+    // this.hideTextAreaContent = true
   }
   /** CALLED BY: conv-header component */
   onWidgetHeightChange(mode){

package/src/app/modals/confirm-close/confirm-close.component.html

@@ -0,0 +1,6 @@
+<div class="modal-container">
+    CLOSE CONVERSATION MODAL
+</div>
+
+
+

package/src/app/modals/confirm-close/confirm-close.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ConfirmCloseComponent } from './confirm-close.component';
+
+describe('ConfirmCloseComponent', () => {
+  let component: ConfirmCloseComponent;
+  let fixture: ComponentFixture<ConfirmCloseComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ConfirmCloseComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ConfirmCloseComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/src/app/modals/confirm-close/confirm-close.component.ts

@@ -0,0 +1,24 @@
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+
+@Component({
+  selector: 'chat-confirm-close',
+  templateUrl: './confirm-close.component.html',
+  styleUrls: ['./confirm-close.component.scss']
+})
+export class ConfirmCloseComponent implements OnInit{
+  
+  @ViewChild('mydialog') mydialog: ElementRef;
+
+  constructor() { }
+
+  ngOnInit(): void {
+    // console.log('[CONFIRM CLOSE MODAL] onInit-->', this.dialog);
+    // this.dialog.showModal();
+  }
+
+  ngAfterViewInit(){
+    // console.log('[CONFIRM CLOSE MODAL] ngAfterViewInit-->', this.mydialog);
+    // this.mydialog.nativeElement.showModal()
+  }
+
+}

package/src/app/utils/BrandResources.ts

@@ -25,6 +25,14 @@ export class BrandResources {
         // var icon = document.querySelector("link[rel~='icon']") as HTMLElement;
         // icon.setAttribute('href', this.brand['FAVICON_URL'])
 
+        /** META sharing ELEMENTS */
+        if(this.brand['META_SHARE_INFO'] && this.brand['META_SHARE_INFO'].length > 0){
+            Object.keys(this.brand['META_SHARE_INFO']).forEach(key => {
+                var meta = document.querySelector("meta[property^='og:"+key.toLowerCase()+"']") as HTMLElement;
+                meta.setAttribute('content', this.brand['META_SHARE_INFO'][key])
+            })
+        }
+        
         /** CSS */
         document.documentElement.style.setProperty('--base-brand-color', this.brand['BRAND_PRIMARY_COLOR']);