@vgroup/dialbox 0.6.35 → 0.6.36

package/fesm2020/vgroup-dialbox.mjs

@@ -1854,7 +1854,7 @@ class CallProgressComponent {
                 }
                 this.newIncomingCallsList.forEach((callInfo, i) => {
                     this.conferenceId = i == 0 ? this.newIncomingCallsList[i].conferenceId : this.conferenceId;
-                    let ourNumberInfo = this.newIncomingCallsList[i].participants.find((resData) => ((this.deviceNumberList.includes(resData?.from) && resData?.client) || (this.deviceNumberList.includes(resData?.to) && resData?.direction == 'incoming-call')) && !resData?.isLeft);
+                    let ourNumberInfo = this.newIncomingCallsList[i].participants.find((resData) => ((this.deviceNumberList.includes(resData?.from) && resData?.direction == 'outgoing-call') || (this.deviceNumberList.includes(resData?.to) && resData?.direction == 'incoming-call')) && !resData?.isLeft);
                     this.isMute = !ourNumberInfo?.isHold ? ourNumberInfo?.isMute : this.isMute;
                     if (ourNumberInfo?.id) {
                         this.newIncomingCallsList[i].participants.forEach(async (res) => {
@@ -1982,16 +1982,11 @@ class CallProgressComponent {
                         return ((this.deviceNumberList.includes(participant?.from) && participant?.direction == 'outgoing-call') || (this.deviceNumberList.includes(participant?.to) && participant?.direction == 'incoming-call')) && !participant?.isLeft && !participant?.isHold;
                     });
                 });
-                //  this.newIncomingCallsList.find((item: any) => {
-                //    currentCall = item?.participants?.filter((participant: any) => {
-                //     return ((this.deviceNumberList.includes(participant?.from) && participant?.direction == 'outgoing-call') || (this.deviceNumberList.includes(participant?.to) && participant?.direction == 'incoming-call')) && !participant?.isLeft && !participant?.isHold
-                //   })
-                // });
                 if (this.currentConferenceCall?.participants?.length == 2 && this.currentConferenceCall?.participants[0]?.id) {
-                    this.currentCall = this.currentCallList[0];
+                    this.currentCall = this.currentCallList.find((res) => !res?.isConferenceHold);
                 }
                 else if (this.currentConferenceCall?.participants?.length > 2 && this.currentConferenceCall?.participants[1]?.isConference) {
-                    this.currentCall = this.currentCallList[1];
+                    this.currentCall = this.currentCallList.find((res) => !res?.isConferenceHold);
                     this.isConference = true;
                 }
                 if (!this.currentConferenceCall && !this.isNewAddedCall) {
@@ -2083,7 +2078,7 @@ class CallProgressComponent {
                     }
                 }
                 this.cdr.detectChanges();
-                let incomingData = this.currentCallList.find((res) => res?.isIncomingCall && !res?.isAcceptCall && !res?.isLeft);
+                let incomingData = this.currentCallList.find((res) => res?.isIncomingCall && (!res?.isAcceptCall && res?.callStatus != 'participant-join') && !res?.isLeft);
                 if (incomingData?.id && !this.isRinging && this.deviceNumberList.includes(incomingData?.to)) {
                     this.isRinging = this.incomeingCallSocketService.play();
                 }
@@ -2137,7 +2132,7 @@ class CallProgressComponent {
             this.call = await this.device.connect({
                 params: {
                     From: rejoinParticipentInfo.from,
-                    To: rejoinParticipentInfo.from,
+                    To: rejoinParticipentInfo.to,
                     Env: environment.abb,
                     Token: tokenData.token.id,
                     Ext: rejoinParticipentInfo.extNum,
@@ -2146,19 +2141,27 @@ class CallProgressComponent {
                 rtcConstraints: { audio: { deviceId: 'default' } },
             });
             this.twilioService.call = this.call;
-            let addClientParticipantRes = this.addClientParticipant({
-                from: rejoinParticipentInfo.from,
-                route: "OUTGOING",
-                participantNumber: rejoinParticipentInfo?.from,
-                conferenceId: rejoinParticipentInfo?.conferenceId,
-                userId: this.userId || localStorage.getItem('userId'),
-                proxy: '',
-                countrycode: '',
-                deviceId: this.deviceId,
-                clientSid: this.call?.parameters['CallSid']
-            });
-            console.log('host rejoin addClientParticipantRes', addClientParticipantRes);
-            this.setupEventListeners();
+            console.log('this.call', this.call);
+            setTimeout(async () => {
+                try {
+                    let addClientParticipantRes = this.addClientParticipant({
+                        from: rejoinParticipentInfo.from,
+                        route: "OUTGOING",
+                        participantNumber: rejoinParticipentInfo?.to,
+                        conferenceId: rejoinParticipentInfo?.conferenceId,
+                        userId: this.userId || localStorage.getItem('userId'),
+                        proxy: '',
+                        countrycode: '',
+                        deviceId: this.deviceId,
+                        clientSid: this.call?.parameters['CallSid']
+                    });
+                    console.log('host rejoin addClientParticipantRes', addClientParticipantRes);
+                    this.setupEventListeners();
+                }
+                catch (error) {
+                    console.error('Error in addClientParticipant:', error);
+                }
+            }, 500);
             console.log('Rejoined successfully');
         }
         catch (error) {
@@ -2167,7 +2170,7 @@ class CallProgressComponent {
     }
     getStatus(res) {
         if (res.direction == "incoming-call") {
-            return this.incomeingCallSocketService.isCurrentIncomingCallList.includes(res.id);
+            return res?.callStatus == "participant-join" ? true : this.incomeingCallSocketService.isCurrentIncomingCallList.includes(res.id);
         }
         else {
             if (res.status == 'answered' && res.direction == "incoming-call") {
@@ -2652,16 +2655,16 @@ class CallProgressComponent {
         console.log('Adding participant:', contact);
         console.log('this.call', this.call);
         const phoneNumber = isUnsavedNumber ? contact : contact?.numbersList?.[0]?.number || contact?.phone;
-        let alreadyInCall = this.currentCallList.find((res) => res.to == phoneNumber || res.from == phoneNumber);
+        let alreadyInCall = this.currentCallList.find((res) => (res.to == phoneNumber && res?.direction == 'incoming-call') || (res.from == phoneNumber && res?.direction == 'outgoing-call') && !res?.isLeft);
         if (alreadyInCall) {
             swal('Error', `Already ${phoneNumber} number in this call.`);
             return false;
         }
-        const currentCall = this.currentCallList.find((c) => c?.phone === phoneNumber);
-        if (!phoneNumber || currentCall) {
-            console.error('No phone number found for contact');
-            return;
-        }
+        // const currentCall = this.currentCallList.find((c: any) => c?.phone === phoneNumber);
+        // if (!phoneNumber || currentCall) {
+        //   console.error('No phone number found for contact');
+        //   return;
+        // }
         try {
             if (this.isConference) {
                 let data = await this.addParticipantToCall({
@@ -2761,7 +2764,7 @@ class CallProgressComponent {
             if (isInvalid) {
                 return false;
             }
-            let alreadyInCall = this.currentCallList.find((res) => res.to == number || res.from == number);
+            let alreadyInCall = this.currentCallList.find((res) => ((res.to == number && res?.direction == 'incoming-call') || (res.from == number && res?.direction == 'outgoing-call')) && !res?.isLeft);
             if (alreadyInCall) {
                 swal('Error', `Already ${number} number in this call.`);
                 return false;
@@ -4244,7 +4247,7 @@ class DialboxComponent {
             // Reset dialed number
             this.dialedNumber = '';
             this.sanitizedNum = '';
-            // this.twilioService.device.disconnectAll()
+            this.twilioService.device.disconnectAll();
             // Emit end call event
             this.endCallEvent.emit();
             console.log('Call ended successfully');