fix: wrong default_device update (#74)

nethesis · Jan 17, 2025 · 15e2b07 · 15e2b07
1 parent e89aee9
commit 15e2b07
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/src/components/Socket.tsx b/src/components/Socket.tsx
@@ -432,6 +432,25 @@ export const Socket: FC<SocketProps> = ({
       socket.current.on('updateDefaultDevice', (extension: string) => {
         // Dispatch phone island physical call event with the link and the urlType
         dispatchDefaultDeviceUpdate(extension)
+        // Update the internal store
+        const { extensions } = store.getState().users
+        const { endpoints } = store.getState().currentUser
+        if (!extensions || !endpoints) return
+
+        const extensionInformations: any = Object.values(extensions).filter(
+          (ext) => ext?.exten === extension,
+        )
+        if (extensionInformations.length === 0) return
+
+        let objectComplete = extensionInformations[0]
+        const endpointExtension = endpoints.extension.find(
+          (endpoint) => endpoint.id === objectComplete.exten,
+        )
+        if (endpointExtension) {
+          objectComplete = { ...objectComplete, type: endpointExtension.type }
+        }
+
+        store.dispatch.currentUser.updateCurrentDefaultDevice(objectComplete)
       })
     }
 

diff --git a/src/components/WebRTC.tsx b/src/components/WebRTC.tsx
@@ -248,9 +248,33 @@ export const WebRTC: FC<WebRTCProps> = ({
 
                       case 'incomingcall':
                         const { default_device } = store.getState().currentUser
+                        const { endpoints, username } = store.getState().currentUser
+                        const { extensions } = store.getState().users
+
+                        const hasOnlineNethlink = () => {
+                          if (!extensions || !username) return false
+
+                          // Get all extensions for current user
+                          const userExtensions: any = Object.values(extensions).filter(
+                            (ext) => ext?.username === username,
+                          )
+
+                          // Check if any extension is nethlink type and online
+                          return userExtensions?.some((ext) => {
+                            const endpointExtension = endpoints?.extension.find(
+                              (endpoint) => endpoint.id === ext?.exten,
+                            )
+                            return (
+                              endpointExtension?.type === 'nethlink' && ext?.status !== 'offline'
+                            )
+                          })
+                        }
+
                         if (
-                          (uaType === 'mobile' && default_device?.type === 'nethlink') ||
-                          (uaType === 'desktop' && default_device?.type === 'webrtc')
+                          (uaType === 'mobile' &&
+                            (default_device?.type === 'nethlink' || hasOnlineNethlink())) ||
+                          (uaType === 'desktop' &&
+                            (default_device?.type === 'webrtc' || !hasOnlineNethlink()))
                         ) {
                           // Update webrtc state
                           dispatch.webrtc.updateWebRTC({ jsepGlobal: jsep })