Correctly render many relationships in cells

keystonejs · May 17, 2018 · c68dbc6 · c68dbc6
1 parent ae9f156
commit c68dbc6
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/packages/fields/types/Relationship/views/Cell.js b/packages/fields/types/Relationship/views/Cell.js
@@ -1,11 +1,21 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import renderTemplate from '@keystonejs/ui/src/template';
 
 export default ({ data, field, Link }) => {
+  if (!data) {
+    return null;
+  }
   const refList = field.adminMeta.getListByKey(field.config.ref);
   return (
-    <Link path={refList.path} id={data.id}>
-      {renderTemplate({ template: refList.displayTemplate, data })}
-    </Link>
+    <Fragment>
+      {(Array.isArray(data) ? data : [data]).filter(Boolean).map((item, index) =>
+        <Fragment key={item.id}>
+          {!!index ? ', ' : ''}
+          <Link path={refList.path} id={item.id}>
+            {renderTemplate({ template: refList.displayTemplate, data: item })}
+          </Link>
+        </Fragment>
+      )}
+    </Fragment>
   );
 };