From 9d8cbaedbbc6a6f7fc9af9fdc93e4ae73e4c702e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 15 Oct 2020 12:16:32 +0100
Subject: [PATCH] Improve grid relationship handling of null or empty values

---
 .../DataGrid/Relationship/RelationshipDisplay.svelte   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/standard-components/src/DataGrid/Relationship/RelationshipDisplay.svelte b/packages/standard-components/src/DataGrid/Relationship/RelationshipDisplay.svelte
index 858df171c..f6d1cd14e 100644
--- a/packages/standard-components/src/DataGrid/Relationship/RelationshipDisplay.svelte
+++ b/packages/standard-components/src/DataGrid/Relationship/RelationshipDisplay.svelte
@@ -6,6 +6,10 @@
   export let columnName
   export let row
 
+  $: count =
+    row && columnName && Array.isArray(row[columnName])
+      ? row[columnName].length
+      : 0
   let linkedRows = []
   let displayColumn
 
@@ -33,9 +37,11 @@
 <div class="container">
   {#if linkedRows && linkedRows.length && displayColumn}
     {#each linkedRows as linkedRow}
-      <div class="linked-row">{linkedRow[displayColumn]}</div>
+      {#if linkedRow[displayColumn] != null && linkedRow[displayColumn] !== ''}
+        <div class="linked-row">{linkedRow[displayColumn]}</div>
+      {/if}
     {/each}
-  {/if}
+  {:else}{count} related row(s){/if}
 </div>
 
 <style>