@vgroup/dialbox 0.1.99 → 0.1.101

package/fesm2020/vgroup-dialbox.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, Input, Output, ViewChild, Inject, NgModule } from '@angular/core';
 import swal from 'sweetalert2';
 import { AsYouType } from 'libphonenumber-js';
-import { throwError, BehaviorSubject, forkJoin, of, interval, Subscription } from 'rxjs';
+import { throwError, BehaviorSubject, of, interval, Subscription } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpClientModule } from '@angular/common/http';
 import { catchError, switchMap, map, tap, shareReplay } from 'rxjs/operators';
@@ -535,38 +535,6 @@ class ExtensionService {
         const httpOptions = { headers: new HttpHeaders(params) };
         return this.http.put(environment.apiUrl + '/utilities/softphone/update/callerid/label', dtModel, httpOptions);
     }
-    // initiateCall(payload: any): Observable<any> {
-    //   return this.fetchBlockedCountries().pipe(
-    //     switchMap(blockedCountries => {
-    //       return this.ipAddressService.getIpAddressInfo().pipe(
-    //         switchMap(ipAddressInfo => {
-    //             const params = {
-    //               'Content-Type': 'application/json',
-    //               'Auth-Key': 'Bearer ' + localStorage.getItem('ext_token'),
-    //               'ip-address': ipAddressInfo.ip,
-    //               'ip-country': ipAddressInfo.address.country,
-    //             };
-    //             payload = {...payload, proxy:ipAddressInfo.proxy.toString()}
-    //             const httpOptions = { headers: new HttpHeaders(params) };
-    //             return this.http.post<[]>(environment.apiUrl + '/utilities/ext/ur/initiate/call', payload, httpOptions).pipe(
-    //               catchError(error => {
-    //                 return throwError(error);
-    //               }), 
-    //             );
-    //             return this.http.post<[]>(environment.apiUrl + '/ur/initiate/conference/call', payload, httpOptions).pipe(
-    //               catchError(error => {
-    //                 return throwError(error);
-    //               }), 
-    //             );
-    //         }),
-    //         catchError(error => {
-    //           // Catch error from getIpAddressInfo
-    //           return throwError(error);
-    //         })
-    //       );
-    //     })
-    //   );
-    // }
     initiateCall(payload) {
         return this.fetchBlockedCountries().pipe(switchMap(blockedCountries => {
             return this.ipAddressService.getIpAddressInfo().pipe(switchMap(ipAddressInfo => {
@@ -576,20 +544,57 @@ class ExtensionService {
                     'ip-address': ipAddressInfo.ip,
                     'ip-country': ipAddressInfo.address.country,
                 };
-                const params1 = {
-                    "from": payload.from,
-                    "to": payload.to,
-                    "userId": payload.userId
-                };
                 payload = { ...payload, proxy: ipAddressInfo.proxy.toString() };
                 const httpOptions = { headers: new HttpHeaders(params) };
-                const api1$ = this.http.post(`${environment.apiUrl}/utilities/ext/ur/initiate/call`, payload, httpOptions);
-                const api2$ = this.http.post(`${environment.apiUrl}/ur/initiate/conference/call`, params1, httpOptions);
-                // Run both requests in parallel
-                return forkJoin([api1$, api2$]).pipe(catchError(error => throwError(() => error)));
-            }), catchError(error => throwError(() => error)));
+                return this.http.post(environment.apiUrl + '/utilities/ext/ur/initiate/call', payload, httpOptions).pipe(catchError(error => {
+                    return throwError(error);
+                }));
+                return this.http.post(environment.apiUrl + '/ur/initiate/conference/call', payload, httpOptions).pipe(catchError(error => {
+                    return throwError(error);
+                }));
+            }), catchError(error => {
+                // Catch error from getIpAddressInfo
+                return throwError(error);
+            }));
         }));
     }
+    // initiateCall(payload: any): Observable<any> {
+    //   return this.fetchBlockedCountries().pipe(
+    //     switchMap(blockedCountries => {
+    //       return this.ipAddressService.getIpAddressInfo().pipe(
+    //         switchMap(ipAddressInfo => {
+    //           const params = {
+    //             'Content-Type': 'application/json',
+    //             'Auth-Key': 'Bearer ' + localStorage.getItem('ext_token'),
+    //             'ip-address': ipAddressInfo.ip,
+    //             'ip-country': ipAddressInfo.address.country,
+    //           };
+    //           const params1 = {
+    //             "from": payload.from,
+    //             "to": payload.to,
+    //             "userId": payload.userId
+    //           };
+    //           payload = { ...payload, proxy: ipAddressInfo.proxy.toString() };
+    //           const httpOptions = { headers: new HttpHeaders(params) };
+    //           const api1$ = this.http.post(
+    //             `${environment.apiUrl}/utilities/ext/ur/initiate/call`,
+    //             payload,
+    //             httpOptions
+    //           );
+    //           const api2$ = this.http.post(
+    //             `${environment.apiUrl}/ur/initiate/conference/call`,
+    //             params1,
+    //             httpOptions
+    //           );
+    //           return forkJoin([api1$, api2$]).pipe(
+    //             catchError(error => throwError(() => error))
+    //           );
+    //         }),
+    //         catchError(error => throwError(() => error))
+    //       );
+    //     })
+    //   );
+    // }
     fetchBlockedCountries() {
         return this.http.get(environment.apiUrl + '/global/master/ur/blacklisted/countrylist').pipe(map(response => {
             if (response.response === 'Success' && Array.isArray(response.countries)) {
@@ -1903,6 +1908,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
             }] } });
 
 class CallProgressComponent {
+    // contacts: any[] = [
+    //   { name: 'Pamela Cox', title: 'Product Designer', img: 'assets/images/user.jpg' },
+    //   { name: 'Roger S. Wood', title: 'JavaScript Programmer', img: 'assets/images/user.jpg' },
+    //   { name: 'Victor Blackston', title: 'Database Administrator', img: 'assets/images/user.jpg' },
+    //   { name: 'Tammy Rios', title: 'Support', img: 'assets/images/user.jpg' },
+    //   { name: 'Carlos Henderson', title: 'Software Architect', img: 'assets/images/user.jpg' },
+    //   { name: 'Elizabeth Bailey', title: 'HR', img: 'assets/images/user.jpg' }
+    // ];
     constructor(extensionService, cdr, twilioService) {
         this.extensionService = extensionService;
         this.cdr = cdr;
@@ -1932,14 +1945,7 @@ class CallProgressComponent {
         this.showContactsPanel = false;
         this.isConcurrentIncoming = false;
         this.isCallOnHold = false;
-        this.contacts = [
-            { name: 'Pamela Cox', title: 'Product Designer', img: 'assets/images/user.jpg' },
-            { name: 'Roger S. Wood', title: 'JavaScript Programmer', img: 'assets/images/user.jpg' },
-            { name: 'Victor Blackston', title: 'Database Administrator', img: 'assets/images/user.jpg' },
-            { name: 'Tammy Rios', title: 'Support', img: 'assets/images/user.jpg' },
-            { name: 'Carlos Henderson', title: 'Software Architect', img: 'assets/images/user.jpg' },
-            { name: 'Elizabeth Bailey', title: 'HR', img: 'assets/images/user.jpg' }
-        ];
+        this.contacts = [];
         this.isMinimised = false;
         console.log('Call Progress Component');
     }
@@ -2024,6 +2030,13 @@ class CallProgressComponent {
         //   this.isRecording = false;
         // }, 3000);
     }
+    GetContactsList() {
+        const token = localStorage.getItem('ext_token') || '';
+        this.extensionService.readContacts(token).subscribe((res) => {
+            this.contacts = res;
+            console.log(this.contacts, 'contacts');
+        });
+    }
     async startCall(callData) {
         try {
             this.showRingAnimation = true;
@@ -2196,6 +2209,7 @@ class CallProgressComponent {
     }
     toggleContactsPanel() {
         this.showContactsPanel = !this.showContactsPanel;
+        this.GetContactsList();
     }
     callContact(contact) {
     }