From e3d9da115c72f6fe78e7da5188f81dd0a6d166b9 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 1 Feb 2021 13:53:18 +0100
Subject: [PATCH] Correctly set the table value for sort/filtering

---
 .../ApiExplorerTable/ApiExplorerTable.tsx           | 13 +++++++------
 .../api-docs/src/components/ApisCards/ApisTable.tsx | 13 +++++++------
 .../components/ComponentsCards/ComponentsTable.tsx  | 13 +++++++------
 .../src/components/CatalogTable/CatalogTable.tsx    | 13 +++++++------
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/plugins/api-docs/src/components/ApiExplorerTable/ApiExplorerTable.tsx b/plugins/api-docs/src/components/ApiExplorerTable/ApiExplorerTable.tsx
index 83af0ef216..7aa09a2c02 100644
--- a/plugins/api-docs/src/components/ApiExplorerTable/ApiExplorerTable.tsx
+++ b/plugins/api-docs/src/components/ApiExplorerTable/ApiExplorerTable.tsx
@@ -170,12 +170,13 @@ export const ApiExplorerTable = ({
           .map(r => formatEntityRefTitle(r, { defaultKind: 'group' }))
           .join(', '),
         ownedByRelations,
-        partOfSystemRelationTitle:
-          partOfSystemRelations.length > 0
-            ? formatEntityRefTitle(partOfSystemRelations[0], {
-                defaultKind: 'system',
-              })
-            : undefined,
+        partOfSystemRelationTitle: partOfSystemRelations
+          .map(r =>
+            formatEntityRefTitle(r, {
+              defaultKind: 'system',
+            }),
+          )
+          .join(', '),
         partOfSystemRelations,
       },
     };
diff --git a/plugins/api-docs/src/components/ApisCards/ApisTable.tsx b/plugins/api-docs/src/components/ApisCards/ApisTable.tsx
index 56ba697234..0595044327 100644
--- a/plugins/api-docs/src/components/ApisCards/ApisTable.tsx
+++ b/plugins/api-docs/src/components/ApisCards/ApisTable.tsx
@@ -116,12 +116,13 @@ export const ApisTable = ({ entities, title, variant = 'gridItem' }: Props) => {
             .map(r => formatEntityRefTitle(r, { defaultKind: 'group' }))
             .join(', '),
           ownedByRelations,
-          partOfSystemRelationTitle:
-            partOfSystemRelations.length > 0
-              ? formatEntityRefTitle(partOfSystemRelations[0], {
-                  defaultKind: 'system',
-                })
-              : undefined,
+          partOfSystemRelationTitle: partOfSystemRelations
+            .map(r =>
+              formatEntityRefTitle(r, {
+                defaultKind: 'system',
+              }),
+            )
+            .join(', '),
           partOfSystemRelations,
         },
       };
diff --git a/plugins/api-docs/src/components/ComponentsCards/ComponentsTable.tsx b/plugins/api-docs/src/components/ComponentsCards/ComponentsTable.tsx
index 2a6115f512..1ac82991eb 100644
--- a/plugins/api-docs/src/components/ComponentsCards/ComponentsTable.tsx
+++ b/plugins/api-docs/src/components/ComponentsCards/ComponentsTable.tsx
@@ -119,12 +119,13 @@ export const ComponentsTable = ({
             .map(r => formatEntityRefTitle(r, { defaultKind: 'group' }))
             .join(', '),
           ownedByRelations,
-          partOfSystemRelationTitle:
-            partOfSystemRelations.length > 0
-              ? formatEntityRefTitle(partOfSystemRelations[0], {
-                  defaultKind: 'system',
-                })
-              : undefined,
+          partOfSystemRelationTitle: partOfSystemRelations
+            .map(r =>
+              formatEntityRefTitle(r, {
+                defaultKind: 'system',
+              }),
+            )
+            .join(', '),
           partOfSystemRelations,
         },
       };
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index 049b2a2052..6f91b250df 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -180,12 +180,13 @@ export const CatalogTable = ({
           .map(r => formatEntityRefTitle(r, { defaultKind: 'group' }))
           .join(', '),
         ownedByRelations,
-        partOfSystemRelationTitle:
-          partOfSystemRelations.length > 0
-            ? formatEntityRefTitle(partOfSystemRelations[0], {
-                defaultKind: 'system',
-              })
-            : undefined,
+        partOfSystemRelationTitle: partOfSystemRelations
+          .map(r =>
+            formatEntityRefTitle(r, {
+              defaultKind: 'system',
+            }),
+          )
+          .join(', '),
         partOfSystemRelations,
       },
     };