Collection shows channels after creation (#5376)

* Wait for channels update before navigate * Add changeset
saleor · Jan 29, 2025 · 6e46436 · 6e46436
1 parent b1af6f2
commit 6e46436
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/.changeset/selfish-swans-turn.md b/.changeset/selfish-swans-turn.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+After creating a new collection, you should see a list of assigned channels
diff --git a/src/collections/views/CollectionCreate.tsx b/src/collections/views/CollectionCreate.tsx
@@ -63,28 +63,7 @@ export const CollectionCreate: React.FC<CollectionCreateProps> = ({ params }) =>
     { closeModal, openModal },
     { formId: COLLECTION_CREATE_FORM_ID },
   );
-  const [createCollection, createCollectionOpts] = useCreateCollectionMutation({
-    onCompleted: data => {
-      if (data.collectionCreate.errors.length === 0) {
-        notify({
-          status: "success",
-          text: intl.formatMessage(commonMessages.savedChanges),
-        });
-        navigate(collectionUrl(data.collectionCreate.collection.id));
-      } else {
-        const backgroundImageError = data.collectionCreate.errors.find(
-          error => error.field === ("backgroundImage" as keyof CollectionCreateInput),
-        );
-
-        if (backgroundImageError) {
-          notify({
-            status: "error",
-            text: intl.formatMessage(commonMessages.somethingWentWrong),
-          });
-        }
-      }
-    },
-  });
+  const [createCollection, createCollectionOpts] = useCreateCollectionMutation({});
   const handleCreate = async (formData: CollectionCreateData) => {
     const result = await createCollection({
       variables: {
@@ -103,7 +82,7 @@ export const CollectionCreate: React.FC<CollectionCreateProps> = ({ params }) =>
     const id = result.data?.collectionCreate.collection?.id || null;
 
     if (id) {
-      updateChannels({
+      await updateChannels({
         variables: {
           id,
           input: {
@@ -118,6 +97,25 @@ export const CollectionCreate: React.FC<CollectionCreateProps> = ({ params }) =>
       });
     }
 
+    if (result.data.collectionCreate.errors.length === 0) {
+      notify({
+        status: "success",
+        text: intl.formatMessage(commonMessages.savedChanges),
+      });
+      navigate(collectionUrl(id));
+    } else {
+      const backgroundImageError = result.data.collectionCreate.errors.find(
+        error => error.field === ("backgroundImage" as keyof CollectionCreateInput),
+      );
+
+      if (backgroundImageError) {
+        notify({
+          status: "error",
+          text: intl.formatMessage(commonMessages.somethingWentWrong),
+        });
+      }
+    }
+
     return { id, errors: getMutationErrors(result) };
   };
   const handleSubmit = createMetadataCreateHandler(