From 4599f43b6c7266d6ebb354ee83e42a7b9df8887f Mon Sep 17 00:00:00 2001
From: srikary12 <121927567+srikary12@users.noreply.github.com>
Date: Mon, 1 Jul 2024 15:36:30 +0530
Subject: [PATCH] Fix: Tasks-List-page-Person-Switcher (#6077)
Fixes #6007, adds context to the ObjectFilter DropdownRecordSelect
---
.../components/ObjectFilterDropdownRecordSelect.tsx | 11 ++++++++---
.../SingleEntityObjectFilterDropdownButton.tsx | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
index 6a81d3f02..c1f0cf2d1 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
@@ -13,7 +13,12 @@ import { isDefined } from '~/utils/isDefined';
export const EMPTY_FILTER_VALUE = '[]';
export const MAX_RECORDS_TO_DISPLAY = 3;
-export const ObjectFilterDropdownRecordSelect = () => {
+type ObjectFilterDropdownRecordSelectProps = {
+ viewComponentId?: string;
+}
+export const ObjectFilterDropdownRecordSelect = ({
+ viewComponentId,
+}: ObjectFilterDropdownRecordSelectProps) => {
const {
filterDefinitionUsedInDropdownState,
objectFilterDropdownSearchInputState,
@@ -25,8 +30,8 @@ export const ObjectFilterDropdownRecordSelect = () => {
emptyFilterButKeepDefinition,
} = useFilterDropdown();
- const { removeCombinedViewFilter } = useCombinedViewFilters();
- const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
+ const { removeCombinedViewFilter } = useCombinedViewFilters(viewComponentId);
+ const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView(viewComponentId);
const filterDefinitionUsedInDropdown = useRecoilValue(
filterDefinitionUsedInDropdownState,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
index 7ddbdb5f5..690ed9037 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
@@ -75,7 +75,7 @@ export const SingleEntityObjectFilterDropdownButton = ({
-
+
}
/>