@vgroup/dialbox 0.0.13 → 0.0.15

package/fesm2020/vgroup-dialbox.mjs

@@ -9,7 +9,7 @@ import { catchError, switchMap, map } from 'rxjs/operators';
 import * as i3$2 from '@angular/material/dialog';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import * as i5 from '@angular/router';
-import { RouterLink } from '@angular/router';
+import { RouterLink, RouterModule } from '@angular/router';
 import * as i3 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i3$1 from '@angular/forms';
@@ -1634,36 +1634,52 @@ class CallProgressComponent {
         console.log('Call Progress Component');
     }
     ngOnChanges(changes) {
-        console.log('Call Progress Component ngOnChanges');
-        if (changes.callData) {
-            console.log('Call Progress Component ngOnChanges callData', changes.callData);
-            if (changes.callData.currentValue.isIncomingCall) {
-                changes.incomingCallDiv = true;
+        console.log('Call Progress Component ngOnChanges', changes);
+        // Handle callData changes (outgoing calls)
+        if (changes['callData'] && changes['callData'].currentValue) {
+            console.log('Call Progress Component ngOnChanges callData', changes['callData'].currentValue);
+            const callData = changes['callData'].currentValue;
+            if (callData.isIncomingCall) {
+                this.incomingCallDiv = true;
+                this.callData = { ...callData };
+                this.showRingAnimation = true;
+                this.startTimer();
             }
             else {
-                //for outgoing call
-                this.startCall(changes.callData.currentValue);
+                // For outgoing call
+                this.callData = { ...callData };
+                this.startCall(callData);
             }
         }
-        if (changes.newIncomingCallData) {
+        // Handle new incoming call data from Twilio
+        if (changes['newIncomingCallData'] && changes['newIncomingCallData'].currentValue) {
             try {
-                if (changes.newIncomingCallData.currentValue) {
-                    if (this.call && (this.call.status() == 'open')) {
-                        this.call.disconnect();
-                        this.call = changes.newIncomingCallData.currentValue;
-                        this.call?.accept();
-                        this.callData.phone = (this.call?.parameters).From;
-                        this.callData.name = (this.call?.customParameters).get('name');
-                        this.callData.img = (this.call?.customParameters).get('image') || 'assets/images/user.jpg';
-                        this.incomingCallInitiated.emit();
-                        this.startTimer();
-                    }
+                const incomingCall = changes['newIncomingCallData'].currentValue;
+                // If there's an active call, handle it appropriately
+                if (this.call && this.call.status() === 'open') {
+                    // You might want to handle multiple calls here
+                    // For now, we'll just update the current call
+                    this.call.disconnect();
                 }
+                this.call = incomingCall;
+                this.callData = {
+                    ...this.callData,
+                    phone: incomingCall.parameters.From,
+                    name: incomingCall.customParameters?.get('name') || 'Unknown Caller',
+                    img: incomingCall.customParameters?.get('image') || 'assets/images/user.jpg',
+                    isIncomingCall: true
+                };
+                this.incomingCallDiv = true;
+                this.showRingAnimation = true;
+                this.incomingCallInitiated.emit();
+                this.startTimer();
             }
             catch (e) {
-                console.log(e);
+                console.error('Error handling incoming call:', e);
             }
         }
+        // Update the view
+        this.cdr.detectChanges();
     }
     ngAfterViewInit() { }
     async startCall(callData) {
@@ -2143,31 +2159,16 @@ class DialboxComponent {
                     }
                 }
             });
-            // Handle incoming call
-            const sub2 = this.twilioService.currentCall.subscribe((incomingCallData) => {
-                if (incomingCallData) {
-                    console.log('Incoming call received:', incomingCallData);
-                    this.isCallInProgress = true;
-                    this.isDialpadHidden = false;
-                    // Update call data for the UI
-                    this.callData = {
-                        ...this.callData,
-                        phone: incomingCallData.parameters.From,
-                        name: incomingCallData.customParameters?.get('name') || 'Unknown Caller',
-                        img: incomingCallData.customParameters?.get('image') || 'assets/images/user.jpg',
-                        isIncomingCall: true,
-                        extNum: incomingCallData.parameters.To || ''
-                    };
-                    // Add to incoming calls list if not already present
-                    const callSid = incomingCallData.parameters.CallSid;
-                    const existingCall = this.incomingCallsList.find((call) => call.parameters.CallSid === callSid);
-                    if (!existingCall) {
-                        this.incomingCallsList.push(incomingCallData);
-                        this.incomingCallsNewInfoEvent.emit(this.incomingCallsList);
-                    }
-                    // Notify parent component about the incoming call
-                    this.incomingCallInitiated.emit();
-                }
+            // handle incoming call
+            const sub2 = this.twilioService.currentCall.subscribe(incomingCallData => {
+                // if (incomingCallData) {
+                //   this.isCallInProgress = true;
+                //   this.isDialpadHidden = false;
+                //   this.callData.phone = incomingCallData.parameters.From;
+                //   this.callData.name = incomingCallData.customParameters.get('name');
+                //   this.callData.img = incomingCallData.customParameters.get('image');
+                //   this.callData.isIncomingCall = true;
+                // }
                 if (incomingCallData) {
                     if (this.isCallInProgress) {
                         this.newIncomingCalls.push(incomingCallData);
@@ -3060,14 +3061,16 @@ DialboxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version:
         FormsModule,
         ReactiveFormsModule,
         HttpClientModule,
-        RouterLink], exports: [DialboxComponent,
+        RouterLink,
+        RouterModule], exports: [DialboxComponent,
         CallProgressComponent,
         CallerIdDialogComponent,
         IncomingCallComponent] });
 DialboxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: DialboxModule, imports: [CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        HttpClientModule] });
+        HttpClientModule,
+        RouterModule] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: DialboxModule, decorators: [{
             type: NgModule,
             args: [{
@@ -3082,7 +3085,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
                         FormsModule,
                         ReactiveFormsModule,
                         HttpClientModule,
-                        RouterLink
+                        RouterLink,
+                        RouterModule
                     ],
                     exports: [
                         DialboxComponent,