From 873954f2112a2eecbd5cd9b84fa720f68d257014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dro=C5=84?= <droniu@droniu.dev>
Date: Fri, 3 Nov 2023 16:27:25 +0100
Subject: [PATCH] Fix assign attribute value dialogs showing previous search
 results (#4400)

* Reset query onClose

* Add changeset
---
 .changeset/quiet-wasps-sing.md                           | 5 +++++
 .../AssignContainerDialog/AssignContainerDialog.tsx      | 9 +++++++--
 .../AssignProductDialog/AssignProductDialog.tsx          | 7 ++++++-
 .../AssignVariantDialog/AssignVariantDialog.tsx          | 9 +++++++--
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/quiet-wasps-sing.md

diff --git a/.changeset/quiet-wasps-sing.md b/.changeset/quiet-wasps-sing.md
new file mode 100644
index 00000000000..c7036b5da0f
--- /dev/null
+++ b/.changeset/quiet-wasps-sing.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Fix assign attribute value dialogs showing previous search results
diff --git a/src/components/AssignContainerDialog/AssignContainerDialog.tsx b/src/components/AssignContainerDialog/AssignContainerDialog.tsx
index e1065f222af..df6245acfed 100644
--- a/src/components/AssignContainerDialog/AssignContainerDialog.tsx
+++ b/src/components/AssignContainerDialog/AssignContainerDialog.tsx
@@ -77,16 +77,21 @@ const AssignContainerDialog: React.FC<AssignContainerDialogProps> = props => {
   const classes = useStyles(props);
   const scrollableDialogClasses = useScrollableDialogStyle({});
 
-  const [query, onQueryChange] = useSearchQuery(onFetch);
+  const [query, onQueryChange, queryReset] = useSearchQuery(onFetch);
   const [selectedContainers, setSelectedContainers] = React.useState<
     Container[]
   >([]);
 
   const handleSubmit = () => onSubmit(selectedContainers);
 
+  const handleClose = () => {
+    queryReset();
+    onClose();
+  };
+
   return (
     <Dialog
-      onClose={onClose}
+      onClose={handleClose}
       open={open}
       classes={{ paper: scrollableDialogClasses.dialog }}
       fullWidth
diff --git a/src/components/AssignProductDialog/AssignProductDialog.tsx b/src/components/AssignProductDialog/AssignProductDialog.tsx
index 6a75d29aef9..67c94eff90e 100644
--- a/src/components/AssignProductDialog/AssignProductDialog.tsx
+++ b/src/components/AssignProductDialog/AssignProductDialog.tsx
@@ -109,9 +109,14 @@ const AssignProductDialog: React.FC<AssignProductDialogProps> = props => {
     }));
   };
 
+  const handleClose = () => {
+    queryReset();
+    onClose();
+  };
+
   return (
     <Dialog
-      onClose={onClose}
+      onClose={handleClose}
       open={open}
       classes={{ paper: scrollableDialogClasses.dialog }}
       fullWidth
diff --git a/src/components/AssignVariantDialog/AssignVariantDialog.tsx b/src/components/AssignVariantDialog/AssignVariantDialog.tsx
index 5d9cb51333c..58b7aa9912e 100644
--- a/src/components/AssignVariantDialog/AssignVariantDialog.tsx
+++ b/src/components/AssignVariantDialog/AssignVariantDialog.tsx
@@ -71,7 +71,7 @@ const AssignVariantDialog: React.FC<AssignVariantDialogProps> = props => {
   const scrollableDialogClasses = useScrollableDialogStyle({});
 
   const intl = useIntl();
-  const [query, onQueryChange] = useSearchQuery(onFetch);
+  const [query, onQueryChange, queryReset] = useSearchQuery(onFetch);
   const [variants, setVariants] = React.useState<VariantWithProductLabel[]>([]);
 
   const productChoices =
@@ -97,9 +97,14 @@ const AssignVariantDialog: React.FC<AssignVariantDialogProps> = props => {
       })),
     );
 
+  const handleClose = () => {
+    queryReset();
+    onClose();
+  };
+
   return (
     <Dialog
-      onClose={onClose}
+      onClose={handleClose}
       open={open}
       classes={{ paper: scrollableDialogClasses.dialog }}
       fullWidth