Skip to content

Commit d613638

Browse files
lucasbordeauabdulrahmancodes
authored andcommitted
Fixed ACTOR advanced filter recent regressions (twentyhq#12813)
This PR fixes recent regressions on advanced filters for the ACTOR field type. - The new `isFilterable` props on `SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS` wasn't taken into account for sub field picker in advanced filter. - A wrong component instance id was passed to `subFieldNameUsedInDropdownComponentState`
1 parent c2b56f6 commit d613638

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export const AdvancedFilterDropdownFilterInput = ({
3232
}: AdvancedFilterDropdownFilterInputProps) => {
3333
const subFieldNameUsedInDropdown = useRecoilComponentValueV2(
3434
subFieldNameUsedInDropdownComponentState,
35-
filterDropdownId,
3635
);
3736

3837
const filterType = recordFilter.type;

packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterSubFieldSelectMenu.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ export const AdvancedFilterSubFieldSelectMenu = ({
9494

9595
const subFieldNames = SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS[
9696
objectFilterDropdownSubMenuFieldType
97-
].subFields.map((subField) => subField.subFieldName);
97+
].subFields
98+
.filter((subField) => subField.isFilterable === true)
99+
.map((subField) => subField.subFieldName);
98100

99101
const subFieldsAreFilterable =
100102
isDefined(fieldMetadataItemUsedInDropdown) &&

0 commit comments

Comments
 (0)