Fix assign attribute value dialogs showing previous search results (#…

…4400) * Reset query onClose * Add changeset
saleor · Nov 3, 2023 · 873954f · 873954f
1 parent b7c2a96
commit 873954f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/.changeset/quiet-wasps-sing.md 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
@@ -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
@@ -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
@@ -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