From 91d37fb41d820fe2cdcdbb28f999df2de751316e Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 2 Apr 2021 13:28:40 -0400
Subject: [PATCH] feat: optimize save within Edit

---
 .../components/views/collections/Edit/index.tsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/admin/components/views/collections/Edit/index.tsx b/src/admin/components/views/collections/Edit/index.tsx
index 3dc187732a..dd67d21388 100644
--- a/src/admin/components/views/collections/Edit/index.tsx
+++ b/src/admin/components/views/collections/Edit/index.tsx
@@ -40,14 +40,15 @@ const EditView: React.FC<IndexProps> = (props) => {
   const [initialState, setInitialState] = useState({});
   const { permissions } = useAuth();
 
-  const onSave = (json) => {
-    history.push(`${admin}/collections/${collection.slug}/${json?.doc?.id}`, {
-      status: {
-        message: json.message,
-        type: 'success',
-      },
-      data: json.doc,
-    });
+  const onSave = async (json) => {
+    if (!isEditing) {
+      history.push(`${admin}/collections/${collection.slug}/${json?.doc?.id}`, {
+        data: json.doc,
+      });
+    } else {
+      const state = await buildStateFromSchema(fields, json.doc);
+      setInitialState(state);
+    }
   };
 
   const [{ data, isLoading, isError }] = usePayloadAPI(