@vgroup/dialbox 0.1.22 → 0.1.24

package/fesm2020/vgroup-dialbox.mjs

@@ -1572,41 +1572,32 @@ class IncomingCallComponent {
         this.selectedIncomingCallInfo = new EventEmitter();
     }
     ngOnInit() {
-        // this.twilioService.currentCall.subscribe((call: any) => {
-        //   if (call) {
-        //     this.twilioCallData = call;
-        //     this.notificationSerivce.showNotification(call);
-        //     // Handle the call UI
-        //   }
-        // });
         try {
             this.twilioService.currentCall.subscribe(call => {
-                if (call) {
-                    const callSid = call.parameters?.['CallSid'];
-                    if (!callSid)
-                        return;
-                    // Check if this call already exists in the list
-                    const callExists = this.newIncomingCallsList?.some((item) => item.parameters?.['CallSid'] === callSid);
-                    if (callExists) {
-                        console.log('Call already exists in the list:', callSid);
-                        return;
+                if (call && call.parameters['CallSid']) {
+                    if (!this.newIncomingCallsList) {
+                        this.newIncomingCallsList = [];
                     }
-                    this.twilioCallData = call;
-                    this.twilioAuthId = call.customParameters?.get('twilioAuthId');
-                    if (!call.parameters) {
-                        call.parameters = {};
+                    const callSid = call.parameters['CallSid'];
+                    const existingCall = this.newIncomingCallsList.find((c) => c.parameters['CallSid'] === callSid);
+                    if (!existingCall) {
+                        this.newIncomingCallsList.push(call);
+                        this.incomingCallsNewList.emit(this.newIncomingCallsList);
+                        if (!this.twilioCallData) {
+                            this.twilioCallData = call;
+                            this.twilioAuthId = call.customParameters.get('twilioAuthId');
+                            if (!call.parameters) {
+                                call.parameters = {};
+                            }
+                            this.sendIPforIncomingCall(this.twilioAuthId, '');
+                        }
+                        call.on('cancel', () => {
+                            this.removeCallFromList(callSid);
+                        });
+                        call.on('disconnect', () => {
+                            this.removeCallFromList(callSid);
+                        });
                     }
-                    // Add call to the list
-                    this.newIncomingCallsList = [...(this.newIncomingCallsList || []), call];
-                    this.incomingCallsNewList.emit(this.newIncomingCallsList);
-                    this.sendIPforIncomingCall(this.twilioAuthId, '');
-                    // Set up event handlers for the call
-                    call.on('cancel', () => {
-                        this.handleCallEnd(call, callSid);
-                    });
-                    call.on('disconnect', () => {
-                        this.handleCallEnd(call, callSid);
-                    });
                 }
             });
         }
@@ -1629,52 +1620,30 @@ class IncomingCallComponent {
             }
         });
     }
-    // Helper method to handle call end events
-    handleCallEnd(call, callSid) {
-        if (!callSid)
-            return;
-        // Remove call from the list
+    removeCallFromList(callSid) {
         if (this.newIncomingCallsList) {
-            this.newIncomingCallsList = this.newIncomingCallsList.filter((item) => item.parameters?.['CallSid'] !== callSid);
-            this.incomingCallsNewList.emit([...this.newIncomingCallsList]);
-            // Close UI if no more calls
+            this.newIncomingCallsList = this.newIncomingCallsList.filter((c) => c.parameters['CallSid'] !== callSid);
+            this.incomingCallsNewList.emit(this.newIncomingCallsList);
             if (this.newIncomingCallsList.length === 0) {
-                this.closeIncomingCallDiv.emit({ show: 0, call });
+                this.closeIncomingCallDiv.emit({ show: 0, call: null });
             }
         }
     }
     rejectCallFromList(data) {
         if (!data)
             return;
-        const callSid = data.parameters?.['CallSid'];
-        if (!callSid)
-            return;
-        try {
-            // Try to reject or disconnect the call
-            if (typeof data.reject === 'function') {
-                data.reject();
-            }
-            else if (typeof data.disconnect === 'function') {
-                data.disconnect();
-            }
-            // Update call status
-            if (data.parameters) {
-                data.parameters['isCallConnected'] = false;
-            }
-            // Update call status on the server
-            if (data.customParameters) {
-                const twilioAuthId = data.customParameters.get('twilioAuthId');
-                if (twilioAuthId) {
-                    this.sendIPforIncomingCall(twilioAuthId, 'completed');
-                }
-            }
-            // Remove call from the list
-            this.handleCallEnd(data, callSid);
+        if (data.reject)
+            data.reject();
+        if (data.disconnect)
+            data.disconnect();
+        if (data.parameters) {
+            data.parameters['isCallConnected'] = false; // Should be false when rejecting
         }
-        catch (error) {
-            console.error('Error rejecting call:', error);
-            // Make sure to clean up even if there's an error
-            this.handleCallEnd(data, callSid);
+        if (data.customParameters) {
+            this.sendIPforIncomingCall(data.customParameters.get('twilioAuthId'), 'answered');
+        }
+        if (this.newIncomingCallsList && data && data.parameters && data.parameters.CallSid) {
+            this.removeCallFromList(data.parameters.CallSid);
         }
     }
     closeIncomingCallWrapper(val) {
@@ -2169,6 +2138,9 @@ class CallProgressComponent {
     incomingCallsNewList(data) {
         this.newIncomingCallsList = data;
         this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
+        if (!data || data.length === 0) {
+            this.incomingCallDiv = false;
+        }
     }
     selectedIncomingCallInfo(data) {
         this.selectedIncomingCall = data;