@vgroup/dialbox 0.5.2 → 0.5.4

package/fesm2020/vgroup-dialbox.mjs

@@ -1853,7 +1853,7 @@ class CallProgressComponent {
                                     time: this.getTimeDifference(res.joinedAt || new Date().toUTCString()),
                                 });
                                 if (this.showContactsPanel) {
-                                    this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
+                                    this.getAllParticipants(this.currentCall.conferenceSid);
                                     this.applyFilter();
                                 }
                             }
@@ -1889,7 +1889,7 @@ class CallProgressComponent {
                                     this.currentCallList.splice(index, 1);
                                 }
                                 if (this.showContactsPanel) {
-                                    this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
+                                    this.getAllParticipants(this.currentCall.conferenceSid);
                                     this.applyFilter();
                                 }
                             }
@@ -2197,7 +2197,7 @@ class CallProgressComponent {
             // this.currentCall = this.currentCallList.length > 0 ? this.currentCallList[0] : null;
             this.cdr.detectChanges();
         }
-        await this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
+        await this.getAllParticipants(this.currentCall.conferenceSid);
         return false;
     }
     async initiateCall(payload) {
@@ -2486,7 +2486,7 @@ class CallProgressComponent {
         this.isAddRemoveParticipant = false;
         this.showContactsPanel = !this.showContactsPanel;
         // this.GetContactsList();
-        this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
+        this.getAllParticipants(this.currentCall.conferenceSid);
         this.filteredList = this.contacts;
         this.filteredParticipentList = this.allParticipentList;
         // }
@@ -2497,7 +2497,7 @@ class CallProgressComponent {
     addRemoveParticipant() {
         // const conferenceSId = this.addRes?.conferenceSid;
         this.isAddRemoveParticipant = !this.isAddRemoveParticipant;
-        this.allParticipentList = this.getAllParticipants(this.twilioService.conferenceCallInfo.conferenceSid);
+        this.allParticipentList = this.getAllParticipants(this.currentCall.conferenceSid);
         this.filteredParticipentList = this.allParticipentList;
     }
     async add(data) {
@@ -2886,7 +2886,9 @@ class CallProgressComponent {
         this.cdr.detectChanges();
     }
     isMergeCallAllowed() {
-        return this.currentCallList.filter((res) => res.conferenceId == this.currentCall.conferenceId);
+        let mergeCallList = this.currentCallList.filter((res) => res.conferenceId == this.currentCall.conferenceId);
+        console.log('mergeCallList', mergeCallList);
+        return mergeCallList.length > 1;
     }
     async mergeCalls() {
         // Merge functionality - unmute both calls for conference
@@ -3870,52 +3872,12 @@ class DialboxComponent {
             this.twilioService.deviceId = changes['deviceId'].currentValue;
             console.log('Set deviceId in localStorage:', changes['deviceId'].currentValue);
         }
-        if (this.userId) {
+        if (changes['userId'].currentValue && this.userId) {
             this.extensionService.userId = this.userId;
         }
-        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
-            this.getContactList();
-            this.getUserCallSetting();
-            setTimeout(() => {
-                this.dialInputElement.nativeElement.focus();
-            }, 0);
-            if (this.incomingCallData) {
-                if (this.isCallInProgress) {
-                    this.newIncomingCalls.push(this.incomingCallData);
-                    console.log('404', this.incomingCallData);
-                    this.getUserInformation(this.incomingCallData);
-                }
-                else {
-                    console.log('dd5');
-                    this.isCallInProgress = true;
-                    this.isDialpadHidden = false;
-                    this.callData.phone = this.incomingCallData.parameters['From'];
-                    console.log('411', this.incomingCallData);
-                    this.getUserInformation(this.incomingCallData);
-                    this.callData.name = this.incomingCallData.customParameters.get('name');
-                    this.callData.img = this.incomingCallData.customParameters.get('image') || 'assets/images/user.jpg';
-                    this.callData.isIncomingCall = true;
-                }
-                this.incomingCallData.on('cancel', () => {
-                    this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== this.incomingCallData.parameters['CallSid']);
-                    // if(this.incomingCallsList.length == 0){
-                    //   console.log('dd6')
-                    //   this.isCallInProgress = false;
-                    // }
-                    this.incomingCallData.disconnect();
-                });
-                this.incomingCallData.on('disconnect', () => {
-                    this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== this.incomingCallData.parameters['CallSid']);
-                    this.incomingCallData.disconnect();
-                    // if(this.incomingCallsList.length == 0){
-                    //   console.log('dd7')
-                    //   this.isCallInProgress = false;
-                    // }
-                });
-            }
-        }
         if (changes['contactInfo'] && this.contactInfo) {
             let contact = this.contactInfo;
+            console.log('contactInfo', contact);
             if (contact.number) {
                 this.isSmartDialCall = false;
                 this.dialedNumber = contact.number;
@@ -3973,6 +3935,47 @@ class DialboxComponent {
                 }
             }
         }
+        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
+            this.getContactList();
+            this.getUserCallSetting();
+            setTimeout(() => {
+                this.dialInputElement.nativeElement.focus();
+            }, 0);
+            if (this.incomingCallData) {
+                if (this.isCallInProgress) {
+                    this.newIncomingCalls.push(this.incomingCallData);
+                    console.log('404', this.incomingCallData);
+                    this.getUserInformation(this.incomingCallData);
+                }
+                else {
+                    console.log('dd5');
+                    this.isCallInProgress = true;
+                    this.isDialpadHidden = false;
+                    this.callData.phone = this.incomingCallData.parameters['From'];
+                    console.log('411', this.incomingCallData);
+                    this.getUserInformation(this.incomingCallData);
+                    this.callData.name = this.incomingCallData.customParameters.get('name');
+                    this.callData.img = this.incomingCallData.customParameters.get('image') || 'assets/images/user.jpg';
+                    this.callData.isIncomingCall = true;
+                }
+                this.incomingCallData.on('cancel', () => {
+                    this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== this.incomingCallData.parameters['CallSid']);
+                    // if(this.incomingCallsList.length == 0){
+                    //   console.log('dd6')
+                    //   this.isCallInProgress = false;
+                    // }
+                    this.incomingCallData.disconnect();
+                });
+                this.incomingCallData.on('disconnect', () => {
+                    this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== this.incomingCallData.parameters['CallSid']);
+                    this.incomingCallData.disconnect();
+                    // if(this.incomingCallsList.length == 0){
+                    //   console.log('dd7')
+                    //   this.isCallInProgress = false;
+                    // }
+                });
+            }
+        }
     }
     registerDragElement() {
         try {