Merge pull request #564 from webitel/fix/transfer-call

feature: changed HANDLE_RINGING_ACTION and remove offline and manual calls from isIncomingRinging calls [WTEL-5867]https://webitel.atlassian.net/browse/WTEL-5867)
webitel · Jan 10, 2025 · 35cb7c4 · 35cb7c4
2 parents b58f90b + f1562e0
commit 35cb7c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/features/modules/call/client-handlers.js b/src/features/modules/call/client-handlers.js
@@ -32,17 +32,17 @@ const actions = {
   },
 
   HANDLE_RINGING_ACTION: async (context, call) => {
+    await context.dispatch('ADD_CALL', call);
 
     if (call.direction === CallDirection.Outbound
       || context.rootGetters['workspace/IS_EMPTY_WORKSPACE']) {
       await context.dispatch('SET_WORKSPACE', call);
     }
 
-    // have to check is call not manual or not from offline queue before send notification and play sound https://webitel.atlassian.net/browse/WTEL-4502 + https://webitel.atlassian.net/browse/WTEL-5030
+    // have to check is call not manual or not from offline queue before send notification https://webitel.atlassian.net/browse/WTEL-4502
     if (call.allowAnswer && !context.getters.IS_OFFLINE_CALL && !call.queue?.manual_distribution) {
       const callId = call.id;
 
-      await context.dispatch('ADD_CALL', call);
       await context.dispatch('features/notifications/HANDLE_INBOUND_CALL_RINGING', {
         displayName: call.displayName,
         displayNumber: call.displayNumber,

diff --git a/src/features/modules/call/scripts/isIncomingRinging.js b/src/features/modules/call/scripts/isIncomingRinging.js
@@ -21,9 +21,20 @@ const isInboundRinging = (call) => (
   call.direction === CallDirection.Inbound
 );
 
+const isNotManualCall = (call) => (
+  !call.queue?.manual_distribution
+);
+
+const isNotOfflineCall = (call) => (
+  call.queue?.queue_type !== 'offline'
+);
+
 const isIncomingRinging = (call) => {
-  return isRinging(call) && [
-    isInboundRinging(call),
+  return isRinging(call)
+    && isNotManualCall(call)
+    && isNotOfflineCall(call)
+    && [
+      isInboundRinging(call),
     isOutboundPreviewDialer(call),
     isOutboundCallWithDisableAutoAnswer(call),
   ].some((condition) => !!condition);