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

Feat: Advanced filter (#7700)

Browse Source 
Design:


![twenty-advanced-filters-design](https://github.com/user-attachments/assets/7d99971c-9ee1-4a78-a2fb-7ae5a9b3a836)

Not ready to be merged yet!

---------

Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
ad-elias
2024-10-24 16:59:59 +02:00
committed by GitHub
parent 1dfeba39eb
commit 315820ec86
99 changed files with 3349 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts
View File

@ -382,6 +382,15 @@ export const VIEW_FILTER_STANDARD_FIELD_IDS = {
value: '20202020-1e55-4a1e-a1d2-fefb86a5fce5',
displayValue: '20202020-1270-4ebf-9018-c0ec10d5038e',
view: '20202020-4f5b-487e-829c-3d881c163611',
viewFilterGroupId: '20202020-2580-420a-8328-cab1635c0296',
positionInViewFilterGroup: '20202020-3bb0-4f66-a537-a46fe0dc468f',
};
export const VIEW_FILTER_GROUP_STANDARD_FIELD_IDS = {
view: '20202020-ff7a-4b54-8be5-aa0249047b74',
parentViewFilterGroupId: '20202020-edbf-4929-8ede-64f48d6bf2a7',
logicalOperator: '20202020-64d9-4bc5-85ba-c250796ce9aa',
positionInViewFilterGroup: '20202020-90d6-4299-ad87-d05ddd3a0a3f',
};
export const VIEW_SORT_STANDARD_FIELD_IDS = {
@ -402,6 +411,7 @@ export const VIEW_STANDARD_FIELD_IDS = {
viewFields: '20202020-542b-4bdc-b177-b63175d48edf',
viewGroups: '20202020-e1a1-419f-ac81-1986a5ea59a8',
viewFilters: '20202020-ff23-4154-b63c-21fb36cd0967',
viewFilterGroups: '20202020-0318-474a-84a1-bac895ceaa5a',
viewSorts: '20202020-891b-45c3-9fe1-80a75b4aa043',
favorites: '20202020-c818-4a86-8284-9ec0ef0a59a5',
};

1
packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts
View File

@ -37,6 +37,7 @@ export const STANDARD_OBJECT_IDS = {
viewField: '20202020-4d19-4655-95bf-b2a04cf206d4',
viewGroup: '20202020-725f-47a4-8008-4255f9519f70',
viewFilter: '20202020-6fb6-4631-aded-b7d67e952ec8',
viewFilterGroup: '20202020-b920-4b11-92aa-9b07d878e542',
viewSort: '20202020-e46a-47a8-939a-e5d911f83531',
view: '20202020-722e-4739-8e2c-0c372d661f49',
webhook: '20202020-be4d-4e08-811d-0fffcd13ffd4',

2
packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/standard-objects/index.ts
View File

@ -27,6 +27,7 @@ import { AuditLogWorkspaceEntity } from 'src/modules/timeline/standard-objects/a
import { BehavioralEventWorkspaceEntity } from 'src/modules/timeline/standard-objects/behavioral-event.workspace-entity';
import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
import { ViewFieldWorkspaceEntity } from 'src/modules/view/standard-objects/view-field.workspace-entity';
import { ViewFilterGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view-filter-group.workspace-entity';
import { ViewFilterWorkspaceEntity } from 'src/modules/view/standard-objects/view-filter.workspace-entity';
import { ViewGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view-group.workspace-entity';
import { ViewSortWorkspaceEntity } from 'src/modules/view/standard-objects/view-sort.workspace-entity';
@ -59,6 +60,7 @@ export const standardObjectMetadataDefinitions = [
ViewFieldWorkspaceEntity,
ViewGroupWorkspaceEntity,
ViewFilterWorkspaceEntity,
ViewFilterGroupWorkspaceEntity,
ViewSortWorkspaceEntity,
ViewWorkspaceEntity,
WebhookWorkspaceEntity,

95
packages/twenty-server/src/modules/view/standard-objects/view-filter-group.workspace-entity.ts Normal file
View File

@ -0,0 +1,95 @@
import { Relation } from 'typeorm';
import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
import { WorkspaceJoinColumn } from 'src/engine/twenty-orm/decorators/workspace-join-column.decorator';
import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
import { VIEW_FILTER_GROUP_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity';
export enum ViewFilterGroupLogicalOperator {
AND = 'AND',
OR = 'OR',
NOT = 'NOT',
}
@WorkspaceEntity({
standardId: STANDARD_OBJECT_IDS.viewFilterGroup,
namePlural: 'viewFilterGroups',
labelSingular: 'View Filter Group',
labelPlural: 'View Filter Groups',
description: '(System) View Filter Groups',
icon: 'IconFilterBolt',
})
@WorkspaceIsNotAuditLogged()
@WorkspaceIsSystem()
export class ViewFilterGroupWorkspaceEntity extends BaseWorkspaceEntity {
@WorkspaceRelation({
standardId: VIEW_FILTER_GROUP_STANDARD_FIELD_IDS.view,
type: RelationMetadataType.MANY_TO_ONE,
label: 'View',
description: 'View',
inverseSideTarget: () => ViewWorkspaceEntity,
inverseSideFieldKey: 'viewFilterGroups',
})
view: Relation<ViewWorkspaceEntity>;
@WorkspaceJoinColumn('view')
viewId: string;
@WorkspaceField({
standardId: VIEW_FILTER_GROUP_STANDARD_FIELD_IDS.parentViewFilterGroupId,
type: FieldMetadataType.UUID,
label: 'Parent View Filter Group Id',
description: 'Parent View Filter Group',
})
@WorkspaceIsNullable()
parentViewFilterGroupId: string | null;
@WorkspaceField({
standardId: VIEW_FILTER_GROUP_STANDARD_FIELD_IDS.logicalOperator,
type: FieldMetadataType.SELECT,
label: 'Logical Operator',
description: 'Logical operator for the filter group',
options: [
{
value: ViewFilterGroupLogicalOperator.AND,
label: 'AND',
position: 0,
color: 'blue',
},
{
value: ViewFilterGroupLogicalOperator.OR,
label: 'OR',
position: 1,
color: 'green',
},
{
value: ViewFilterGroupLogicalOperator.NOT,
label: 'NOT',
position: 2,
color: 'red',
},
],
defaultValue: `'${ViewFilterGroupLogicalOperator.NOT}'`,
})
logicalOperator: string;
@WorkspaceField({
standardId: VIEW_FILTER_GROUP_STANDARD_FIELD_IDS.positionInViewFilterGroup,
type: FieldMetadataType.POSITION,
label: 'Position in view filter group',
description: 'Position in the parent view filter group',
icon: 'IconHierarchy2',
})
@WorkspaceIsSystem()
@WorkspaceIsNullable()
positionInViewFilterGroup: number | null;
}

20
packages/twenty-server/src/modules/view/standard-objects/view-filter.workspace-entity.ts
View File

@ -72,4 +72,24 @@ export class ViewFilterWorkspaceEntity extends BaseWorkspaceEntity {
@WorkspaceJoinColumn('view')
viewId: string | null;
@WorkspaceField({
standardId: VIEW_FILTER_STANDARD_FIELD_IDS.viewFilterGroupId,
type: FieldMetadataType.UUID,
label: 'View Filter Group Id',
description: 'View Filter Group',
})
@WorkspaceIsNullable()
viewFilterGroupId: string | null;
@WorkspaceField({
standardId: VIEW_FILTER_STANDARD_FIELD_IDS.positionInViewFilterGroup,
type: FieldMetadataType.POSITION,
label: 'Position in view filter group',
description: 'Position in the view filter group',
icon: 'IconHierarchy2',
})
@WorkspaceIsSystem()
@WorkspaceIsNullable()
positionInViewFilterGroup: number | null;
}

13
packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts
View File

@ -16,6 +16,7 @@ import { VIEW_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-
import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
import { FavoriteWorkspaceEntity } from 'src/modules/favorite/standard-objects/favorite.workspace-entity';
import { ViewFieldWorkspaceEntity } from 'src/modules/view/standard-objects/view-field.workspace-entity';
import { ViewFilterGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view-filter-group.workspace-entity';
import { ViewFilterWorkspaceEntity } from 'src/modules/view/standard-objects/view-filter.workspace-entity';
import { ViewSortWorkspaceEntity } from 'src/modules/view/standard-objects/view-sort.workspace-entity';
import { ViewGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view-group.workspace-entity';
@ -138,6 +139,18 @@ export class ViewWorkspaceEntity extends BaseWorkspaceEntity {
@WorkspaceIsNullable()
viewFilters: Relation<ViewFilterWorkspaceEntity[]>;
@WorkspaceRelation({
standardId: VIEW_STANDARD_FIELD_IDS.viewFilterGroups,
type: RelationMetadataType.ONE_TO_MANY,
label: 'View Filter Groups',
description: 'View Filter Groups',
icon: 'IconFilterBolt',
inverseSideTarget: () => ViewFilterGroupWorkspaceEntity,
onDelete: RelationOnDeleteAction.SET_NULL,
})
@WorkspaceIsNullable()
viewFilterGroups: Relation<ViewFilterGroupWorkspaceEntity[]>;
@WorkspaceRelation({
standardId: VIEW_STANDARD_FIELD_IDS.viewSorts,
type: RelationMetadataType.ONE_TO_MANY,