@tuki-io/tuki-widgets 0.0.219-dev.58 → 0.0.219-dev.59

package/fesm2020/tuki-io-tuki-widgets-workspaces.mjs

@@ -293,20 +293,43 @@ function mergeDevices(a, b) {
         webexUUID: b.webexUUID ?? a.webexUUID,
     };
 }
-function mergeWorkspacesByDeviceName(workspaces) {
-    const merged = new Map();
-    for (const workspace of workspaces) {
-        const key = withoutSep(workspace.device.name);
-        const existing = merged.get(key);
-        merged.set(key, existing ? {
-            ...existing,
-            ...workspace,
-            device: mergeDevices(existing.device, workspace.device),
+function toMacKey(value) {
+    return value ? withoutSep(value).replace(/[^0-9A-F]/g, '') : '';
+}
+function mergeCucmAndWebexWorkspaces(cucmWorkspaces, webexItems, webexWorkspaces) {
+    const result = [...cucmWorkspaces];
+    const cucmIndexByMac = new Map();
+    cucmWorkspaces.forEach((workspace, index) => {
+        const key = toMacKey(workspace.device.name);
+        if (key && !cucmIndexByMac.has(key)) {
+            cucmIndexByMac.set(key, index);
+        }
+    });
+    webexWorkspaces.forEach((webexWorkspace, webexIndex) => {
+        const matchedMac = (webexItems[webexIndex].workspaceDevices || [])
+            .map(workspaceDevice => toMacKey(workspaceDevice.mac))
+            .find(key => key && cucmIndexByMac.has(key));
+        if (!matchedMac) {
+            result.push(webexWorkspace);
+            return;
+        }
+        const cucmIndex = cucmIndexByMac.get(matchedMac);
+        cucmIndexByMac.delete(matchedMac);
+        const cucmWorkspace = result[cucmIndex];
+        result[cucmIndex] = {
+            ...cucmWorkspace,
+            ...webexWorkspace,
+            displayName: cucmWorkspace.displayName,
+            device: {
+                ...mergeDevices(cucmWorkspace.device, webexWorkspace.device),
+                name: cucmWorkspace.device.name,
+                newName: cucmWorkspace.device.newName,
+            },
             isHybrid: true,
-            cucmDeviceName: existing.cucmDeviceName ?? workspace.cucmDeviceName,
-        } : workspace);
-    }
-    return Array.from(merged.values());
+            cucmDeviceName: cucmWorkspace.cucmDeviceName,
+        };
+    });
+    return result;
 }
 const FETCH_ALL_SIZE = 9999;
 class WorkspacesService {
@@ -332,9 +355,10 @@ class WorkspacesService {
         return forkJoin([cucm$, webex$]).pipe(map(([cucmResponse, webexResponse]) => {
             const cucmParsed = parseResponse(cucmResponse);
             const webexParsed = parseResponse(webexResponse);
+            const webexItems = webexParsed?.pageData || [];
             const cucmWorkspaces = (cucmParsed?.pageData || []).map((item, index) => toWorkspace(item, index, true));
-            const webexWorkspaces = (webexParsed?.pageData || []).map((item, index) => toWorkspace(item, index, false));
-            const workspaces = mergeWorkspacesByDeviceName([...cucmWorkspaces, ...webexWorkspaces]);
+            const webexWorkspaces = webexItems.map((item, index) => toWorkspace(item, index, false));
+            const workspaces = mergeCucmAndWebexWorkspaces(cucmWorkspaces, webexItems, webexWorkspaces);
             return {
                 workspaces,
                 total: workspaces.length,