Use the getRefList method in more places (#2887)

keystonejs · May 5, 2020 · 99da34a · 99da34a
1 parent c506dfa
commit 99da34a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.changeset/stale-parents-peel.md b/.changeset/stale-parents-peel.md
@@ -0,0 +1,5 @@
+---
+'@keystonejs/fields': patch
+---
+
+Updated views to make use of the `getRefList()` method of the relationship field controller.
diff --git a/packages/fields/src/types/Relationship/views/Cell.js b/packages/fields/src/types/Relationship/views/Cell.js
@@ -4,15 +4,15 @@ export default ({ data, field, Link }) => {
   if (!data) {
     return null;
   }
-  const refList = field.adminMeta.getListByKey(field.config.ref);
+  const { path } = field.getRefList();
   return (
     <Fragment>
       {(Array.isArray(data) ? data : [data])
         .filter(item => item)
         .map((item, index) => (
           <Fragment key={item.id}>
             {!!index ? ', ' : ''}
-            <Link path={refList.path} item={item}>
+            <Link path={path} item={item}>
               {item._label_}
             </Link>
           </Fragment>

diff --git a/packages/fields/src/types/Relationship/views/Controller.js b/packages/fields/src/types/Relationship/views/Controller.js
@@ -6,9 +6,7 @@ export default class RelationshipController extends FieldController {
     super({ ...config, defaultValue }, ...args);
   }
   getRefList() {
-    const { getListByKey } = this.adminMeta;
-    const { ref } = this.config;
-    return getListByKey(ref);
+    return this.adminMeta.getListByKey(this.config.ref);
   }
   getQueryFragment = (path = this.path) => {
     return `

diff --git a/packages/fields/src/types/Relationship/views/Field.js b/packages/fields/src/types/Relationship/views/Field.js
@@ -56,12 +56,12 @@ function SetAsCurrentUser({ listKey, value, onAddUser, many }) {
 }
 
 function LinkToRelatedItems({ field, value }) {
-  const { many, ref } = field.config;
-  const { adminPath, getListByKey } = field.adminMeta;
-  const refList = getListByKey(ref);
+  const { many } = field.config;
+  const { adminPath } = field.adminMeta;
+  const { path } = field.getRefList();
   let isDisabled = false;
   let label;
-  let link = `${adminPath}/${refList.path}`;
+  let link = `${adminPath}/${path}`;
   if (many) {
     label = 'View List of Related Items';
 
@@ -106,7 +106,7 @@ function LinkToRelatedItems({ field, value }) {
 function CreateAndAddItem({ field, item, onCreate, CreateItemModal }) {
   const { list, openCreateItemModal } = useList();
 
-  let relatedList = field.adminMeta.getListByKey(field.config.ref);
+  let relatedList = field.getRefList();
   let label = `Create and add ${relatedList.singular}`;
 
   let prefillData;
@@ -182,7 +182,7 @@ const RelationshipField = ({
   const { authStrategy } = field.adminMeta;
   const htmlID = `ks-input-${field.path}`;
 
-  const relatedList = field.adminMeta.getListByKey(field.config.ref);
+  const relatedList = field.getRefList();
 
   return (
     <FieldContainer>