Admin UI: fixed a regression in the Create Relationship workflow (#3124)

* Admin UI: fixed a regression in the Create Relationship workflow * Fixup changeset Co-authored-by: Mike <mike@madebymike.com.au>
keystonejs · Jun 6, 2020 · 37f57c3 · 37f57c3
1 parent 211009a
commit 37f57c3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.changeset/lovely-rockets-hunt.md b/.changeset/lovely-rockets-hunt.md
@@ -0,0 +1,5 @@
+---
+'@keystonejs/app-admin-ui': patch
+---
+
+Fixed a regression in the Create Relationship workflow.
diff --git a/packages/app-admin-ui/client/components/CreateItemModal.js b/packages/app-admin-ui/client/components/CreateItemModal.js
@@ -46,7 +46,7 @@ const useEventCallback = callback => {
   return cb;
 };
 
-const CreateItemModal = ({ prefillData = {}, onClose, onCreate }) => {
+const CreateItemModal = ({ prefillData = {}, onClose, onCreate, viewOnSave }) => {
   const { list, closeCreateItemModal, isCreateItemModalOpen } = useList();
 
   const [item, setItem] = useState(list.getInitialItemData({ prefill: prefillData }));
@@ -123,8 +123,10 @@ const CreateItemModal = ({ prefillData = {}, onClose, onCreate }) => {
       onCreate(savedData);
     }
 
-    const newItemID = savedData.data[list.gqlNames.createMutationName].id;
-    history.push(`${list.fullPath}/${newItemID}`);
+    if (viewOnSave) {
+      const newItemID = savedData.data[list.gqlNames.createMutationName].id;
+      history.push(`${list.fullPath}/${newItemID}`);
+    }
   });
 
   const _onClose = () => {

diff --git a/packages/app-admin-ui/client/pages/Home/components.js b/packages/app-admin-ui/client/pages/Home/components.js
@@ -65,7 +65,7 @@ const BoxComponent = ({ focusOrigin, isActive, isHover, isFocus, meta, ...props
           <A11yText>Create {singular}</A11yText>
         </CreateButton>
       </BoxElement>
-      <CreateItemModal />
+      <CreateItemModal viewOnSave />
     </Fragment>
   );
 };

diff --git a/packages/app-admin-ui/client/pages/Item/index.js b/packages/app-admin-ui/client/pages/Item/index.js
@@ -322,7 +322,7 @@ const ItemDetails = ({ list, item: initialData, itemErrors, onUpdate }) => {
         />
       </Card>
 
-      <CreateItemModal />
+      <CreateItemModal viewOnSave />
       <DeleteItemModal
         isOpen={showDeleteModal}
         item={initialData}

diff --git a/packages/app-admin-ui/client/pages/List/index.js b/packages/app-admin-ui/client/pages/List/index.js
@@ -151,7 +151,7 @@ export function ListLayout(props) {
         </HeaderInset>
       </Container>
 
-      <CreateItemModal />
+      <CreateItemModal viewOnSave />
 
       <Container isFullWidth>
         <ListTable