From 89a6007881cc308d9d8a2c404807a2109e40c09a Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Wed, 10 Jun 2020 17:19:31 -0700
Subject: [PATCH] [Metrics UI] Fix Inventory View sorting by handling null
 values (#67889)

* [Metrics UI] Fix Inventory View sorting by handling null values

* Fixing situation where the id is not unique

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../metrics/inventory_view/components/waffle/group_of_nodes.tsx | 2 +-
 .../infra/public/pages/metrics/inventory_view/lib/sort_nodes.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
index a6c9efb5e17d..5fcee6193b35 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
@@ -44,7 +44,7 @@ export const GroupOfNodes: React.FC<Props> = ({
       <Nodes>
         {group.nodes.map((node) => (
           <Node
-            key={node.pathId}
+            key={`${node.pathId}:${node.name}`}
             options={options}
             squareSize={group.squareSize}
             node={node}
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/sort_nodes.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/sort_nodes.ts
index e676fb3e09c2..4ce73f2cad62 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/sort_nodes.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/sort_nodes.ts
@@ -10,7 +10,7 @@ import { WaffleSortOption } from '../hooks/use_waffle_options';
 
 const SORT_PATHS = {
   name: (node: SnapshotNode) => last(node.path),
-  value: 'metric.value',
+  value: (node: SnapshotNode) => node.metric.value || 0,
 };
 
 export const sortNodes = (sort: WaffleSortOption, nodes: SnapshotNode[]) => {