@chat21/chat21-ionic 3.0.58 → 3.0.59-rc4

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

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { UnassignedConversationsPageRoutingModule } from './unassigned-conversations-routing.module';
+
+import { UnassignedConversationsPage } from './unassigned-conversations.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    UnassignedConversationsPageRoutingModule
+  ],
+  declarations: [
+    UnassignedConversationsPage,
+  ]
+})
+export class UnassignedConversationsPageModule {}

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

@@ -0,0 +1,14 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>{{translationMap.get('UnassignedConversations') }}</ion-title>
+    <ion-buttons slot="end">
+      <ion-button ion-button fill="clear" (click)="onClose()">
+        <ion-icon slot="icon-only" name="close"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content overflow-scroll="true" id="iframe-ion-content">
+  <!-- <iframe  id="i_frame"  style="width:100%; height:99%" frameBorder="0" allowfullscreen [src]="unassigned_convs_url_sanitized"></iframe> -->
+</ion-content>

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

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { UnassignedConversationsPage } from './unassigned-conversations.page';
+
+describe('UnassignedConversationsPage', () => {
+  let component: UnassignedConversationsPage;
+  let fixture: ComponentFixture<UnassignedConversationsPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UnassignedConversationsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(UnassignedConversationsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,105 @@
+import { Component, Input, OnInit, SecurityContext } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+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';
+import { DomSanitizer } from '@angular/platform-browser'
+import { CustomTranslateService } from 'src/chat21-core/providers/custom-translate.service';
+
+
+@Component({
+  selector: 'app-unassigned-conversations',
+  templateUrl: './unassigned-conversations.page.html',
+  styleUrls: ['./unassigned-conversations.page.scss'],
+})
+export class UnassignedConversationsPage implements OnInit {
+
+  @Input() unassigned_convs_url: any;
+  unassigned_convs_url_sanitized: any;
+  private logger: LoggerService = LoggerInstance.getInstance();
+  has_loaded: boolean;
+  ion_content: any;
+  iframe: any;
+  public translationMap: Map<string, string>;
+  constructor(
+    private modalController: ModalController,
+    private navService: NavProxyService,
+    private sanitizer: DomSanitizer,
+    private translateService: CustomTranslateService,
+  ) { }
+
+  ngOnInit() {
+    const keys = ['UnassignedConversations'];
+    this.translationMap = this.translateService.translateLanguage(keys);
+
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] - UNASSIGNED CONVS URL (ngOnInit)', this.unassigned_convs_url);
+    // this.unassigned_convs_url_sanitized = this.sanitizer.bypassSecurityTrustResourceUrl(this.unassigned_convs_url);
+    // this.unassigned_convs_url_sanitized = this.sanitizer.bypassSecurityTrustHtml(this.unassigned_convs_url);
+    this.unassigned_convs_url_sanitized = this.sanitizer.sanitize(SecurityContext.URL, this.unassigned_convs_url)
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] - UNASSIGNED CONVS URL SANITIZED (ngOnInit)', this.unassigned_convs_url_sanitized);
+    this.has_loaded = false
+
+    this.ion_content = document.getElementById("iframe-ion-content");
+    this.iframe = document.createElement("iframe");
+    this.iframe.src = this.unassigned_convs_url_sanitized;
+    this.iframe.width = "100%";
+    this.iframe.height = "99.6%";
+    this.iframe.id = "unassigned-convs-iframe"
+    this.iframe.frameBorder = "0";
+    this.iframe.style.border = "none";
+    this.iframe.style.background = "white";
+    this.ion_content.appendChild(this.iframe);
+
+    // }
+
+    // window.addEventListener("message", (event) => {
+    //   console.log("[UNASSIGNED-CONVS-PAGE] message event ", event);
+
+    //   if (event && event.data) {
+    //     if (event.data === 'finished') {
+    //       this.has_loaded = true
+
+    //     }
+    //   }
+    // });
+
+  }
+
+  
+
+  // getIframeHaLoaded() {
+  //   var self = this;
+  //   var iframe = document.getElementById('i_frame') as HTMLIFrameElement;;
+  //   if (iframe) {
+  //     iframe.addEventListener("load", function () {
+  //       console.log("[UNASSIGNED-CONVS-PAGE] GET - Finish");
+  //       self.has_loaded = true
+    
+
+  //     });
+  //   }
+  // }
+
+  //   loadDeferredIframe(unassigned_convs_url_sanitized) {
+  //     // this function will load the Google homepage into the iframe
+  //     var iframe = document.getElementById("my-deferred-iframe");
+  //     iframe.src = "./" // here goes your url
+  // };
+
+
+  async onClose() {
+    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();
+
+    if (isModalOpened) {
+      this.modalController.dismiss({
+
+        confirmed: true
+      });
+    } else {
+      this.navService.pop();
+    }
+  }
+
+}

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

@@ -25,7 +25,7 @@ export class NavProxyService {
   
     this.sidebarNav = sidebarNav;
     this.detailNav = detailNav;
-    this.logger.info('[NAV-SERV] initialize sidebarNav', sidebarNav, ' detailNav', detailNav);
+    this.logger.log('[NAV-SERV] initialize sidebarNav', sidebarNav, ' detailNav', detailNav);
   }
 
   setRoot(page: any, navExtra: any) {

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

@@ -21,6 +21,8 @@ export class TiledeskService {
     public appConfigProvider: AppConfigProvider
   ) {
     this.apiUrl = appConfigProvider.getConfig().apiUrl;
+    // const projectUrl = this.apiUrl + 'projects/'
+    // console.log('[TILEDESK-SERVICE] projectUrl' ,projectUrl  )
   }
 
 
@@ -51,7 +53,7 @@ export class TiledeskService {
 
   // http://tiledesk-server-pre.herokuapp.com/requests_util/lookup/id_project/support-group-60ffe291f725db00347661ef-b4cb6875785c4a23b27244fe498eecf44
   public getProjectIdByConvRecipient(token: string ,conversationWith: string ) {
-    const lookupUrl =this.apiUrl + 'requests_util/lookup/id_project/' + conversationWith;
+    const lookupUrl = this.apiUrl + 'requests_util/lookup/id_project/' + conversationWith;
 
     this.logger.log('[TILEDESK-SERVICE] GET PROJECTID BY CONV RECIPIENT - URL ', lookupUrl);
 
@@ -70,6 +72,25 @@ export class TiledeskService {
       }))
   }
 
+  public getProjects(token: string) {
+    const url = this.apiUrl + 'projects/';
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECTS URL', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: token
+      })
+    };
+
+    return this.http
+    .get(url, httpOptions)
+    .pipe(map((res: any) => {
+      this.logger.log('[TILEDESK-SERVICE] GET PROJECTS - RES ', res);
+      return res
+    }))
+  }
+