twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-12-26 21:53:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Tasks-List-page-Person-Switcher (#6077)

Browse Source 
Fixes #6007, adds context to the ObjectFilter DropdownRecordSelect
This commit is contained in:
srikary12 2024-07-01 15:36:30 +05:30 committed by GitHub
parent 632e34fc7b
commit 4599f43b6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
View File

@ -13,7 +13,12 @@ import { isDefined } from '~/utils/isDefined';
export const EMPTY_FILTER_VALUE = '[]'; export const EMPTY_FILTER_VALUE = '[]';
export const MAX_RECORDS_TO_DISPLAY = 3; export const MAX_RECORDS_TO_DISPLAY = 3;
export const ObjectFilterDropdownRecordSelect = () => { type ObjectFilterDropdownRecordSelectProps = {
viewComponentId?: string;
}
export const ObjectFilterDropdownRecordSelect = ({
viewComponentId,
}: ObjectFilterDropdownRecordSelectProps) => {
const { const {
filterDefinitionUsedInDropdownState, filterDefinitionUsedInDropdownState,
objectFilterDropdownSearchInputState, objectFilterDropdownSearchInputState,
@ -25,8 +30,8 @@ export const ObjectFilterDropdownRecordSelect = () => {
emptyFilterButKeepDefinition, emptyFilterButKeepDefinition,
} = useFilterDropdown(); } = useFilterDropdown();
const { removeCombinedViewFilter } = useCombinedViewFilters(); const { removeCombinedViewFilter } = useCombinedViewFilters(viewComponentId);
const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView(); const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView(viewComponentId);
const filterDefinitionUsedInDropdown = useRecoilValue( const filterDefinitionUsedInDropdown = useRecoilValue(
filterDefinitionUsedInDropdownState, filterDefinitionUsedInDropdownState,

2
packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
View File

@ -75,7 +75,7 @@ export const SingleEntityObjectFilterDropdownButton = ({
<ObjectFilterDropdownSearchInput /> <ObjectFilterDropdownSearchInput />
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<ObjectFilterDropdownRecordRemoveFilterMenuItem /> <ObjectFilterDropdownRecordRemoveFilterMenuItem />
<ObjectFilterDropdownRecordSelect /> <ObjectFilterDropdownRecordSelect viewComponentId={"single-entity-filter-dropdown"}/>
</> </>
} }
/> />