admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implemented CRUD for view filter group and removed old states (#10590)

Browse Source 
This PR implements CRUD for view filter groups with the new logic as
already done for view filters and view sorts.

It also completely removes the old combined view filter group states and
usage.

This PR is quite big but the impact is limited since it only changes
advanced filters module, which is under feature flag at the moment, and
it is already in a broken state so unusable, even if someone activates
the feature flag.
This commit is contained in:
Lucas Bordeau
2025-03-04 13:16:02 +01:00
committed by GitHub
parent 9d80d2a8ef
commit aba20dae11
54 changed files with 304 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts
View File

@ -55,6 +55,7 @@ describe('mapViewFiltersToFilters', () => {
operand: ViewFilterOperand.Is,
},
];
const expectedFilters: RecordFilter[] = [
{
id: 'id',
@ -64,8 +65,8 @@ describe('mapViewFiltersToFilters', () => {
operand: ViewFilterOperand.Is,
label: baseFieldMetadataItem.label,
type: FieldMetadataType.FULL_NAME,
positionInViewFilterGroup: undefined,
viewFilterGroupId: undefined,
positionInRecordFilterGroup: undefined,
recordFilterGroupId: undefined,
},
];
expect(

10
packages/twenty-front/src/modules/views/utils/mapRecordFilterToViewFilter.ts
View File

@ -6,6 +6,12 @@ export const mapRecordFilterToViewFilter = (
): ViewFilter => {
return {
__typename: 'ViewFilter',
...recordFilter,
} satisfies ViewFilter;
displayValue: recordFilter.displayValue,
fieldMetadataId: recordFilter.fieldMetadataId,
id: recordFilter.id,
operand: recordFilter.operand,
value: recordFilter.value,
positionInViewFilterGroup: recordFilter.positionInRecordFilterGroup,
viewFilterGroupId: recordFilter.recordFilterGroupId,
};
};

6
packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
View File

@ -32,11 +32,11 @@ export const mapViewFiltersToFilters = (
value: viewFilter.value,
displayValue: viewFilter.displayValue,
operand: viewFilter.operand,
viewFilterGroupId: viewFilter.viewFilterGroupId,
positionInViewFilterGroup: viewFilter.positionInViewFilterGroup,
recordFilterGroupId: viewFilter.viewFilterGroupId,
positionInRecordFilterGroup: viewFilter.positionInViewFilterGroup,
label: availableFieldMetadataItem.label,
type: filterType,
};
} satisfies RecordFilter;
})
.filter(isDefined);
};

19
packages/twenty-front/src/modules/views/utils/shouldReplaceFilter.ts
View File

@ -1,18 +1,27 @@
import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
import { isDefined } from 'twenty-shared';
import { compareStrictlyExceptForNullAndUndefined } from '~/utils/compareStrictlyExceptForNullAndUndefined';
export const shouldReplaceFilter = (
oldFilter: Pick<RecordFilter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
newFilter: Pick<RecordFilter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
oldFilter: Pick<
RecordFilter,
'id' | 'fieldMetadataId' | 'recordFilterGroupId'
>,
newFilter: Pick<
RecordFilter,
'id' | 'fieldMetadataId' | 'recordFilterGroupId'
>,
) => {
const isNewFilterAdvancedFilter = isDefined(newFilter.viewFilterGroupId);
const isNewFilterAdvancedFilter = isDefined(newFilter.recordFilterGroupId);
if (isNewFilterAdvancedFilter) {
return newFilter.id === oldFilter.id;
} else {
return (
newFilter.fieldMetadataId === oldFilter.fieldMetadataId &&
!oldFilter.viewFilterGroupId
compareStrictlyExceptForNullAndUndefined(
newFilter.fieldMetadataId,
oldFilter.fieldMetadataId,
) && !isDefined(oldFilter.recordFilterGroupId)
);
}
};