From 9ab412116d56550fd5daa71bf4b12d54f5a5329a Mon Sep 17 00:00:00 2001
From: gitstart-twenty <140154534+gitstart-twenty@users.noreply.github.com>
Date: Thu, 21 Sep 2023 07:09:48 +0100
Subject: [PATCH] Fix tasks filters (#1676)

* Fix tasks filters

Co-authored-by: v1b3m <vibenjamin6@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>

* Simplify condition

---------

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: Charles Bochet <charles@twenty.com>
---
 .../components/FilterDropdownEntitySearchSelect.tsx       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchSelect.tsx b/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchSelect.tsx
index 74f7e8632..1dce00cf6 100644
--- a/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchSelect.tsx
+++ b/front/src/modules/ui/view-bar/components/FilterDropdownEntitySearchSelect.tsx
@@ -75,8 +75,14 @@ export const FilterDropdownEntitySearchSelect = ({
   useEffect(() => {
     if (!filterCurrentlyEdited) {
       setFilterDropdownSelectedEntityId(null);
+    } else {
+      setFilterDropdownSelectedEntityId(filterCurrentlyEdited.value);
     }
-  }, [filterCurrentlyEdited, setFilterDropdownSelectedEntityId]);
+  }, [
+    filterCurrentlyEdited,
+    setFilterDropdownSelectedEntityId,
+    entitiesForSelect.selectedEntities,
+  ]);
 
   return (
     <>