Fixed missing operator update status (#251)

nethesis · Sep 24, 2024 · b534b40 · b534b40
1 parent ff5da19
commit b534b40
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 127 deletions.
diff --git a/components/layout/Layout.tsx b/components/layout/Layout.tsx
@@ -72,7 +72,7 @@ export const Layout: FC<LayoutProps> = ({ children }) => {
   const currentUsername = authStore.username
   const { operators } = useSelector((state: RootState) => state.operators)
   const { profile } = useSelector((state: RootState) => state.user)
-  const {avoidClose} = useSelector((state: RootState) => state.sideDrawer)
+  const { avoidClose } = useSelector((state: RootState) => state.sideDrawer)
 
   const productName = getProductName()
   // Get current page name, clean the path from / and capitalize page name
@@ -470,6 +470,25 @@ export const Layout: FC<LayoutProps> = ({ children }) => {
     userInformation?.default_device?.type,
   ])
 
+  useEventListener('phone-island-extensions-update', (data) => {
+    const opName: any = Object.keys(data)[0]
+
+    let extensionInformation: any = {
+      conversations: data[opName]?.conversations,
+      dnd: data[opName]?.dnd,
+      ip: data[opName]?.ip,
+      number: data[opName]?.number,
+      port: data[opName]?.port,
+      sipuseragent: data[opName]?.sipuseragent,
+      status: data[opName]?.status,
+      username: data[opName]?.username,
+      exten: data[opName]?.exten,
+      name: data[opName]?.name,
+    }
+
+    store.dispatch.operators.updateExten(data[opName]?.number, extensionInformation)
+  })
+
   useEventListener('phone-island-conversations', (data) => {
     const opName = Object.keys(data)[0]
     const conversations = data[opName].conversations

diff --git a/components/queueManager/Realtime/RealTimeManagement.tsx b/components/queueManager/Realtime/RealTimeManagement.tsx
@@ -110,8 +110,8 @@ export const RealTimeManagement: FC<RealTimeManagementProps> = ({ className }):
           const conversation = conversations[c]
           //check if exists and is inside queue
           if (
-            conversation.connected === true &&
-            conversation.throughQueue === true &&
+            conversation?.connected === true &&
+            conversation?.throughQueue === true &&
             queueManagerStore?.queues[conversation.queueId] !== undefined
           ) {
             const queueId = conversation.queueId

diff --git a/models/queueManager.ts b/models/queueManager.ts
@@ -158,11 +158,11 @@ export const queueManagerQueues = createModel<RootModel>()({
 
       let connectedCalls: any[] = []
       Object.values(operators).forEach((operator: any) => {
-        operator.conversations?.forEach((conversation: any) => {
+        operator?.conversations?.forEach((conversation: any) => {
           if (
-            conversation.throughQueue &&
-            conversation.connected &&
-            conversation.queueId === queueId
+            conversation?.throughQueue &&
+            conversation?.connected &&
+            conversation?.queueId === queueId
           ) {
             connectedCalls.push({ conversation, operatorUsername: operator?.username })
           }

diff --git a/models/queues.ts b/models/queues.ts
@@ -123,9 +123,9 @@ export const queues = createModel<RootModel>()({
       Object.values(operators).forEach((operator: any) => {
         operator.conversations?.forEach((conversation: any) => {
           if (
-            conversation.throughQueue &&
-            conversation.connected &&
-            conversation.queueId === queueId
+            conversation?.throughQueue &&
+            conversation?.connected &&
+            conversation?.queueId === queueId
           ) {
             connectedCalls.push({ conversation, operatorUsername: operator?.username })
           }