chore: reset popover values when it closed

bucketeer-io · Jan 16, 2025 · c10197c · c10197c
1 parent 2f6de96
commit c10197c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/ui/web-v2/src/components/FilterPopover/index.tsx b/ui/web-v2/src/components/FilterPopover/index.tsx
@@ -51,6 +51,12 @@ export const FilterPopover: FC<FilterPopoverProps> = memo(
       }
     };
 
+    const handlePopoverClose = () => {
+      setSelectedFilterType(null);
+      setValueOption(null);
+      setMultiValueOption([]);
+    };
+
     useEffect(() => {
       if (isFilterTypeMaintainer) {
         setValueOption(null);
@@ -83,6 +89,7 @@ export const FilterPopover: FC<FilterPopoverProps> = memo(
           leave="transition ease-in duration-150"
           leaveFrom="opacity-100 translate-y-0"
           leaveTo="opacity-0 translate-y-1"
+          afterLeave={handlePopoverClose}
         >
           <Popover.Panel
             className={classNames(

diff --git a/ui/web-v2/src/pages/account/index.tsx b/ui/web-v2/src/pages/account/index.tsx
@@ -398,6 +398,7 @@ export const AccountIndexPage: FC = memo(() => {
           `${PAGE_PATH_ROOT}${currentEnvironment.urlCode}${PAGE_PATH_ACCOUNTS}`
         );
         updateAccountList(null, 1);
+        fetchListTags();
       });
     },
     [dispatch]
@@ -433,11 +434,25 @@ export const AccountIndexPage: FC = memo(() => {
           })
         );
         handleClose();
+        fetchListTags();
       });
     },
     [dispatch, accountId, dirtyFields]
   );
 
+  const fetchListTags = useCallback(() => {
+    dispatch(
+      listTags({
+        environmentId: currentEnvironment.id,
+        pageSize: 99999,
+        cursor: '',
+        orderBy: ListTagsRequest.OrderBy.DEFAULT,
+        orderDirection: ListTagsRequest.OrderDirection.ASC,
+        searchKeyword: null
+      })
+    );
+  }, [dispatch]);
+
   useEffect(() => {
     history.listen(() => {
       // Handle browser's back button
@@ -454,17 +469,8 @@ export const AccountIndexPage: FC = memo(() => {
       searchOptions,
       searchOptions.page ? Number(searchOptions.page) : 1
     );
-    dispatch(
-      listTags({
-        environmentId: currentEnvironment.id,
-        pageSize: 99999,
-        cursor: '',
-        orderBy: ListTagsRequest.OrderBy.DEFAULT,
-        orderDirection: ListTagsRequest.OrderDirection.ASC,
-        searchKeyword: null
-      })
-    );
-  }, [updateAccountList, dispatch]);
+    fetchListTags();
+  }, [updateAccountList]);
 
   useEffect(() => {
     if (isUpdate) {