@vgroup/dialbox 0.4.158 → 0.4.159

package/fesm2020/vgroup-dialbox.mjs

@@ -1783,11 +1783,11 @@ class CallProgressComponent {
                 this.isConcurrentIncoming = true;
                 this.incomingCallDiv = true;
                 // Add to list if not present
-                const exists = (this.newIncomingCallsList || []).some((c) => c?.parameters?.CallSid === incoming?.parameters?.CallSid);
-                if (!exists) {
-                    this.newIncomingCallsList = [...(this.newIncomingCallsList || []), incoming];
-                    this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
-                }
+                // const exists = (this.newIncomingCallsList || []).some((c: any) => c?.parameters?.CallSid === incoming?.parameters?.CallSid);
+                // if (!exists) {
+                //   this.newIncomingCallsList = [...(this.newIncomingCallsList || []), incoming];
+                //   this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
+                // }
                 this.cdr.detectChanges();
                 // }
             });
@@ -1831,66 +1831,84 @@ class CallProgressComponent {
             // try {
             if (this.newIncomingCallsList?.length) {
                 // Check if there's an active ongoing call
-                this.conferenceId = this.newIncomingCallsList[0].conferenceId;
-                this.newIncomingCallsList.forEach(async (res) => {
-                    if (this.currentCallList.length > 0) {
-                        let index = this.currentCallList.findIndex((item) => item.id == res.id);
-                        if (index == -1 && !res.isLeft) {
-                            this.currentCallList.push({
-                                ...res,
-                                img: 'assets/images/user.jpg',
-                                isIncomingCall: res.direction == "incoming-call",
-                                isHold: res.isHold,
-                                isMute: false,
-                                isConference: res.isConference,
-                                isAcceptCall: res.direction == "incoming-call" ? this.getStatus(res) : true,
-                                dial: true,
-                                phone: res.direction == "incoming-call" ? res?.from : res?.to,
-                                participantId: res.id,
-                                name: res.name || res?.fromName || res?.toName,
-                                time: this.getTimeDifference(res.joinedAt || new Date().toUTCString()),
-                            });
-                            if (this.showContactsPanel) {
-                                this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
-                                this.applyFilter();
-                            }
-                        }
-                        else if (index != -1 && res.isLeft) {
-                            if (this.currentCallList[index]?.id == this.currentCall?.id) {
-                                this.currentCallList.splice(index, 1);
-                                this.currentCall = this.currentCallList.length > 0 ? this.currentCallList[0] : {};
-                                if (this.currentCall?.isHold && !this.currentCall?.isConference) {
-                                    await this.onholdOrUnholdParticipant({
-                                        participantId: [this.currentCall?.participantId],
-                                        conferenceId: this.conferenceId,
-                                        hold: false,
-                                        conference: this.currentCall?.isConference
-                                    });
-                                    // this.currentCallList[0].isHold = false;
+                this.newIncomingCallsList.forEach((callInfo, i) => {
+                    this.conferenceId = i == 0 ? this.newIncomingCallsList[i].conferenceId : this.conferenceId;
+                    this.newIncomingCallsList[i].participants.forEach(async (res) => {
+                        if (this.currentCallList.length > 0) {
+                            let index = this.currentCallList.findIndex((item) => item.id == res.id);
+                            if (index == -1 && !res.isLeft) {
+                                this.currentCallList.push({
+                                    ...res,
+                                    img: 'assets/images/user.jpg',
+                                    isIncomingCall: res.direction == "incoming-call",
+                                    isHold: res.isHold,
+                                    isMute: false,
+                                    isConference: res.isConference,
+                                    isAcceptCall: res.direction == "incoming-call" ? this.getStatus(res) : true,
+                                    dial: true,
+                                    phone: res.direction == "incoming-call" ? res?.from : res?.to,
+                                    participantId: res.id,
+                                    name: res.name || res?.fromName || res?.toName,
+                                    time: this.getTimeDifference(res.joinedAt || new Date().toUTCString()),
+                                });
+                                if (this.showContactsPanel) {
+                                    this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
+                                    this.applyFilter();
                                 }
-                                else if (this.currentCall?.isHold && this.currentCall?.isConference) {
-                                    let conferenceCalllist = this.currentCallList.filter((item) => item.isConference);
-                                    if (conferenceCalllist.length > 0) {
+                            }
+                            else if (index != -1 && res.isLeft) {
+                                if (this.currentCallList[index]?.id == this.currentCall?.id) {
+                                    this.currentCallList.splice(index, 1);
+                                    this.currentCall = this.currentCallList.length > 0 ? this.currentCallList[0] : {};
+                                    if (this.currentCall?.isHold && !this.currentCall?.isConference) {
                                         await this.onholdOrUnholdParticipant({
-                                            participantId: conferenceCalllist.map((item) => item.participantId),
-                                            conferenceId: this.conferenceId,
+                                            participantId: [this.currentCall?.participantId],
+                                            conferenceId: this.currentCall?.conferenceId,
                                             hold: false,
                                             conference: this.currentCall?.isConference
                                         });
-                                        this.isConferenceCallHold = false;
+                                        // this.currentCallList[0].isHold = false;
+                                    }
+                                    else if (this.currentCall?.isHold && this.currentCall?.isConference) {
+                                        let conferenceCalllist = this.currentCallList.filter((item) => item.isConference);
+                                        if (conferenceCalllist.length > 0) {
+                                            await this.onholdOrUnholdParticipant({
+                                                participantId: conferenceCalllist.map((item) => item.participantId),
+                                                conferenceId: conferenceCalllist[0]?.conferenceId,
+                                                hold: false,
+                                                conference: this.currentCall?.isConference
+                                            });
+                                            this.isConferenceCallHold = false;
+                                        }
                                     }
                                 }
+                                else {
+                                    this.currentCallList.splice(index, 1);
+                                }
+                                if (this.showContactsPanel) {
+                                    this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
+                                    this.applyFilter();
+                                }
                             }
-                            else {
-                                this.currentCallList.splice(index, 1);
-                            }
-                            if (this.showContactsPanel) {
-                                this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
-                                this.applyFilter();
+                            else if (index != -1) {
+                                this.currentCallList[index] = {
+                                    ...res,
+                                    img: 'assets/images/user.jpg',
+                                    isIncomingCall: res.direction == "incoming-call",
+                                    isHold: res.isHold,
+                                    isMute: false,
+                                    isConference: res.isConference,
+                                    isAcceptCall: res.direction == "incoming-call" ? this.getStatus(res) : true,
+                                    dial: true,
+                                    phone: res.direction == "incoming-call" ? res?.from : res?.to,
+                                    participantId: res.id,
+                                    name: res.name || res?.fromName || res?.toName,
+                                    time: this.getTimeDifference(res.joinedAt || new Date().toUTCString()),
+                                };
                             }
                         }
-                        else if (index != -1) {
-                            this.currentCallList[index] = {
+                        else if (!res.isLeft) {
+                            this.currentCallList.push({
                                 ...res,
                                 img: 'assets/images/user.jpg',
                                 isIncomingCall: res.direction == "incoming-call",
@@ -1903,72 +1921,56 @@ class CallProgressComponent {
                                 participantId: res.id,
                                 name: res.name || res?.fromName || res?.toName,
                                 time: this.getTimeDifference(res.joinedAt || new Date().toUTCString()),
-                            };
+                            });
+                            this.timer = '00:00';
+                            this.startTimer();
                         }
+                    });
+                    let currentCall = this.currentCallList.find((item) => item.isAcceptCall && !item.isHold);
+                    if (currentCall?.id) {
+                        this.currentCall = currentCall;
                     }
-                    else if (!res.isLeft) {
-                        this.currentCallList.push({
-                            ...res,
-                            img: 'assets/images/user.jpg',
-                            isIncomingCall: res.direction == "incoming-call",
-                            isHold: res.isHold,
-                            isMute: false,
-                            isConference: res.isConference,
-                            isAcceptCall: res.direction == "incoming-call" ? this.getStatus(res) : true,
-                            dial: true,
-                            phone: res.direction == "incoming-call" ? res?.from : res?.to,
-                            participantId: res.id,
-                            name: res.name || res?.fromName || res?.toName,
-                            time: this.getTimeDifference(res.joinedAt || new Date().toUTCString()),
-                        });
-                        this.timer = '00:00';
-                        this.startTimer();
-                    }
-                });
-                let currentCall = this.currentCallList.find((item) => item.isAcceptCall && !item.isHold);
-                if (currentCall?.id) {
-                    this.currentCall = currentCall;
-                }
-                if (this.selectedUserInfo?.participantId) {
-                    let selectedUser = this.currentCallList.find((item) => item.id == this.selectedUserInfo.participantId);
-                    if (selectedUser) {
-                        selectedUser.IsUserInfoShow = true;
-                        this.selectedUserInfo = selectedUser;
-                        this.checkTextHeight();
-                    }
-                    else {
-                        let incomingCall = this.currentCallList.find((item) => item?.businessNumber);
-                        if (incomingCall?.participantId) {
-                            this.selectedUserInfo = incomingCall;
-                            if (this.isClickExpand) {
-                                this.checkTextHeight();
-                            }
+                    if (this.selectedUserInfo?.participantId) {
+                        let selectedUser = this.currentCallList.find((item) => item.id == this.selectedUserInfo.participantId);
+                        if (selectedUser) {
+                            selectedUser.IsUserInfoShow = true;
+                            this.selectedUserInfo = selectedUser;
+                            this.checkTextHeight();
                         }
                         else {
-                            this.selectedUserInfo = {};
-                            this.isClickExpand = false;
+                            let incomingCall = this.currentCallList.find((item) => item?.businessNumber);
+                            if (incomingCall?.participantId) {
+                                this.selectedUserInfo = incomingCall;
+                                if (this.isClickExpand) {
+                                    this.checkTextHeight();
+                                }
+                            }
+                            else {
+                                this.selectedUserInfo = {};
+                                this.isClickExpand = false;
+                            }
                         }
                     }
-                }
-                else {
-                    let resIndex = this.currentCallList.findIndex((item) => !!item?.businessNumber);
-                    if (resIndex > -1) {
-                        this.isClickExpand = true;
-                        this.currentCallList[resIndex].IsUserInfoShow = true;
-                        this.selectedUserInfo = this.currentCallList[resIndex];
-                        this.checkTextHeight();
+                    else {
+                        let resIndex = this.currentCallList.findIndex((item) => !!item?.businessNumber);
+                        if (resIndex > -1) {
+                            this.isClickExpand = true;
+                            this.currentCallList[resIndex].IsUserInfoShow = true;
+                            this.selectedUserInfo = this.currentCallList[resIndex];
+                            this.checkTextHeight();
+                        }
                     }
-                }
-                this.cdr.detectChanges();
-                let incomingData = this.currentCallList.find((res) => res.isIncomingCall && !res.isAcceptCall);
-                if (incomingData?.id && !this.isRinging) {
-                    this.isRinging = this.incomeingCallSocketService.play();
-                }
-                else if (!incomingData?.id && this.isRinging) {
-                    this.isRinging = this.incomeingCallSocketService.pause();
-                }
-                console.log(this.isRinging, incomingData);
-                console.log('currentCallList', this.currentCallList);
+                    this.cdr.detectChanges();
+                    let incomingData = this.currentCallList.find((res) => res.isIncomingCall && !res.isAcceptCall);
+                    if (incomingData?.id && !this.isRinging) {
+                        this.isRinging = this.incomeingCallSocketService.play();
+                    }
+                    else if (!incomingData?.id && this.isRinging) {
+                        this.isRinging = this.incomeingCallSocketService.pause();
+                    }
+                    console.log(this.isRinging, incomingData);
+                    console.log('currentCallList', this.currentCallList);
+                });
             }
             else if (!this.newIncomingCallsList?.length) {
                 console.log('test null');
@@ -1990,9 +1992,6 @@ class CallProgressComponent {
                 this.stopTimer();
                 this.endCallEvent.emit();
             }
-            // } catch (e) {
-            //   console.log(e);
-            // }
         }
         // if(changes['conferenceCallInfo']?.currentValue && this.conferenceCallInfo && changes['conferenceCallInfo']?.previousValue?.conferenceSid != changes['conferenceCallInfo']?.currentValue?.conferenceSid) {
         //   this.isConference = true
@@ -2136,7 +2135,7 @@ class CallProgressComponent {
                             from: callData?.from,
                             route: "OUTGOING",
                             participantNumber: callData?.phone,
-                            conferenceId: this.conferenceId,
+                            conferenceId: this.conferenceId || response?.callauth?.id,
                             userId: this.userId || localStorage.getItem('userId'),
                             proxy: '',
                             countrycode: '',
@@ -2167,7 +2166,7 @@ class CallProgressComponent {
         console.log(c, 'dsdsdsdsdsdsadsa');
         this.onholdOrUnholdParticipant({
             participantId: [c.participantId],
-            conferenceId: this.conferenceId,
+            conferenceId: c?.conferenceId,
             hold: !c.hold,
             conference: c.isConference
         });
@@ -2177,7 +2176,7 @@ class CallProgressComponent {
     async onEndCall(c, isAllCallEnd) {
         console.log(c, 'dsdsdsdsdsdsadsa');
         let participantId = isAllCallEnd ? 'all' : c.participantId || c.participantId;
-        let res = await this.getRemoveParticipants(participantId, this.conferenceId);
+        let res = await this.getRemoveParticipants(participantId, c?.conferenceId);
         if (res?.status == 201 && res?.message == 'participant already left') {
             // this.currentCallList = this.currentCallList.filter((item: any) => item.participantId !== c.participantId);
             // this.currentCall = this.currentCallList.length > 0 ? this.currentCallList[0] : null;
@@ -2375,7 +2374,7 @@ class CallProgressComponent {
                 // this.currentCall = this.currentCallList[0];
                 await this.onholdOrUnholdParticipant({
                     participantId: [this.currentCall?.participantId],
-                    conferenceId: this.conferenceId,
+                    conferenceId: this.currentCall?.conferenceId,
                     hold: false,
                     isConference: this.currentCall?.isConference
                 });
@@ -2495,7 +2494,7 @@ class CallProgressComponent {
                         // res.isHold = true;
                         this.onholdOrUnholdParticipant({
                             participantId: [res.participantId],
-                            conferenceId: this.conferenceId,
+                            conferenceId: res?.conferenceId,
                             hold: true,
                             conference: res.isConference
                         });
@@ -2510,7 +2509,7 @@ class CallProgressComponent {
                 // }
                 await this.onholdOrUnholdParticipant({
                     participantId: this.currentCall?.isIncomingCall ? [this.currentCall?.id] : [this.currentCall?.participantId],
-                    conferenceId: this.conferenceId,
+                    conferenceId: data?.conferenceId,
                     hold: true,
                     conference: this.currentCall?.isConference
                 });
@@ -2578,14 +2577,14 @@ class CallProgressComponent {
                     from: this.callData?.from ? this.callData?.from : this.selectedCallerId?.number,
                     route: "OUTGOING",
                     participantNumber: phoneNumber,
-                    conferenceId: this.conferenceId,
+                    conferenceId: this.currentCall?.conferenceId,
                     userId: this.userId,
                     proxy: '',
                     countrycode: '',
                 });
                 this.onholdOrUnholdParticipant({
                     participantId: [data?.participantId],
-                    conferenceId: this.conferenceId,
+                    conferenceId: this.currentCall?.conferenceId,
                     hold: false,
                     conference: true
                 });
@@ -2617,7 +2616,7 @@ class CallProgressComponent {
                         // c.isHold = true;
                         await this.onholdOrUnholdParticipant({
                             participantId: [c?.participantId],
-                            conferenceId: this.conferenceId,
+                            conferenceId: c.conferenceId,
                             hold: true,
                             conference: c?.isConference
                         });
@@ -2639,18 +2638,18 @@ class CallProgressComponent {
                 // this.call['callInfo'] = JSON.parse(JSON.stringify(this.callData));
                 // Get the conference ID from the current call or use the stored one
                 // const conferenceId = this.conferenceId;
-                if (!this.conferenceId) {
-                    console.error("No conferenceId found for active call");
-                    swal("Error", "Cannot add participant: conference not found", "error");
-                    this.showRingAnimation = false;
-                    return;
-                }
+                // if (!this.conferenceId) {
+                //   console.error("No conferenceId found for active call");
+                //   swal("Error", "Cannot add participant: conference not found", "error");
+                //   this.showRingAnimation = false;
+                //   return;
+                // }
                 // Add participant to the conference
                 let data = await this.addParticipantToCall({
                     from: this.callData?.from || this.selectedCallerId?.number,
                     route: "OUTGOING",
                     participantNumber: phoneNumber,
-                    conferenceId: this.conferenceId,
+                    conferenceId: this.currentCall?.conferenceId,
                     userId: this.userId,
                     proxy: '',
                     countrycode: '',
@@ -2771,7 +2770,7 @@ class CallProgressComponent {
                     // c.isHold = true;
                     await this.onholdOrUnholdParticipant({
                         participantId: [c?.participantId],
-                        conferenceId: this.conferenceId,
+                        conferenceId: c.conferenceId,
                         hold: true,
                         conference: c?.isConference
                     });
@@ -2780,7 +2779,7 @@ class CallProgressComponent {
                     // c.isHold = false;
                     await this.onholdOrUnholdParticipant({
                         participantId: [c?.participantId],
-                        conferenceId: this.conferenceId,
+                        conferenceId: c.conferenceId,
                         hold: false,
                         conference: c?.isConference
                     });
@@ -2796,7 +2795,7 @@ class CallProgressComponent {
                     // c.isHold = false;
                     await this.onholdOrUnholdParticipant({
                         participantId: [c?.participantId],
-                        conferenceId: this.conferenceId,
+                        conferenceId: c.conferenceId,
                         hold: false,
                         conference: c?.isConference
                     });
@@ -2805,7 +2804,7 @@ class CallProgressComponent {
                     // c.isHold = true;
                     await this.onholdOrUnholdParticipant({
                         participantId: [c?.participantId],
-                        conferenceId: this.conferenceId,
+                        conferenceId: c.conferenceId,
                         hold: true,
                         conference: c?.isConference
                     });
@@ -2819,7 +2818,7 @@ class CallProgressComponent {
                     // c.isHold = true;
                     await this.onholdOrUnholdParticipant({
                         participantId: [c?.participantId],
-                        conferenceId: this.conferenceId,
+                        conferenceId: c.conferenceId,
                         hold: true,
                         conference: c?.isConference
                     });
@@ -2828,7 +2827,7 @@ class CallProgressComponent {
                     // c.isHold = false;
                     await this.onholdOrUnholdParticipant({
                         participantId: [c?.participantId],
-                        conferenceId: this.conferenceId,
+                        conferenceId: c.conferenceId,
                         hold: false,
                         conference: c?.isConference
                     });
@@ -2882,7 +2881,7 @@ class CallProgressComponent {
                     // c.isHold = false;
                     await this.onholdOrUnholdParticipant({
                         participantId: [c?.participantId],
-                        conferenceId: this.conferenceId,
+                        conferenceId: c.conferenceId,
                         hold: false,
                         conference: true
                     });
@@ -2969,24 +2968,22 @@ class CallProgressComponent {
     //     console.error('Error starting recording', error);
     //   });
     // }
-    rejectConcurrentCall(incomingCall) {
-        if (!incomingCall)
-            return;
-        if (incomingCall.reject) {
-            incomingCall.reject();
-        }
-        if (incomingCall.disconnect)
-            incomingCall.disconnect();
-        // Remove from list
-        this.newIncomingCallsList = (this.newIncomingCallsList || []).filter((c) => c?.parameters?.CallSid !== incomingCall?.parameters?.CallSid);
-        this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
-        // If no more incoming, hide banner
-        if (!this.newIncomingCallsList || this.newIncomingCallsList.length === 0) {
-            this.isConcurrentIncoming = false;
-            this.incomingCallDiv = false;
-        }
-        this.cdr.detectChanges();
-    }
+    // rejectConcurrentCall(incomingCall: any) {
+    //   if (!incomingCall) return;
+    //   if (incomingCall.reject) {
+    //     incomingCall.reject();
+    //   }
+    //   if (incomingCall.disconnect) incomingCall.disconnect();
+    //   // Remove from list
+    //   this.newIncomingCallsList = (this.newIncomingCallsList || []).filter((c: any) => c?.parameters?.CallSid !== incomingCall?.parameters?.CallSid);
+    //   this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
+    //   // If no more incoming, hide banner
+    //   if (!this.newIncomingCallsList || this.newIncomingCallsList.length === 0) {
+    //     this.isConcurrentIncoming = false;
+    //     this.incomingCallDiv = false;
+    //   }
+    //   this.cdr.detectChanges();
+    // }
     onCallInputs(num) {
         try {
             if (Number.isInteger(num) || num == '+' || num == '*' || num == '#') {
@@ -3077,7 +3074,7 @@ class CallProgressComponent {
         //   return;
         // }
         let payload = {
-            "conferenceId": this.conferenceId,
+            "conferenceId": this.currentCall?.conferenceId,
         };
         this.extensionService.getCallRecording(payload).subscribe(response => {
             this.isRecording = true;
@@ -3099,7 +3096,7 @@ class CallProgressComponent {
         }
     }
     pauseRecording() {
-        this.extensionService.pauseOrResumeRecording(this.conferenceId, 'pause').subscribe(response => {
+        this.extensionService.pauseOrResumeRecording(this.currentCall?.conferenceId, 'pause').subscribe(response => {
             this.stopRecordingTimer();
             this.isPaused = true;
         }, (error) => {
@@ -3111,7 +3108,7 @@ class CallProgressComponent {
         // if (!this.incomingRecordCall && !this.recordCall) {
         //   return; // Skip if recording is not enabled
         // }
-        this.extensionService.pauseOrResumeRecording(this.conferenceId, 'resume').subscribe(response => {
+        this.extensionService.pauseOrResumeRecording(this.currentCall?.conferenceId, 'resume').subscribe(response => {
             this.isPaused = false;
             this.startTimer1();
         }, error => {
@@ -3192,11 +3189,11 @@ class CallProgressComponent {
             console.error('Error starting recording', error);
         });
     }
-    incomingCallsNewList(data) {
-        console.log(data, 'newIncomingCallsListOUR');
-        this.newIncomingCallsList = data;
-        this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
-    }
+    // incomingCallsNewList(data: any) {
+    //   console.log(data, 'newIncomingCallsListOUR')
+    //   this.newIncomingCallsList = data;
+    //   this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
+    // }
     selectedIncomingCallInfo(data) {
         this.selectedIncomingCall = data;
     }
@@ -3236,7 +3233,7 @@ class CallProgressComponent {
             ipCountry: '',
             callStatus: 'answered',
             deviceId: this.deviceId,
-            conferenceId: this.conferenceId || data.conferenceId || 'no'
+            conferenceId: this.currentCall?.conferenceId || data.conferenceId || 'no'
         };
         this.extensionService.setIncomingCallStatus(payload).subscribe((res) => {
             console.log(res);
@@ -3597,9 +3594,9 @@ class DialboxComponent {
                 // console.log("WS Event Received:", incomingCallData);
                 // console.log("WS Event Received:", incomingCallData.data);
                 this.twilioService.conferenceCallInfo = incomingCallData;
-                if (!!incomingCallData[0]?.participants?.length) {
+                if (!!incomingCallData?.length) {
                     // this.incomingCallsList = incomingCallData.participants.filter((item: any) => !item.isLeft) || [];
-                    this.incomingCallsList = incomingCallData[0].participants || [];
+                    this.incomingCallsList = incomingCallData || [];
                     this.isCallInProgress = true;
                     this.isDialpadHidden = false;
                     this.isIncomingCallnotification = false;