@chat21/chat21-ionic 3.4.30 → 3.4.32-rc1

package/src/app/pages/unassigned-conversations/unassigned-conversations.page.ts

@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, SecurityContext } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { AlertController, ModalController } from '@ionic/angular';
+import { Router } from '@angular/router';
 import { NavProxyService } from 'src/app/services/nav-proxy.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
@@ -7,6 +8,9 @@ import { DomSanitizer } from '@angular/platform-browser'
 import { CustomTranslateService } from 'src/chat21-core/providers/custom-translate.service';
 import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 import { EventsService } from 'src/app/services/events-service';
+import { ConversationModel } from 'src/chat21-core/models/conversation';
+import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
+import { TiledeskService } from 'src/app/services/tiledesk/tiledesk.service';
 
 
 @Component({
@@ -19,6 +23,14 @@ export class UnassignedConversationsPage implements OnInit {
   @Input() iframe_URL: any;
   @Input() callerBtn: string;
   @Input() isMobile: boolean;
+  /** Lista conversazioni unassigned passata da project-item (calcolata da wsRequestsList) */
+  @Input() unassignedConversations: ConversationModel[] = [];
+  @Input() stylesMap: Map<string, string>;
+  @Input() translationMapConversation: Map<string, string>;
+
+  /** Array salvato localmente per uso nella page */
+  unassignedConversationsList: ConversationModel[] = [];
+  uidConvSelected: string;
   // @Input() prjctsxpanel_url: any;
   // @Input() unassigned_convs_url: any;
 
@@ -34,19 +46,32 @@ export class UnassignedConversationsPage implements OnInit {
   constructor(
     private modalController: ModalController,
     private navService: NavProxyService,
+    private alertController: AlertController,
+    private router: Router,
     private sanitizer: DomSanitizer,
     private translateService: CustomTranslateService,
-    private events : EventsService
+    private events: EventsService,
+    private tiledeskAuthService: TiledeskAuthService,
+    private tiledeskService: TiledeskService
   ) { }
 
   ngOnInit() {
     const keys = [
       'UnassignedConversations',
       'NewConversations',
-      'PIN_A_PROJECT'
+      'PIN_A_PROJECT',
+      'LABEL_MSG_PUSH_START_CHAT'
     ];
     this.translationMap = this.translateService.translateLanguage(keys);
-    this.buildIFRAME();
+    this.unassignedConversationsList = this.unassignedConversations ?? [];
+    if (!this.stylesMap) {
+      this.stylesMap = new Map([['themeColor', '#165CEE']]);
+    }
+    if (!this.translationMapConversation) {
+      this.translationMapConversation = this.translateService.translateLanguage(['CLOSED', 'Resolve']);
+    }
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] unassignedConversationsList', this.unassignedConversationsList);
+    // this.buildIFRAME();
     this.listenToPostMsg();
     this.hideHotjarFeedbackBtn();
     this.events.subscribe('style', (data)=>this.loadStyle(data))
@@ -117,6 +142,46 @@ export class UnassignedConversationsPage implements OnInit {
 
   }
 
+  async presentAlertConfirmJoinRequest(request: ConversationModel) {
+    var iframeWin = <HTMLIFrameElement>document.getElementById("unassigned-convs-iframe")
+
+    const isIFrame = (input: HTMLElement | null): input is HTMLIFrameElement =>
+      input !== null && input.tagName === 'IFRAME';
+
+    const keys = ['YouAreAboutToJoinThisChat', 'Cancel', 'AreYouSure'];
+    const translationMap = this.translateService.translateLanguage(keys);
+
+    const alert = await this.alertController.create({
+      cssClass: 'my-custom-class',
+      header: translationMap.get('AreYouSure'),
+      message: translationMap.get('YouAreAboutToJoinThisChat'),
+      buttons: [
+        {
+          text: translationMap.get('Cancel'),
+          role: 'cancel',
+          cssClass: 'secondary',
+          handler: (blah) => {
+          }
+        }, {
+          text: 'Ok',
+          handler: () => {
+            let user = this.tiledeskAuthService.getCurrentUser();
+            this.tiledeskService.addParticipant(request.uid, user.uid, request.attributes.projectId).subscribe((res: any) => {
+              this.logger.log('[APP-COMP] addParticipant - RES ', res);
+              this.onClose(request);
+            }, (error) => {
+              this.logger.error('[APP-COMP] addParticipant - ERROR ', error);
+            }, () => {
+              this.logger.log('[APP-COMP] addParticipant - COMPLETE ');
+            });
+          }
+        }
+      ]
+    });
+
+    await alert.present();
+  }
+
   onLoad(iframe){
     let styleData = localStorage.getItem('custom_style')
     if(styleData && styleData !== 'undefined'){
@@ -185,18 +250,58 @@ export class UnassignedConversationsPage implements OnInit {
   }
 
 
-  async onClose() {
+  onConversationSelected(conversation: ConversationModel) {
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] onConversationSelected', conversation);
+    this.uidConvSelected = conversation?.uid;
+    const fullName = conversation?.conversation_with_fullname || '';
+    const pageUrl = 'conversation-detail/' + conversation.uid + '/' + encodeURIComponent(fullName) + '/unassigned';
+    this.modalController.dismiss({ conversation }).then(() => {
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'));
+    }).catch(() => {
+      this.navService.pop();
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'));
+    });
+  }
+
+  onCloseConversation(conversation: ConversationModel) {
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] onCloseConversation', conversation);
+    this.tiledeskService.closeSupportGroup(conversation.attributes.projectId, conversation.uid).subscribe((res: any) => {
+      this.logger.log('[UNASSIGNED-CONVS-PAGE] archiveRequest - RES ', res);
+      this.onClose();
+    }, (error) => {
+      this.logger.error('[UNASSIGNED-CONVS-PAGE] archiveRequest - ERROR ', error);
+    }, () => {
+      this.logger.log('[UNASSIGNED-CONVS-PAGE] archiveRequest - COMPLETE ');
+    });
+  }
+
+  onJoinConversation(conversation: ConversationModel) {
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] onJoinConversation', conversation);
+    this.presentAlertConfirmJoinRequest(conversation)
+  }
+
+  onImageLoaded(conversation: ConversationModel) {
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] onImageLoaded', conversation);
+  }
+
+  onConversationLoaded(conversation: ConversationModel) {
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] onConversationLoaded', conversation);
+  }
+
+  async onClose(conversation?: ConversationModel) {
     this.logger.log('[UNASSIGNED-CONVS-PAGE] - onClose MODAL')
-    this.logger.log('[UNASSIGNED-CONVS-PAGE] - onClose MODAL isModalOpened ', await this.modalController.getTop())
     const isModalOpened = await this.modalController.getTop();
     this.logger.log('[UNASSIGNED-CONVS-PAGE] - onClose MODAL isModalOpened ', isModalOpened)
     if (isModalOpened) {
-      this.modalController.dismiss({
-        confirmed: true
-      });
+      await this.modalController.dismiss({ confirmed: true });
     } else {
       this.navService.pop();
     }
+    if (conversation) {
+      const fullName = conversation.conversation_with_fullname || '';
+      const pageUrl = 'conversation-detail/' + conversation.uid + '/' + encodeURIComponent(fullName) + '/active';
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'));
+    }
   }
 
 }

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

@@ -88,14 +88,14 @@ export class GlobalSettingsService {
     this.logger.debug('[GLOBAL-SET] setVariableFromStorage :::::::: SET VARIABLE ---------->', Object.keys(globals));
     for (const key of Object.keys(globals)) {
         const val = this.appStorageService.getItem(key);
-        // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals KEY ---------->', key);
-        // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals VAL ---------->', val);
+        this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals KEY ---------->', key);
+        this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals VAL ---------->', val);
         if (val && val !== null) {
             // globals.setParameter(key, val);
             globals[key] = stringToBoolean(val);
         }
         // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals == ---------->', globals);
-    } 
+    }
   }
 
   /**
@@ -113,6 +113,7 @@ export class GlobalSettingsService {
     TEMP = getParameterByName(windowContext, 'tiledesk_supportMode');
     if (TEMP) {
         globals.supportMode = stringToBoolean(TEMP);
+        this.appStorageService.setItem('supportMode', String(globals.supportMode))
     }
 
     TEMP = getParameterByName(windowContext, 'tiledesk_lang');
@@ -138,6 +139,13 @@ export class GlobalSettingsService {
     TEMP = getParameterByName(windowContext, 'tiledesk_projectID');
     if (TEMP) {
         globals.projectID = TEMP;
+        this.appStorageService.setItem('projectID', TEMP)
+    }
+
+    TEMP = getParameterByName(windowContext, 'tiledesk_logOut');
+    if (TEMP) {
+        globals.logOut = stringToBoolean(TEMP);
+        this.appStorageService.setItem('logOut', TEMP)
     }
 
 }

package/src/app/services/nav-proxy.service.ts

@@ -4,7 +4,6 @@ import { Router, NavigationExtras } from '@angular/router';
 
 // utils
 import { checkPlatformIsMobile } from '../../chat21-core/utils/utils';
-// import { ConversationDetailPage } from '../pages/conversation-detail/conversation-detail.page';
 
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';

package/src/app/services/project_users/project-users.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ProjectUsersService } from './project-users.service';
+
+describe('ProjectUsersService', () => {
+  let service: ProjectUsersService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ProjectUsersService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

package/src/app/services/project_users/project-users.service.ts

@@ -0,0 +1,63 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { ProjectUser } from 'src/chat21-core/models/projectUsers';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ProjectUsersService {
+
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
+  private logger: LoggerService = LoggerInstance.getInstance();
+  constructor(
+      public http: HttpClient,
+      public appStorageService: AppStorageService
+  ) {}
+  
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[TILEDESK-PROJECT_USERS-SERV] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
+
+  public getProjectUsersByProjectId(project_id: string): Observable<ProjectUser[]> {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/';
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER URL', url);
+    
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+    return this.http.get(url, httpOptions).pipe(map((res: any) => {
+      this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER RES ', res);
+      return res
+    }))
+  }
+
+  public getProjectUserByProjectId(project_id:  string): Promise<ProjectUser> {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/me';
+    this.logger.log('[TILEDESK-SERVICE]- GET PROJECT-USER BY USER-ID - URL', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+
+    return this.http.get(url, httpOptions).pipe(map((res: any) => {
+      this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER RES ', res);
+      return res[0]
+    })).toPromise();
+  }
+
+}

package/src/app/services/projects/project.service.ts

@@ -7,6 +7,7 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 import { AppConfigProvider } from '../app-config';
 import { Observable } from 'rxjs';
 import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
+import { ProjectUser } from 'src/chat21-core/models/project_user';
 
 @Injectable({
   providedIn: 'root'
@@ -35,7 +36,7 @@ export class ProjectService {
     this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
   }
 
-  public getProjects(): Observable<Project[]> {
+  public getProjects(): Observable<ProjectUser[]> {
     const url = this.SERVER_BASE_URL  + "projects/";
     this.logger.log('[PROJECTS-SERVICE] getProjects - URL ', url);
 

package/src/app/services/tiledesk/tiledesk.service.ts

@@ -93,22 +93,6 @@ export class TiledeskService {
     }))
   }
 
-  public getProjectUsersByProjectId(project_id: string) {
-    const url = this.SERVER_BASE_URL + project_id + '/project_users/';
-    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER URL', url);
-    
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json',
-        Authorization: this.tiledeskToken
-      })
-    };
-    return this.http.get(url, httpOptions).pipe(map((res: any) => {
-      this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER RES ', res);
-      return res
-    }))
-  }
-
   public getAllLeadsActiveWithLimit(project_id: string, limit: number) {
     const url = this.SERVER_BASE_URL + project_id + '/leads?limit=' + limit + '&with_fullname=true';
     this.logger.log('[TILEDESK-SERVICE] - GET ALL ACTIVE LEADS (LIMIT 10000) -  URL', url);
@@ -260,5 +244,26 @@ export class TiledeskService {
         return res
     }))
   }
+
+  // -----------------------------------------------------------------------------------------
+  // @ Add participant to request
+  // -----------------------------------------------------------------------------------------
+  public addParticipant(requestid: string, userid: string, project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/requests/' + requestid + '/participants';
+    this.logger.log('[TILEDESK-SERVICE] addParticipant - URL ', url)
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        'Authorization': this.tiledeskToken
+      })
+    };
+
+    const body = { 'member': userid };
+
+    return this.http.post(url, JSON.stringify(body), httpOptions).pipe(map((res: any) => {
+      this.logger.log('[TILEDESK-SERVICE] addParticipant - RES ', res);
+      return res
+    }))
+  }
   
 }

package/src/app/services/triggerEvents/triggerEvents.ts

@@ -102,5 +102,33 @@ export class TriggerEvents {
         }
     }
 
+    public triggerOnUpdateNewConversationBadge(detailObj: {}) {
+        this.logger.debug(' ---------------- triggerOnUpdateNewConversationBadge ---------------- ', detailObj);
+        try {
+            const onBeforeInit = new CustomEvent('onUpdateNewConversationBadge', { detail: detailObj });
+            const windowContext = this.windowContext;
+            if (windowContext){
+                // windowContext.document.dispatchEvent(onNewConversation);
+                windowContext.postMessage({type: "onUpdateNewConversationBadge", detail: detailObj }, '*')
+            }
+        } catch (e) {
+            this.logger.error('[TRIGGER-HANDLER] > Error:' + e);
+        }
+    }
+
+    public triggerOnOpenTicketExternally(detailObj: {}) {
+        this.logger.debug(' ---------------- triggerOnOpenTicketExternally ---------------- ', detailObj);
+        try {
+            const onBeforeInit = new CustomEvent('onOpenTicketExternally', { detail: detailObj });
+            const windowContext = this.windowContext;
+            if (windowContext){
+                // windowContext.document.dispatchEvent(onNewConversation);
+                windowContext.postMessage({type: "onOpenTicketExternally", detail: detailObj }, '*')
+            }
+        } catch (e) {
+            this.logger.error('[TRIGGER-HANDLER] > Error:' + e);
+        }
+    }
+
     
 }