@vgroup/dialbox 0.0.29 → 0.0.30

package/fesm2020/vgroup-dialbox.mjs

@@ -115,28 +115,12 @@ class TwilioService {
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
     }
-    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);
-    }
+    // onIncomingCall(){
+    //   this.device.on('incoming', (call:any) => {
+    //     console.log(call);
+    //     //call.accept();
+    //   });
+    // }
     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);
@@ -1587,7 +1571,7 @@ class IncomingCallComponent {
     }
     getUserInformation(incomingCallData) {
         let data = this.fromEntries(Array.from(incomingCallData.customParameters.entries()));
-        this.extensionService.getUserInformation(data.twilioAuthId).subscribe(response => {
+        this.extensionService.getUserInformation(data['twilioAuthId']).subscribe(response => {
             setTimeout(() => {
                 incomingCallData['userInfo'] = response;
             }, 5000);
@@ -1666,16 +1650,16 @@ class CallProgressComponent {
                 this.startCall(changes['callData'].currentValue);
             }
         }
-        if (changes.newIncomingCallData) {
+        if (changes['newIncomingCallData']) {
             try {
-                if (changes.newIncomingCallData.currentValue) {
+                if (changes['newIncomingCallData'].currentValue) {
                     if (this.call && (this.call.status() == 'open')) {
                         this.call.disconnect();
-                        this.call = changes.newIncomingCallData.currentValue;
+                        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.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();
                     }
@@ -2175,44 +2159,27 @@ 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) {
-                        // If there's already a call in progress, add to new incoming calls
-                        this.newIncomingCalls.push({
-                            ...newCallData,
-                            parameters: incomingCallData.parameters,
-                            customParameters: incomingCallData.customParameters
-                        });
+                        this.newIncomingCalls.push(incomingCallData);
                         this.getUserInformation(incomingCallData);
                     }
                     else {
-                        // If no call in progress, handle as primary incoming call
                         this.isCallInProgress = true;
                         this.isDialpadHidden = false;
-                        // Update callData with a new object to trigger change detection
-                        this.callData = { ...newCallData };
-                        // Get additional user information
+                        this.callData.phone = incomingCallData.parameters['From'];
                         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);
+                        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== incomingCallData.parameters['CallSid']);
                         if (this.incomingCallsList.length == 0) {
                             this.isCallInProgress = false;
                         }
                     });
                     incomingCallData.on('disconnect', () => {
-                        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== incomingCallData.parameters.CallSid);
+                        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== incomingCallData.parameters['CallSid']);
                         if (this.incomingCallsList.length == 0) {
                             this.isCallInProgress = false;
                         }
@@ -2229,30 +2196,11 @@ class DialboxComponent {
     getUserInformation(incomingCallData) {
         console.log('getUserInformation', incomingCallData);
         let data = this.fromEntries(Array.from(incomingCallData.customParameters.entries()));
-        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);
-            }
+        this.extensionService.getUserInformation(data['twilioAuthId']).subscribe(response => {
+            incomingCallData['userInfo'] = response;
+            this.incomingCallsList.push(incomingCallData);
         }, 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];
+            console.error('Error starting recording', error);
         });
     }
     fromEntries(entries) {
@@ -2265,7 +2213,7 @@ class DialboxComponent {
         this.registerDragElement();
     }
     ngOnChanges(changes) {
-        if (changes.isDialpadHidden && !this.isDialpadHidden) {
+        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
             this.getContactList();
             this.getUserCallSetting();
             setTimeout(() => {
@@ -2984,8 +2932,8 @@ class DialboxComponent {
     }
     rejectNewIncomingCall(call) {
         call.reject();
-        this.newIncomingCalls = this.newIncomingCalls.filter((item) => item.parameters.CallSid !== call.parameters.CallSid);
-        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== call.parameters.CallSid);
+        this.newIncomingCalls = this.newIncomingCalls.filter((item) => item.parameters.CallSid !== call.parameters['CallSid']);
+        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== call.parameters['CallSid']);
     }
     newIncomingCallInitiated() {
         this.isCallInProgress = true;