@vgroup/dialbox 0.0.27 → 0.0.29

package/fesm2020/vgroup-dialbox.mjs

@@ -115,12 +115,28 @@ class TwilioService {
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
     }
-    // onIncomingCall(){
-    //   this.device.on('incoming', (call:any) => {
-    //     console.log(call);
-    //     //call.accept();
-    //   });
-    // }
+    onIncomingCall() {
+        this.device.on('incoming', (call) => {
+            console.log('Incoming call from:', call.parameters['From']);
+            // Update the current call subject with the incoming call
+            this.currentCall.next(call);
+            // Update call state to ringing
+            this.currentCallState.next('ringing');
+            // Emit a custom event with the call data
+            this.dispatchIncomingCallEvent(call);
+        });
+    }
+    dispatchIncomingCallEvent(call) {
+        const event = new CustomEvent('incomingCall', {
+            detail: {
+                call,
+                isIncomingCall: true,
+                from: call.parameters['From'],
+                to: call.parameters['To']
+            }
+        });
+        window.dispatchEvent(event);
+    }
     saveContact(payload) {
         const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': "Bearer " + localStorage.getItem('ext_token') }) };
         return this.http.post(environment.apiUrl + '/utilities/phonebook/add/contacts/manually', payload, httpOptions);
@@ -1635,14 +1651,19 @@ class CallProgressComponent {
     }
     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', changes);
+        if (changes['callData']) {
+            console.log('Call Progress Component ngOnChanges callData', changes['callData'].currentValue);
+            if (changes['callData'].currentValue?.isIncomingCall) {
+                console.log('Incoming call detected, showing incoming call UI');
+                this.incomingCallDiv = true;
+                this.cdr.detectChanges(); // Trigger change detection
             }
-            else {
-                //for outgoing call
-                this.startCall(changes.callData.currentValue);
+            else if (changes['callData'].currentValue) {
+                // For outgoing call
+                console.log('Outgoing call detected');
+                this.incomingCallDiv = false;
+                this.startCall(changes['callData'].currentValue);
             }
         }
         if (changes.newIncomingCallData) {
@@ -2154,18 +2175,35 @@ class DialboxComponent {
                 //   this.callData.isIncomingCall = true;
                 // }
                 if (incomingCallData) {
+                    // Create a new call data object to ensure change detection works
+                    const callSid = incomingCallData.parameters.CallSid;
+                    const fromNumber = incomingCallData.parameters.From;
+                    const newCallData = {
+                        phone: fromNumber,
+                        displayNum: fromNumber,
+                        dial: false,
+                        name: incomingCallData.customParameters.get('name') || fromNumber,
+                        img: incomingCallData.customParameters.get('image') || 'assets/images/user.jpg',
+                        isIncomingCall: true,
+                        callSid: callSid
+                    };
                     if (this.isCallInProgress) {
-                        this.newIncomingCalls.push(incomingCallData);
+                        // If there's already a call in progress, add to new incoming calls
+                        this.newIncomingCalls.push({
+                            ...newCallData,
+                            parameters: incomingCallData.parameters,
+                            customParameters: incomingCallData.customParameters
+                        });
                         this.getUserInformation(incomingCallData);
                     }
                     else {
+                        // If no call in progress, handle as primary incoming call
                         this.isCallInProgress = true;
                         this.isDialpadHidden = false;
-                        this.callData.phone = incomingCallData.parameters.From;
+                        // Update callData with a new object to trigger change detection
+                        this.callData = { ...newCallData };
+                        // Get additional user information
                         this.getUserInformation(incomingCallData);
-                        this.callData.name = incomingCallData.customParameters.get('name');
-                        this.callData.img = incomingCallData.customParameters.get('image') || 'assets/images/user.jpg';
-                        this.callData.isIncomingCall = true;
                     }
                     incomingCallData.on('cancel', () => {
                         this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== incomingCallData.parameters.CallSid);
@@ -2191,11 +2229,30 @@ class DialboxComponent {
     getUserInformation(incomingCallData) {
         console.log('getUserInformation', incomingCallData);
         let data = this.fromEntries(Array.from(incomingCallData.customParameters.entries()));
-        this.extensionService.getUserInformation(data.twilioAuthId).subscribe(response => {
-            incomingCallData['userInfo'] = response;
-            this.incomingCallsList.push(incomingCallData);
+        this.extensionService.getUserInformation(data.twilioAuthId).subscribe((response) => {
+            try {
+                // Create a safe response object with default values
+                const safeResponse = response || {};
+                const c2cInfo = safeResponse.c2cInformation || {};
+                // Update the call data with user information
+                this.callData = {
+                    ...this.callData,
+                    name: c2cInfo.name || this.callData.name,
+                    displayNum: c2cInfo.number || this.callData.phone,
+                    userInfo: safeResponse
+                };
+                // Add to incoming calls list
+                incomingCallData['userInfo'] = safeResponse;
+                this.incomingCallsList = [...this.incomingCallsList, incomingCallData];
+            }
+            catch (error) {
+                console.error('Error processing user information:', error);
+            }
         }, error => {
-            console.error('Error starting recording', error);
+            console.error('Error fetching user information:', error);
+            // Even if there's an error, we should still add the call to the list
+            incomingCallData['userInfo'] = { error: 'Failed to fetch user details' };
+            this.incomingCallsList = [...this.incomingCallsList, incomingCallData];
         });
     }
     fromEntries(entries) {