Skip to content

The open alternative to Salesforce, designed for AI.

Store workflow and chart record filters as field references (#27777)

Félix Malfaitf6b4f0b86b87
diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/utils/__tests__/attachUngroupedRecordFiltersToRootRecordFilterGroup.test.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/__tests__/attachUngroupedRecordFiltersToRootRecordFilterGroup.test.ts
new file mode 100644
index 00000000000..12cbb97fa7f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/__tests__/attachUngroupedRecordFiltersToRootRecordFilterGroup.test.ts
@@ -0,0 +1,175 @@
+import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
+import { attachUngroupedRecordFiltersToRootRecordFilterGroup } from '@/object-record/record-filter-group/utils/attachUngroupedRecordFiltersToRootRecordFilterGroup';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
+import {
+ RecordFilterGroupLogicalOperator,
+ ViewFilterOperand,
+} from 'twenty-shared/types';
+
+const buildRecordFilter = (
+ recordFilter: Partial<PersistedRecordFilter> & { id: string },
+): PersistedRecordFilter => ({
+ fieldMetadataId: 'field-id',
+ operand: ViewFilterOperand.IS,
+ value: '',
+ ...recordFilter,
+});
+
+const andRootRecordFilterGroup: RecordFilterGroup = {
+ id: 'root-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.AND,
+};
+
+describe('attachUngroupedRecordFiltersToRootRecordFilterGroup', () => {
+ it('should leave filters and groups untouched when every filter has a group', () => {
+ const recordFilters = [
+ buildRecordFilter({
+ id: 'filter-id',
+ recordFilterGroupId: 'root-group-id',
+ }),
+ ];
+ const recordFilterGroups = [andRootRecordFilterGroup];
+
+ const result = attachUngroupedRecordFiltersToRootRecordFilterGroup({
+ recordFilters,
+ recordFilterGroups,
+ });
+
+ expect(result.recordFilters).toBe(recordFilters);
+ expect(result.recordFilterGroups).toBe(recordFilterGroups);
+ });
+
+ it('should append ungrouped filters after the children of an AND root group', () => {
+ const result = attachUngroupedRecordFiltersToRootRecordFilterGroup({
+ recordFilters: [
+ buildRecordFilter({
+ id: 'grouped-filter-id',
+ recordFilterGroupId: 'root-group-id',
+ positionInRecordFilterGroup: 1,
+ }),
+ buildRecordFilter({ id: 'ungrouped-filter-id' }),
+ ],
+ recordFilterGroups: [
+ andRootRecordFilterGroup,
+ {
+ id: 'child-group-id',
+ parentRecordFilterGroupId: 'root-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.OR,
+ positionInRecordFilterGroup: 0,
+ },
+ ],
+ });
+
+ expect(result.recordFilters[1]).toEqual(
+ buildRecordFilter({
+ id: 'ungrouped-filter-id',
+ recordFilterGroupId: 'root-group-id',
+ positionInRecordFilterGroup: 2,
+ }),
+ );
+ expect(result.recordFilterGroups).toHaveLength(2);
+ });
+
+ it('should create an AND root group when there is none', () => {
+ const result = attachUngroupedRecordFiltersToRootRecordFilterGroup({
+ recordFilters: [
+ buildRecordFilter({ id: 'first-filter-id' }),
+ buildRecordFilter({ id: 'second-filter-id' }),
+ ],
+ recordFilterGroups: [],
+ });
+
+ const [rootRecordFilterGroup] = result.recordFilterGroups;
+
+ expect(result.recordFilterGroups).toEqual([
+ {
+ id: expect.any(String),
+ logicalOperator: RecordFilterGroupLogicalOperator.AND,
+ },
+ ]);
+ expect(
+ result.recordFilters.map(
+ ({ recordFilterGroupId, positionInRecordFilterGroup }) => ({
+ recordFilterGroupId,
+ positionInRecordFilterGroup,
+ }),
+ ),
+ ).toEqual([
+ {
+ recordFilterGroupId: rootRecordFilterGroup.id,
+ positionInRecordFilterGroup: 0,
+ },
+ {
+ recordFilterGroupId: rootRecordFilterGroup.id,
+ positionInRecordFilterGroup: 1,
+ },
+ ]);
+ });
+
+ it('should nest an OR root group under a new AND root so ungrouped filters stay ANDed with it', () => {
+ const result = attachUngroupedRecordFiltersToRootRecordFilterGroup({
+ recordFilters: [
+ buildRecordFilter({
+ id: 'grouped-filter-id',
+ recordFilterGroupId: 'root-group-id',
+ }),
+ buildRecordFilter({ id: 'ungrouped-filter-id' }),
+ ],
+ recordFilterGroups: [
+ {
+ id: 'root-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.OR,
+ },
+ ],
+ });
+
+ const [newRootRecordFilterGroup, previousRootRecordFilterGroup] =
+ result.recordFilterGroups;
+
+ expect(newRootRecordFilterGroup).toEqual({
+ id: expect.any(String),
+ logicalOperator: RecordFilterGroupLogicalOperator.AND,
+ });
+ expect(previousRootRecordFilterGroup).toEqual({
+ id: 'root-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.OR,
+ parentRecordFilterGroupId: newRootRecordFilterGroup.id,
+ positionInRecordFilterGroup: 0,
+ });
+ expect(result.recordFilters).toEqual([
+ buildRecordFilter({
+ id: 'grouped-filter-id',
+ recordFilterGroupId: 'root-group-id',
+ }),
+ buildRecordFilter({
+ id: 'ungrouped-filter-id',
+ recordFilterGroupId: newRootRecordFilterGroup.id,
+ positionInRecordFilterGroup: 1,
+ }),
+ ]);
+ });
+
+ it('should leave filters and groups untouched when nesting an OR root would add a third group level', () => {
+ const recordFilters = [buildRecordFilter({ id: 'ungrouped-filter-id' })];
+ const recordFilterGroups: RecordFilterGroup[] = [
+ {
+ id: 'root-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.OR,
+ },
+ {
+ id: 'child-group-id',
+ parentRecordFilterGroupId: 'root-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.AND,
+ positionInRecordFilterGroup: 0,
+ },
+ ];
+
+ const result = attachUngroupedRecordFiltersToRootRecordFilterGroup({
+ recordFilters,
+ recordFilterGroups,
+ });
+
+ expect(result.recordFilters).toBe(recordFilters);
+ expect(result.recordFilterGroups).toBe(recordFilterGroups);
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/utils/__tests__/removeEmptyRecordFilterGroups.test.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/__tests__/removeEmptyRecordFilterGroups.test.ts
new file mode 100644
index 00000000000..144656235c9
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/__tests__/removeEmptyRecordFilterGroups.test.ts
@@ -0,0 +1,44 @@
+import { removeEmptyRecordFilterGroups } from '@/object-record/record-filter-group/utils/removeEmptyRecordFilterGroups';
+import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
+
+const rootRecordFilterGroup = {
+ id: 'root-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.OR,
+};
+
+const childRecordFilterGroup = {
+ id: 'child-group-id',
+ logicalOperator: RecordFilterGroupLogicalOperator.AND,
+ parentRecordFilterGroupId: rootRecordFilterGroup.id,
+};
+
+describe('removeEmptyRecordFilterGroups', () => {
+ it('should keep groups that hold a filter or a non-empty child group', () => {
+ const recordFilterGroups = [rootRecordFilterGroup, childRecordFilterGroup];
+
+ expect(
+ removeEmptyRecordFilterGroups({
+ recordFilters: [{ recordFilterGroupId: childRecordFilterGroup.id }],
+ recordFilterGroups,
+ }),
+ ).toBe(recordFilterGroups);
+ });
+
+ it('should remove a group left without filters, then its parent if it becomes empty', () => {
+ expect(
+ removeEmptyRecordFilterGroups({
+ recordFilters: [],
+ recordFilterGroups: [rootRecordFilterGroup, childRecordFilterGroup],
+ }),
+ ).toEqual([]);
+ });
+
+ it('should keep the parent when it still holds a filter', () => {
+ expect(
+ removeEmptyRecordFilterGroups({
+ recordFilters: [{ recordFilterGroupId: rootRecordFilterGroup.id }],
+ recordFilterGroups: [rootRecordFilterGroup, childRecordFilterGroup],
+ }),
+ ).toEqual([rootRecordFilterGroup]);
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/utils/attachUngroupedRecordFiltersToRootRecordFilterGroup.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/attachUngroupedRecordFiltersToRootRecordFilterGroup.ts
new file mode 100644
index 00000000000..e96b43e1182
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/attachUngroupedRecordFiltersToRootRecordFilterGroup.ts
@@ -0,0 +1,137 @@
+import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
+import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import { v4 } from 'uuid';
+
+type GroupableRecordFilter = Pick<
+ PersistedRecordFilter,
+ 'recordFilterGroupId' | 'positionInRecordFilterGroup'
+>;
+
+const attachUngroupedRecordFiltersToRecordFilterGroup = <
+ TRecordFilter extends GroupableRecordFilter,
+>({
+ recordFilters,
+ recordFilterGroups,
+ recordFilterGroupId,
+}: {
+ recordFilters: TRecordFilter[];
+ recordFilterGroups: RecordFilterGroup[];
+ recordFilterGroupId: string;
+}): TRecordFilter[] => {
+ const lastChildPosition = Math.max(
+ -1,
+ ...[
+ ...recordFilterGroups.filter(
+ (recordFilterGroup) =>
+ recordFilterGroup.parentRecordFilterGroupId === recordFilterGroupId,
+ ),
+ ...recordFilters.filter(
+ (recordFilter) =>
+ recordFilter.recordFilterGroupId === recordFilterGroupId,
+ ),
+ ].map((child) => child.positionInRecordFilterGroup ?? 0),
+ );
+
+ const ungroupedRecordFilters = recordFilters.filter(
+ (recordFilter) => !isDefined(recordFilter.recordFilterGroupId),
+ );
+
+ return recordFilters.map((recordFilter) =>
+ isDefined(recordFilter.recordFilterGroupId)
+ ? recordFilter
+ : {
+ ...recordFilter,
+ recordFilterGroupId,
+ positionInRecordFilterGroup:
+ lastChildPosition +
+ 1 +
+ ungroupedRecordFilters.indexOf(recordFilter),
+ },
+ );
+};
+
+export const attachUngroupedRecordFiltersToRootRecordFilterGroup = <
+ TRecordFilter extends GroupableRecordFilter,
+>({
+ recordFilters,
+ recordFilterGroups,
+}: {
+ recordFilters: TRecordFilter[];
+ recordFilterGroups: RecordFilterGroup[];
+}): {
+ recordFilters: TRecordFilter[];
+ recordFilterGroups: RecordFilterGroup[];
+} => {
+ const hasUngroupedRecordFilters = recordFilters.some(
+ (recordFilter) => !isDefined(recordFilter.recordFilterGroupId),
+ );
+
+ if (!hasUngroupedRecordFilters) {
+ return { recordFilters, recordFilterGroups };
+ }
+
+ const rootRecordFilterGroup = recordFilterGroups.find(
+ (recordFilterGroup) =>
+ !isDefined(recordFilterGroup.parentRecordFilterGroupId),
+ );
+
+ const canAttachToRootRecordFilterGroup =
+ isDefined(rootRecordFilterGroup) &&
+ rootRecordFilterGroup.logicalOperator ===
+ RecordFilterGroupLogicalOperator.AND;
+
+ const rootRecordFilterGroupHasChildGroups =
+ isDefined(rootRecordFilterGroup) &&
+ recordFilterGroups.some(
+ (recordFilterGroup) =>
+ recordFilterGroup.parentRecordFilterGroupId ===
+ rootRecordFilterGroup.id,
+ );
+
+ if (
+ !canAttachToRootRecordFilterGroup &&
+ rootRecordFilterGroupHasChildGroups
+ ) {
+ return { recordFilters, recordFilterGroups };
+ }
+
+ if (canAttachToRootRecordFilterGroup) {
+ return {
+ recordFilters: attachUngroupedRecordFiltersToRecordFilterGroup({
+ recordFilters,
+ recordFilterGroups,
+ recordFilterGroupId: rootRecordFilterGroup.id,
+ }),
+ recordFilterGroups,
+ };
+ }
+
+ const newRootRecordFilterGroup: RecordFilterGroup = {
+ id: v4(),
+ logicalOperator: RecordFilterGroupLogicalOperator.AND,
+ };
+
+ const nextRecordFilterGroups = [
+ newRootRecordFilterGroup,
+ ...recordFilterGroups.map((recordFilterGroup) =>
+ recordFilterGroup.id === rootRecordFilterGroup?.id
+ ? {
+ ...recordFilterGroup,
+ parentRecordFilterGroupId: newRootRecordFilterGroup.id,
+ positionInRecordFilterGroup: 0,
+ }
+ : recordFilterGroup,
+ ),
+ ];
+
+ return {
+ recordFilters: attachUngroupedRecordFiltersToRecordFilterGroup({
+ recordFilters,
+ recordFilterGroups: nextRecordFilterGroups,
+ recordFilterGroupId: newRootRecordFilterGroup.id,
+ }),
+ recordFilterGroups: nextRecordFilterGroups,
+ };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/utils/removeEmptyRecordFilterGroups.ts b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/removeEmptyRecordFilterGroups.ts
new file mode 100644
index 00000000000..5a7a4a0994f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter-group/utils/removeEmptyRecordFilterGroups.ts
@@ -0,0 +1,32 @@
+import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
+import { isDefined } from 'twenty-shared/utils';
+
+export const removeEmptyRecordFilterGroups = ({
+ recordFilters,
+ recordFilterGroups,
+}: {
+ recordFilters: Pick<PersistedRecordFilter, 'recordFilterGroupId'>[];
+ recordFilterGroups: RecordFilterGroup[];
+}): RecordFilterGroup[] => {
+ const nonEmptyRecordFilterGroupIds = new Set(
+ [
+ ...recordFilters.map(({ recordFilterGroupId }) => recordFilterGroupId),
+ ...recordFilterGroups.map(
+ ({ parentRecordFilterGroupId }) => parentRecordFilterGroupId,
+ ),
+ ].filter(isDefined),
+ );
+
+ const nonEmptyRecordFilterGroups = recordFilterGroups.filter(
+ (recordFilterGroup) =>
+ nonEmptyRecordFilterGroupIds.has(recordFilterGroup.id),
+ );
+
+ return nonEmptyRecordFilterGroups.length === recordFilterGroups.length
+ ? recordFilterGroups
+ : removeEmptyRecordFilterGroups({
+ recordFilters,
+ recordFilterGroups: nonEmptyRecordFilterGroups,
+ });
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/states/unresolvedRecordFiltersComponentState.ts b/packages/twenty-front/src/modules/object-record/record-filter/states/unresolvedRecordFiltersComponentState.ts
new file mode 100644
index 00000000000..a42af1e30f2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/states/unresolvedRecordFiltersComponentState.ts
@@ -0,0 +1,11 @@
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
+
+export const unresolvedRecordFiltersComponentState = createAtomComponentState<
+ PersistedRecordFilter[]
+>({
+ key: 'unresolvedRecordFiltersComponentState',
+ defaultValue: [],
+ componentInstanceContext: RecordFiltersComponentInstanceContext,
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/types/PersistedRecordFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/PersistedRecordFilter.ts
new file mode 100644
index 00000000000..efa3f347173
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/PersistedRecordFilter.ts
@@ -0,0 +1,14 @@
+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+
+export type PersistedRecordFilter = Pick<
+ RecordFilter,
+ | 'fieldMetadataId'
+ | 'operand'
+ | 'recordFilterGroupId'
+ | 'positionInRecordFilterGroup'
+ | 'subFieldName'
+ | 'relationTargetFieldMetadataId'
+> & {
+ id?: string;
+ value?: string;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/hydrateRecordFiltersFromFieldMetadata.test.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/hydrateRecordFiltersFromFieldMetadata.test.ts
index 388b63789bf..f7dc617e29d 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/hydrateRecordFiltersFromFieldMetadata.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/hydrateRecordFiltersFromFieldMetadata.test.ts
@@ -1,5 +1,5 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
import { hydrateRecordFiltersFromFieldMetadata } from '@/object-record/record-filter/utils/hydrateRecordFiltersFromFieldMetadata';
import { FieldMetadataType, ViewFilterOperand } from 'twenty-shared/types';
@@ -10,44 +10,67 @@ const ownerFieldMetadataItem = {
type: FieldMetadataType.MORPH_RELATION,
} as FieldMetadataItem;
-const buildRecordFilter = (overrides: Partial<RecordFilter>): RecordFilter => ({
+const persistedRecordFilter: PersistedRecordFilter = {
id: 'filter-id',
fieldMetadataId: ownerFieldMetadataItem.id,
- value: '',
- displayValue: '',
- type: 'TEXT',
- operand: ViewFilterOperand.IS_EMPTY,
- label: '',
- ...overrides,
-});
+ operand: ViewFilterOperand.IS,
+ value: '{{trigger.ownerId}}',
+ recordFilterGroupId: 'group-id',
+ positionInRecordFilterGroup: 0,
+};
describe('hydrateRecordFiltersFromFieldMetadata', () => {
- it('should replace a persisted raw field type and label with the ones derived from field metadata', () => {
+ it('should derive type, label and display value from field metadata', () => {
expect(
hydrateRecordFiltersFromFieldMetadata({
- recordFilters: [
- buildRecordFilter({
- type: FieldMetadataType.MORPH_RELATION as RecordFilter['type'],
- label: 'Stale label',
- }),
- ],
+ persistedRecordFilters: [persistedRecordFilter],
fieldMetadataItems: [ownerFieldMetadataItem],
}),
- ).toEqual([buildRecordFilter({ type: 'RELATION', label: 'Owner' })]);
+ ).toEqual({
+ recordFilters: [
+ {
+ ...persistedRecordFilter,
+ type: 'RELATION',
+ label: 'Owner',
+ displayValue: '{{trigger.ownerId}}',
+ },
+ ],
+ unresolvedRecordFilters: [],
+ });
});
- it('should keep a filter unchanged when its field is unknown', () => {
- const recordFilter = buildRecordFilter({
+ it('should set apart a filter whose field no longer exists', () => {
+ const filterOnDeletedField = {
+ ...persistedRecordFilter,
fieldMetadataId: 'deleted-field-id',
- type: 'NUMBER',
- label: 'Deleted field',
- });
+ };
expect(
hydrateRecordFiltersFromFieldMetadata({
- recordFilters: [recordFilter],
+ persistedRecordFilters: [filterOnDeletedField],
fieldMetadataItems: [ownerFieldMetadataItem],
}),
- ).toEqual([recordFilter]);
+ ).toEqual({
+ recordFilters: [],
+ unresolvedRecordFilters: [filterOnDeletedField],
+ });
+ });
+
+ it('should give an id and an empty value to a filter persisted without them', () => {
+ const {
+ id: _id,
+ value: _value,
+ ...persistedRecordFilterWithoutIdAndValue
+ } = persistedRecordFilter;
+
+ const {
+ recordFilters: [recordFilter],
+ } = hydrateRecordFiltersFromFieldMetadata({
+ persistedRecordFilters: [persistedRecordFilterWithoutIdAndValue],
+ fieldMetadataItems: [ownerFieldMetadataItem],
+ });
+
+ expect(recordFilter.id).toEqual(expect.any(String));
+ expect(recordFilter.value).toBe('');
});
});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/mapRecordFiltersToPersistedRecordFilters.test.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/mapRecordFiltersToPersistedRecordFilters.test.ts
new file mode 100644
index 00000000000..e8d9c534b3f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/mapRecordFiltersToPersistedRecordFilters.test.ts
@@ -0,0 +1,34 @@
+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { mapRecordFiltersToPersistedRecordFilters } from '@/object-record/record-filter/utils/mapRecordFiltersToPersistedRecordFilters';
+import { ViewFilterOperand } from 'twenty-shared/types';
+
+describe('mapRecordFiltersToPersistedRecordFilters', () => {
+ it('should keep field references and drop properties derived from field metadata', () => {
+ const recordFilter: RecordFilter = {
+ id: 'filter-id',
+ fieldMetadataId: 'company-field-id',
+ relationTargetFieldMetadataId: 'name-field-id',
+ operand: ViewFilterOperand.CONTAINS,
+ value: 'Acme',
+ displayValue: 'Acme',
+ displayAvatarUrl: 'https://example.com/avatar.png',
+ type: 'TEXT',
+ label: 'Company → Name',
+ recordFilterGroupId: 'group-id',
+ positionInRecordFilterGroup: 1,
+ };
+
+ expect(mapRecordFiltersToPersistedRecordFilters([recordFilter])).toEqual([
+ {
+ id: 'filter-id',
+ fieldMetadataId: 'company-field-id',
+ relationTargetFieldMetadataId: 'name-field-id',
+ operand: ViewFilterOperand.CONTAINS,
+ value: 'Acme',
+ recordFilterGroupId: 'group-id',
+ positionInRecordFilterGroup: 1,
+ subFieldName: undefined,
+ },
+ ]);
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/hydrateRecordFiltersFromFieldMetadata.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/hydrateRecordFiltersFromFieldMetadata.ts
index 38bdf8d7e0b..cd0621047c7 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/hydrateRecordFiltersFromFieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/hydrateRecordFiltersFromFieldMetadata.ts
@@ -1,22 +1,58 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
import { getRecordFilterTypeAndLabelFromFieldMetadata } from '@/object-record/record-filter/utils/getRecordFilterTypeAndLabelFromFieldMetadata';
+import { isDefined } from 'twenty-shared/utils';
+import { v4 } from 'uuid';
-// Persisted record filters carry a denormalized type and label that can be
-// stale or wrong (e.g. a raw MORPH_RELATION written through the API), so
-// derive them from field metadata like view filters are
export const hydrateRecordFiltersFromFieldMetadata = ({
- recordFilters,
+ persistedRecordFilters,
fieldMetadataItems,
}: {
- recordFilters: RecordFilter[];
+ persistedRecordFilters: PersistedRecordFilter[];
fieldMetadataItems: FieldMetadataItem[];
-}): RecordFilter[] =>
- recordFilters.map((recordFilter) => ({
- ...recordFilter,
- ...getRecordFilterTypeAndLabelFromFieldMetadata({
- fieldMetadataId: recordFilter.fieldMetadataId,
- relationTargetFieldMetadataId: recordFilter.relationTargetFieldMetadataId,
- fieldMetadataItems,
- }),
- }));
+}): {
+ recordFilters: RecordFilter[];
+ unresolvedRecordFilters: PersistedRecordFilter[];
+} => {
+ const recordFilters: RecordFilter[] = [];
+ const unresolvedRecordFilters: PersistedRecordFilter[] = [];
+
+ for (const persistedRecordFilter of persistedRecordFilters) {
+ const persistedRecordFilterWithId: PersistedRecordFilter &
+ Pick<RecordFilter, 'id' | 'value'> = {
+ id: persistedRecordFilter.id ?? v4(),
+ fieldMetadataId: persistedRecordFilter.fieldMetadataId,
+ operand: persistedRecordFilter.operand,
+ value: persistedRecordFilter.value ?? '',
+ recordFilterGroupId: persistedRecordFilter.recordFilterGroupId,
+ positionInRecordFilterGroup:
+ persistedRecordFilter.positionInRecordFilterGroup,
+ subFieldName: persistedRecordFilter.subFieldName,
+ relationTargetFieldMetadataId:
+ persistedRecordFilter.relationTargetFieldMetadataId,
+ };
+
+ const recordFilterTypeAndLabel =
+ getRecordFilterTypeAndLabelFromFieldMetadata({
+ fieldMetadataId: persistedRecordFilterWithId.fieldMetadataId,
+ relationTargetFieldMetadataId:
+ persistedRecordFilterWithId.relationTargetFieldMetadataId,
+ fieldMetadataItems,
+ });
+
+ if (!isDefined(recordFilterTypeAndLabel)) {
+ unresolvedRecordFilters.push(persistedRecordFilterWithId);
+ continue;
+ }
+
+ recordFilters.push({
+ ...persistedRecordFilterWithId,
+ displayValue: persistedRecordFilterWithId.value,
+ type: recordFilterTypeAndLabel.type,
+ label: recordFilterTypeAndLabel.label,
+ });
+ }
+
+ return { recordFilters, unresolvedRecordFilters };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/mapRecordFiltersToPersistedRecordFilters.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/mapRecordFiltersToPersistedRecordFilters.ts
new file mode 100644
index 00000000000..babe96ca460
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/mapRecordFiltersToPersistedRecordFilters.ts
@@ -0,0 +1,16 @@
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+
+export const mapRecordFiltersToPersistedRecordFilters = (
+ recordFilters: RecordFilter[],
+): PersistedRecordFilter[] =>
+ recordFilters.map((recordFilter) => ({
+ id: recordFilter.id,
+ fieldMetadataId: recordFilter.fieldMetadataId,
+ operand: recordFilter.operand,
+ value: recordFilter.value,
+ recordFilterGroupId: recordFilter.recordFilterGroupId,
+ positionInRecordFilterGroup: recordFilter.positionInRecordFilterGroup,
+ subFieldName: recordFilter.subFieldName,
+ relationTargetFieldMetadataId: recordFilter.relationTargetFieldMetadataId,
+ }));
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/pointChartRecordFiltersAtMorphRelationFields.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/pointRecordFiltersAtMorphRelationFields.ts
similarity index 82%
rename from packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/pointChartRecordFiltersAtMorphRelationFields.ts
rename to packages/twenty-front/src/modules/object-record/record-filter/utils/pointRecordFiltersAtMorphRelationFields.ts
index 033c92f071e..d5377e92c45 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/pointChartRecordFiltersAtMorphRelationFields.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/pointRecordFiltersAtMorphRelationFields.ts
@@ -1,15 +1,17 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
-export const pointChartRecordFiltersAtMorphRelationFields = ({
+export const pointRecordFiltersAtMorphRelationFields = <
+ TRecordFilter extends Pick<RecordFilter, 'fieldMetadataId'>,
+>({
recordFilters,
fieldMetadataItems,
}: {
- recordFilters: RecordFilter[];
+ recordFilters: TRecordFilter[];
fieldMetadataItems: (Pick<FieldMetadataItem, 'id'> & {
morphRelations?: { sourceFieldMetadata: { id: string } }[] | null;
})[];
-}): RecordFilter[] => {
+}): TRecordFilter[] => {
const fieldMetadataIdByMorphRelationTargetId = new Map(
fieldMetadataItems.flatMap((fieldMetadataItem) =>
(fieldMetadataItem.morphRelations ?? []).map(
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/sanitizeChartFiltersInPageLayoutDraft.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/sanitizeChartFiltersInPageLayoutDraft.test.ts
index afd92f7732f..ed74daf9313 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/sanitizeChartFiltersInPageLayoutDraft.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/sanitizeChartFiltersInPageLayoutDraft.test.ts
@@ -2,16 +2,13 @@ import { type DraftPageLayout } from '@/page-layout/types/DraftPageLayout';
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { sanitizeChartFiltersInPageLayoutDraft } from '@/page-layout/utils/sanitizeChartFiltersInPageLayoutDraft';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
import { type ChartFilters } from '@/side-panel/pages/page-layout/types/ChartFilters';
import {
RecordFilterGroupLogicalOperator,
ViewFilterOperand,
} from 'twenty-shared/types';
-import {
- FieldMetadataType,
- PageLayoutType,
-} from '~/generated-metadata/graphql';
+import { PageLayoutType } from '~/generated-metadata/graphql';
import {
TEST_BAR_CHART_CONFIGURATION,
TEST_FIELDS_CONFIGURATION,
@@ -25,18 +22,17 @@ const ACTIVE_FIELD_ID = TEST_FIELD_METADATA_ID_1;
const DELETED_FIELD_ID = TEST_FIELD_METADATA_ID_2;
const buildRecordFilter = (
- overrides: Partial<RecordFilter> &
- Pick<RecordFilter, 'id' | 'fieldMetadataId'>,
-): RecordFilter => ({
+ overrides: Partial<PersistedRecordFilter> &
+ Pick<PersistedRecordFilter, 'id' | 'fieldMetadataId'>,
+): PersistedRecordFilter => ({
value: '',
- displayValue: '',
- type: FieldMetadataType.NUMBER,
operand: ViewFilterOperand.IS,
- label: 'Filter',
...overrides,
});
-const buildChartFilters = (recordFilters: RecordFilter[]): ChartFilters => ({
+const buildChartFilters = (
+ recordFilters: PersistedRecordFilter[],
+): ChartFilters => ({
recordFilters,
recordFilterGroups: [],
});
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetQueryCommon.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetQueryCommon.ts
index 336d399823f..7315ce0195c 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetQueryCommon.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetQueryCommon.ts
@@ -56,7 +56,10 @@ export const useGraphWidgetQueryCommon = ({
const gqlOperationFilter = computeRecordGqlOperationFilter({
fieldMetadataItems: flattenedFieldMetadataItems,
filterValueDependencies,
- recordFilters: sanitizedRecordFilters ?? [],
+ recordFilters: (sanitizedRecordFilters ?? []).map((recordFilter) => ({
+ ...recordFilter,
+ value: recordFilter.value ?? '',
+ })),
recordFilterGroups: configuration.filter?.recordFilterGroups ?? [],
});
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/buildFilterQueryParams.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/buildFilterQueryParams.ts
index d4bd05232b0..4bb48be6a4e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/buildFilterQueryParams.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/buildFilterQueryParams.ts
@@ -1,6 +1,6 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
import { isDefined } from 'twenty-shared/utils';
import { appendNestedUrlFilterGroupsToQueryParams } from './appendNestedUrlFilterGroupsToQueryParams';
import { mapRecordFilterToUrlFilter } from './mapRecordFilterToUrlFilter';
@@ -11,7 +11,7 @@ export const buildFilterQueryParams = ({
recordFilterGroups = [],
objectMetadataItem,
}: {
- recordFilters?: RecordFilter[];
+ recordFilters?: PersistedRecordFilter[];
recordFilterGroups?: RecordFilterGroup[];
objectMetadataItem: EnrichedObjectMetadataItem;
}): URLSearchParams => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterGroupToUrlFilterGroup.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterGroupToUrlFilterGroup.ts
index acb847ead5b..cf08493eadf 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterGroupToUrlFilterGroup.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterGroupToUrlFilterGroup.ts
@@ -1,6 +1,6 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
import { isDefined } from 'twenty-shared/utils';
import {
mapRecordFilterToUrlFilter,
@@ -20,7 +20,7 @@ export const mapRecordFilterGroupToUrlFilterGroup = ({
objectMetadataItem,
}: {
recordFilterGroupId: string;
- allRecordFilters: RecordFilter[];
+ allRecordFilters: PersistedRecordFilter[];
allRecordFilterGroups: RecordFilterGroup[];
objectMetadataItem: EnrichedObjectMetadataItem;
}): UrlFilterGroup | null => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterToUrlFilter.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterToUrlFilter.ts
index 363050266ef..40f0f924cee 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterToUrlFilter.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/mapRecordFilterToUrlFilter.ts
@@ -1,5 +1,5 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
@@ -14,7 +14,7 @@ export const mapRecordFilterToUrlFilter = ({
recordFilter,
objectMetadataItem,
}: {
- recordFilter: RecordFilter;
+ recordFilter: PersistedRecordFilter;
objectMetadataItem: EnrichedObjectMetadataItem;
}): UrlFilter | null => {
const fieldMetadataItem = objectMetadataItem.fields.find(
@@ -28,7 +28,7 @@ export const mapRecordFilterToUrlFilter = ({
const urlFilter: UrlFilter = {
field: fieldMetadataItem.name,
op: recordFilter.operand,
- value: recordFilter.value,
+ value: recordFilter.value ?? '',
};
if (isNonEmptyString(recordFilter.subFieldName)) {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelRecordFiltersDeletedFieldsWarning.tsx
similarity index 51%
rename from packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
rename to packages/twenty-front/src/modules/side-panel/components/SidePanelRecordFiltersDeletedFieldsWarning.tsx
index 910cd2a3eb4..a3f5e67660c 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelRecordFiltersDeletedFieldsWarning.tsx
@@ -1,21 +1,32 @@
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { unresolvedRecordFiltersComponentState } from '@/object-record/record-filter/states/unresolvedRecordFiltersComponentState';
import { SidePanelInformationBanner } from '@/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { t } from '@lingui/core/macro';
-type ChartFiltersDeletedFieldsWarningProps = {
- validFieldMetadataIds: Set<string>;
+import { isDefined } from 'twenty-shared/utils';
+
+type SidePanelRecordFiltersDeletedFieldsWarningProps = {
+ validFieldMetadataIds?: Set<string>;
};
-export const ChartFiltersDeletedFieldsWarning = ({
+export const SidePanelRecordFiltersDeletedFieldsWarning = ({
validFieldMetadataIds,
-}: ChartFiltersDeletedFieldsWarningProps) => {
+}: SidePanelRecordFiltersDeletedFieldsWarningProps) => {
const currentRecordFilters = useAtomComponentStateValue(
currentRecordFiltersComponentState,
);
- const deletedFieldFiltersCount = currentRecordFilters.filter(
- (recordFilter) => !validFieldMetadataIds.has(recordFilter.fieldMetadataId),
- ).length;
+ const unresolvedRecordFilters = useAtomComponentStateValue(
+ unresolvedRecordFiltersComponentState,
+ );
+
+ const deletedFieldFiltersCount =
+ unresolvedRecordFilters.length +
+ currentRecordFilters.filter(
+ (recordFilter) =>
+ isDefined(validFieldMetadataIds) &&
+ !validFieldMetadataIds.has(recordFilter.fieldMetadataId),
+ ).length;
if (deletedFieldFiltersCount === 0) {
return null;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
index b690b61e015..d920b9c145f 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettings.tsx
@@ -1,4 +1,4 @@
-import { ChartFiltersDeletedFieldsWarning } from '@/side-panel/pages/page-layout/components/ChartFiltersDeletedFieldsWarning';
+import { SidePanelRecordFiltersDeletedFieldsWarning } from '@/side-panel/components/SidePanelRecordFiltersDeletedFieldsWarning';
import { ChartFiltersSettingsInitializeStateEffect } from '@/side-panel/pages/page-layout/components/ChartFiltersSettingsInitializeStateEffect';
import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
@@ -13,6 +13,7 @@ import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/reco
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { mapRecordFiltersToPersistedRecordFilters } from '@/object-record/record-filter/utils/mapRecordFiltersToPersistedRecordFilters';
import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { styled } from '@linaria/react';
@@ -81,7 +82,9 @@ export const ChartFiltersSettings = ({
recordFilterGroups: sanitizedRecordFilterGroups,
} = sanitizeChartRecordFilters({
chartFilters: {
- recordFilters: existingRecordFilters,
+ recordFilters: mapRecordFiltersToPersistedRecordFilters(
+ existingRecordFilters,
+ ),
recordFilterGroups: existingRecordFilterGroups,
},
fieldMetadataItems: objectMetadataItem.fields,
@@ -108,7 +111,7 @@ export const ChartFiltersSettings = ({
<RecordFiltersComponentInstanceContext.Provider
value={{ instanceId }}
>
- <ChartFiltersDeletedFieldsWarning
+ <SidePanelRecordFiltersDeletedFieldsWarning
validFieldMetadataIds={validFieldMetadataIds}
/>
<AdvancedFilterSidePanelContainer
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettingsInitializeStateEffect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettingsInitializeStateEffect.tsx
index d2f41ea27cc..f33fd807763 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettingsInitializeStateEffect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/ChartFiltersSettingsInitializeStateEffect.tsx
@@ -1,11 +1,13 @@
import { flattenedFieldMetadataItemsSelector } from '@/object-metadata/states/flattenedFieldMetadataItemsSelector';
import { useSetAdvancedFilterDropdownStates } from '@/object-record/advanced-filter/hooks/useSetAdvancedFilterDropdownAllRowsStates';
+import { attachUngroupedRecordFiltersToRootRecordFilterGroup } from '@/object-record/record-filter-group/utils/attachUngroupedRecordFiltersToRootRecordFilterGroup';
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { unresolvedRecordFiltersComponentState } from '@/object-record/record-filter/states/unresolvedRecordFiltersComponentState';
import { hydrateRecordFiltersFromFieldMetadata } from '@/object-record/record-filter/utils/hydrateRecordFiltersFromFieldMetadata';
import { hasInitializedChartFiltersComponentState } from '@/side-panel/pages/page-layout/states/hasInitializedChartFiltersComponentState';
import { type ChartFilters } from '@/side-panel/pages/page-layout/types/ChartFilters';
-import { pointChartRecordFiltersAtMorphRelationFields } from '@/side-panel/pages/page-layout/utils/pointChartRecordFiltersAtMorphRelationFields';
+import { pointRecordFiltersAtMorphRelationFields } from '@/object-record/record-filter/utils/pointRecordFiltersAtMorphRelationFields';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
@@ -30,6 +32,10 @@ export const ChartFiltersSettingsInitializeStateEffect = ({
currentRecordFilterGroupsComponentState,
);
+ const setUnresolvedRecordFilters = useSetAtomComponentState(
+ unresolvedRecordFiltersComponentState,
+ );
+
const flattenedFieldMetadataItems = useAtomStateValue(
flattenedFieldMetadataItemsSelector,
);
@@ -44,18 +50,24 @@ export const ChartFiltersSettingsInitializeStateEffect = ({
useEffect(() => {
if (!hasInitializedChartFilters && isDefined(initialChartFilters)) {
- setCurrentRecordFilters(
- hydrateRecordFiltersFromFieldMetadata({
- recordFilters: pointChartRecordFiltersAtMorphRelationFields({
+ const { recordFilters: persistedRecordFilters, recordFilterGroups } =
+ attachUngroupedRecordFiltersToRootRecordFilterGroup({
+ recordFilters: pointRecordFiltersAtMorphRelationFields({
recordFilters: initialChartFilters.recordFilters ?? [],
fieldMetadataItems: flattenedFieldMetadataItems,
}),
+ recordFilterGroups: initialChartFilters.recordFilterGroups ?? [],
+ });
+
+ const { recordFilters, unresolvedRecordFilters } =
+ hydrateRecordFiltersFromFieldMetadata({
+ persistedRecordFilters,
fieldMetadataItems: flattenedFieldMetadataItems,
- }),
- );
- setCurrentRecordFilterGroups(
- initialChartFilters.recordFilterGroups ?? [],
- );
+ });
+
+ setCurrentRecordFilters(recordFilters);
+ setUnresolvedRecordFilters(unresolvedRecordFilters);
+ setCurrentRecordFilterGroups(recordFilterGroups);
setShouldSetAdvancedFilterDropdownStates(true);
setHasInitializedChartFilters(true);
@@ -63,6 +75,7 @@ export const ChartFiltersSettingsInitializeStateEffect = ({
}, [
setCurrentRecordFilters,
setCurrentRecordFilterGroups,
+ setUnresolvedRecordFilters,
setHasInitializedChartFilters,
hasInitializedChartFilters,
initialChartFilters,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts
index 7d141ac4845..5d3765538f7 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings.ts
@@ -3,6 +3,7 @@ import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWid
import { getChartFiltersSettingsInstanceId } from '@/side-panel/pages/page-layout/utils/getChartFiltersSettingsInstanceId';
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { unresolvedRecordFiltersComponentState } from '@/object-record/record-filter/states/unresolvedRecordFiltersComponentState';
import { hasInitializedCurrentRecordFilterGroupsComponentFamilyState } from '@/views/states/hasInitializedCurrentRecordFilterGroupsComponentFamilyState';
import { hasInitializedCurrentRecordFiltersComponentFamilyState } from '@/views/states/hasInitializedCurrentRecordFiltersComponentFamilyState';
import { useCallback } from 'react';
@@ -46,6 +47,10 @@ export const useResetChartDraftFiltersSettings = () => {
currentRecordFiltersComponentState.atomFamily({ instanceId }),
[],
);
+ store.set(
+ unresolvedRecordFiltersComponentState.atomFamily({ instanceId }),
+ [],
+ );
store.set(
currentRecordFilterGroupsComponentState.atomFamily({ instanceId }),
[],
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartFilters.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartFilters.ts
index b3a66973fb7..1953b625f1b 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartFilters.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartFilters.ts
@@ -1,7 +1,7 @@
import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
export type ChartFilters = {
- recordFilters?: RecordFilter[];
+ recordFilters?: PersistedRecordFilter[];
recordFilterGroups?: RecordFilterGroup[];
};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/sanitizeChartRecordFilters.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/sanitizeChartRecordFilters.ts
index 063178eb83a..764382b13b1 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/sanitizeChartRecordFilters.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/sanitizeChartRecordFilters.ts
@@ -1,6 +1,7 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { removeEmptyRecordFilterGroups } from '@/object-record/record-filter-group/utils/removeEmptyRecordFilterGroups';
import { type ChartFilters } from '@/side-panel/pages/page-layout/types/ChartFilters';
-import { pointChartRecordFiltersAtMorphRelationFields } from '@/side-panel/pages/page-layout/utils/pointChartRecordFiltersAtMorphRelationFields';
+import { pointRecordFiltersAtMorphRelationFields } from '@/object-record/record-filter/utils/pointRecordFiltersAtMorphRelationFields';
import { isDefined } from 'twenty-shared/utils';
export const sanitizeChartRecordFilters = ({
@@ -20,42 +21,17 @@ export const sanitizeChartRecordFilters = ({
activeFieldMetadataItems.map(({ id }) => id),
);
- const validRecordFilters = pointChartRecordFiltersAtMorphRelationFields({
+ const validRecordFilters = pointRecordFiltersAtMorphRelationFields({
recordFilters: chartFilters.recordFilters ?? [],
fieldMetadataItems: activeFieldMetadataItems,
}).filter((recordFilter) =>
validFieldMetadataIds.has(recordFilter.fieldMetadataId),
);
- const recordFilterGroups = chartFilters.recordFilterGroups ?? [];
-
- let remainingGroups = [...recordFilterGroups];
- let changed = true;
-
- while (changed) {
- changed = false;
- const remainingGroupIds = new Set(remainingGroups.map((g) => g.id));
-
- const nonEmptyGroupIds = new Set(
- [
- ...validRecordFilters
- .map((f) => f.recordFilterGroupId)
- .filter(isDefined),
- ...remainingGroups
- .map((g) => g.parentRecordFilterGroupId)
- .filter(isDefined),
- ].filter((id) => remainingGroupIds.has(id)),
- );
-
- const nextGroups = remainingGroups.filter((g) =>
- nonEmptyGroupIds.has(g.id),
- );
-
- if (nextGroups.length !== remainingGroups.length) {
- remainingGroups = nextGroups;
- changed = true;
- }
- }
+ const remainingGroups = removeEmptyRecordFilterGroups({
+ recordFilters: validRecordFilters,
+ recordFilterGroups: chartFilters.recordFilterGroups ?? [],
+ });
const validRecordFiltersWithDroppedOrphanedGroups = validRecordFilters.filter(
(f) => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsx
index 4f7d7ec1d47..4e8fd7b73c3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsx
@@ -3,8 +3,10 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enriche
import { AdvancedFilterSidePanelContainer } from '@/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelContainer';
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { mapRecordFiltersToPersistedRecordFilters } from '@/object-record/record-filter/utils/mapRecordFiltersToPersistedRecordFilters';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
+import { SidePanelRecordFiltersDeletedFieldsWarning } from '@/side-panel/components/SidePanelRecordFiltersDeletedFieldsWarning';
import { type FindRecordsActionFilter } from '@/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter';
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
@@ -37,19 +39,24 @@ export const WorkflowFindRecordsFilters = ({
const newFilter = {
recordFilterGroups: existingRecordFilterGroups,
- recordFilters: existingRecordFilters,
+ recordFilters: mapRecordFiltersToPersistedRecordFilters(
+ existingRecordFilters,
+ ),
} satisfies FindRecordsActionFilter;
onChange(newFilter);
}, [currentRecordFilterGroups, currentRecordFilters, onChange, store]);
return (
- <AdvancedFilterSidePanelContainer
- objectMetadataItem={objectMetadataItem}
- onUpdate={readonly ? undefined : onUpdate}
- VariablePicker={WorkflowVariablePicker}
- readonly={readonly}
- isWorkflowFindRecords={true}
- />
+ <>
+ {!readonly && <SidePanelRecordFiltersDeletedFieldsWarning />}
+ <AdvancedFilterSidePanelContainer
+ objectMetadataItem={objectMetadataItem}
+ onUpdate={readonly ? undefined : onUpdate}
+ VariablePicker={WorkflowVariablePicker}
+ readonly={readonly}
+ isWorkflowFindRecords={true}
+ />
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsx
index e8b41e6e4e9..ba9288ce9d3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsx
@@ -1,12 +1,15 @@
import { flattenedFieldMetadataItemsSelector } from '@/object-metadata/states/flattenedFieldMetadataItemsSelector';
import { useSetAdvancedFilterDropdownStates } from '@/object-record/advanced-filter/hooks/useSetAdvancedFilterDropdownAllRowsStates';
+import { attachUngroupedRecordFiltersToRootRecordFilterGroup } from '@/object-record/record-filter-group/utils/attachUngroupedRecordFiltersToRootRecordFilterGroup';
+import { removeEmptyRecordFilterGroups } from '@/object-record/record-filter-group/utils/removeEmptyRecordFilterGroups';
import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { unresolvedRecordFiltersComponentState } from '@/object-record/record-filter/states/unresolvedRecordFiltersComponentState';
import { hydrateRecordFiltersFromFieldMetadata } from '@/object-record/record-filter/utils/hydrateRecordFiltersFromFieldMetadata';
+import { pointRecordFiltersAtMorphRelationFields } from '@/object-record/record-filter/utils/pointRecordFiltersAtMorphRelationFields';
import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
-import { hasInitializedCurrentRecordFilterGroupsComponentFamilyState } from '@/views/states/hasInitializedCurrentRecordFilterGroupsComponentFamilyState';
import { hasInitializedCurrentRecordFiltersComponentFamilyState } from '@/views/states/hasInitializedCurrentRecordFiltersComponentFamilyState';
import { type FindRecordsActionFilter } from '@/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter';
import { useEffect, useState } from 'react';
@@ -25,14 +28,6 @@ export const WorkflowFindRecordsFiltersEffect = ({
{},
);
- const [
- hasInitializedCurrentRecordFilterGroups,
- setHasInitializedCurrentRecordFilterGroups,
- ] = useAtomComponentFamilyState(
- hasInitializedCurrentRecordFilterGroupsComponentFamilyState,
- {},
- );
-
const setCurrentRecordFilters = useSetAtomComponentState(
currentRecordFiltersComponentState,
);
@@ -41,6 +36,10 @@ export const WorkflowFindRecordsFiltersEffect = ({
currentRecordFilterGroupsComponentState,
);
+ const setUnresolvedRecordFilters = useSetAtomComponentState(
+ unresolvedRecordFiltersComponentState,
+ );
+
const flattenedFieldMetadataItems = useAtomStateValue(
flattenedFieldMetadataItemsSelector,
);
@@ -54,41 +53,40 @@ export const WorkflowFindRecordsFiltersEffect = ({
] = useState(false);
useEffect(() => {
- if (
- !hasInitializedCurrentRecordFilters &&
- isDefined(defaultValue?.recordFilters)
- ) {
- setCurrentRecordFilters(
- hydrateRecordFiltersFromFieldMetadata({
- recordFilters: defaultValue.recordFilters,
+ if (hasInitializedCurrentRecordFilters || !isDefined(defaultValue)) {
+ return;
+ }
+
+ const { recordFilters: persistedRecordFilters, recordFilterGroups } =
+ attachUngroupedRecordFiltersToRootRecordFilterGroup({
+ recordFilters: pointRecordFiltersAtMorphRelationFields({
+ recordFilters: defaultValue.recordFilters ?? [],
fieldMetadataItems: flattenedFieldMetadataItems,
}),
- );
- setShouldSetAdvancedFilterDropdownStates(true);
- setHasInitializedCurrentRecordFilters(true);
- }
- }, [
- setCurrentRecordFilters,
- hasInitializedCurrentRecordFilters,
- setHasInitializedCurrentRecordFilters,
- defaultValue?.recordFilters,
- flattenedFieldMetadataItems,
- ]);
+ recordFilterGroups: defaultValue.recordFilterGroups ?? [],
+ });
- useEffect(() => {
- if (
- !hasInitializedCurrentRecordFilterGroups &&
- isDefined(defaultValue?.recordFilterGroups) &&
- defaultValue.recordFilterGroups.length > 0
- ) {
- setCurrentRecordFilterGroups(defaultValue.recordFilterGroups ?? []);
- setHasInitializedCurrentRecordFilterGroups(true);
- }
+ const { recordFilters, unresolvedRecordFilters } =
+ hydrateRecordFiltersFromFieldMetadata({
+ persistedRecordFilters,
+ fieldMetadataItems: flattenedFieldMetadataItems,
+ });
+
+ setCurrentRecordFilters(recordFilters);
+ setUnresolvedRecordFilters(unresolvedRecordFilters);
+ setCurrentRecordFilterGroups(
+ removeEmptyRecordFilterGroups({ recordFilters, recordFilterGroups }),
+ );
+ setShouldSetAdvancedFilterDropdownStates(true);
+ setHasInitializedCurrentRecordFilters(true);
}, [
+ defaultValue,
+ flattenedFieldMetadataItems,
+ hasInitializedCurrentRecordFilters,
setCurrentRecordFilterGroups,
- hasInitializedCurrentRecordFilterGroups,
- setHasInitializedCurrentRecordFilterGroups,
- defaultValue?.recordFilterGroups,
+ setCurrentRecordFilters,
+ setHasInitializedCurrentRecordFilters,
+ setUnresolvedRecordFilters,
]);
useEffect(() => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter.ts
index d6c907c6b9b..aaa9060f8a7 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter.ts
@@ -1,7 +1,7 @@
import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';
-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { type PersistedRecordFilter } from '@/object-record/record-filter/types/PersistedRecordFilter';
export type FindRecordsActionFilter = {
recordFilterGroups?: RecordFilterGroup[];
- recordFilters?: RecordFilter[];
+ recordFilters?: PersistedRecordFilter[];
};
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-upgrade-version-command.module.ts
index a3b7a07a80f..07f8db2b795 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-upgrade-version-command.module.ts
@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
import { AddCalendarEventSharingIndexesCommand } from 'src/database/commands/upgrade-version-command/2-49/2-49-workspace-command-1792153151454-add-calendar-event-sharing-indexes.command';
+import { StripDerivedRecordFilterPropertiesCommand } from 'src/database/commands/upgrade-version-command/2-49/2-49-workspace-command-1792153804491-strip-derived-record-filter-properties.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@@ -13,6 +14,9 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
WorkspaceIteratorModule,
WorkspaceMigrationModule,
],
- providers: [AddCalendarEventSharingIndexesCommand],
+ providers: [
+ AddCalendarEventSharingIndexesCommand,
+ StripDerivedRecordFilterPropertiesCommand,
+ ],
})
export class V2_49_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-workspace-command-1792153804491-strip-derived-record-filter-properties.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-workspace-command-1792153804491-strip-derived-record-filter-properties.command.ts
new file mode 100644
index 00000000000..462058f369d
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-workspace-command-1792153804491-strip-derived-record-filter-properties.command.ts
@@ -0,0 +1,308 @@
+import { Command } from 'nest-commander';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+import { type DataSource } from 'typeorm';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import {
+ mapChartWidgetRecordFilters,
+ mapFindRecordsStepRecordFilters,
+ type MapStoredRecordFilter,
+ mapWorkflowRunStateRecordFilters,
+} from 'src/database/commands/upgrade-version-command/2-49/utils/map-stored-record-filters.util';
+import { restoreDerivedRecordFilterProperties } from 'src/database/commands/upgrade-version-command/2-49/utils/restore-derived-record-filter-properties.util';
+import { stripDerivedRecordFilterProperties } from 'src/database/commands/upgrade-version-command/2-49/utils/strip-derived-record-filter-properties.util';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+
+const REWRITE_BATCH_SIZE = 100;
+
+type RewriteRowsArgs = {
+ dataSource: DataSource;
+ isDryRun: boolean;
+ tableName: string;
+ columnName: string;
+ whereClause: string;
+ whereParameters: unknown[];
+ mapValue: (value: unknown) => { value: unknown; hasChanged: boolean };
+ afterRowId?: string;
+};
+
+const NON_STRING_FIND_RECORDS_RECORD_FILTER_VALUE_JSON_PATH =
+ '$.flow.steps[*] ? (@.type == "FIND_RECORDS").settings.input.filter.recordFilters[*] ? (exists(@.value) && @.value.type() != "string" && @.value.type() != "null")';
+
+@RegisteredWorkspaceCommand('2.49.0', 1792153804491)
+@Command({
+ name: 'upgrade:2-49:strip-derived-record-filter-properties',
+ description:
+ 'Store the record filters of workflow Find Records steps and chart widgets as field references only, without the type, label and display value derived from field metadata',
+})
+export class StripDerivedRecordFilterPropertiesCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.up(args);
+ }
+
+ async up(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.rewriteStoredRecordFilters({
+ ...args,
+ mapRecordFilter: stripDerivedRecordFilterProperties,
+ });
+
+ await this.rewriteWorkflowRunsWithNonStringRecordFilterValues(args);
+ }
+
+ async down(args: RunOnWorkspaceArgs): Promise<void> {
+ const { flatFieldMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(args.workspaceId, [
+ 'flatFieldMetadataMaps',
+ ]);
+
+ await this.rewriteStoredRecordFilters({
+ ...args,
+ mapRecordFilter: ({ recordFilter }) =>
+ restoreDerivedRecordFilterProperties({
+ recordFilter,
+ flatFieldMetadataMaps,
+ }),
+ });
+ }
+
+ private async rewriteStoredRecordFilters({
+ workspaceId,
+ options,
+ dataSource,
+ mapRecordFilter,
+ }: RunOnWorkspaceArgs & {
+ mapRecordFilter: MapStoredRecordFilter;
+ }): Promise<void> {
+ if (!isDefined(dataSource)) {
+ this.logger.warn(
+ `No data source for workspace ${workspaceId}, skipping record filter rewrite`,
+ );
+
+ return;
+ }
+
+ const isDryRun = options.dryRun ?? false;
+
+ const { flatObjectMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ ]);
+
+ const hasWorkspaceWorkflowVersionObject = isDefined(
+ findFlatEntityByUniversalIdentifier<FlatObjectMetadata>({
+ flatEntityMaps: flatObjectMetadataMaps,
+ universalIdentifier:
+ STANDARD_OBJECTS.workflowVersion.universalIdentifier,
+ }),
+ );
+
+ const workspaceWorkflowVersionCount = hasWorkspaceWorkflowVersionObject
+ ? await this.rewriteRows({
+ dataSource,
+ isDryRun,
+ tableName: `"${getWorkspaceSchemaName(workspaceId)}"."workflowVersion"`,
+ columnName: 'steps',
+ whereClause: `steps @> '[{"type":"FIND_RECORDS"}]'`,
+ whereParameters: [],
+ mapValue: (steps) =>
+ mapFindRecordsStepRecordFilters({ steps, mapRecordFilter }),
+ })
+ : 0;
+
+ const coreWorkflowVersionCount = await this.rewriteRows({
+ dataSource,
+ isDryRun,
+ tableName: 'core."workflowVersion"',
+ columnName: 'steps',
+ whereClause: `"workspaceId" = $1 AND steps @> '[{"type":"FIND_RECORDS"}]'`,
+ whereParameters: [workspaceId],
+ mapValue: (steps) =>
+ mapFindRecordsStepRecordFilters({ steps, mapRecordFilter }),
+ });
+
+ const chartWidgetCount = await this.rewriteRows({
+ dataSource,
+ isDryRun,
+ tableName: 'core."pageLayoutWidget"',
+ columnName: 'configuration',
+ whereClause: `"workspaceId" = $1 AND configuration -> 'filter' IS NOT NULL`,
+ whereParameters: [workspaceId],
+ mapValue: (configuration) =>
+ mapChartWidgetRecordFilters({ configuration, mapRecordFilter }),
+ });
+
+ if (!isDryRun && coreWorkflowVersionCount + chartWidgetCount > 0) {
+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
+ 'flatWorkflowVersionMaps',
+ 'flatPageLayoutWidgetMaps',
+ ]);
+ }
+
+ if (
+ workspaceWorkflowVersionCount +
+ coreWorkflowVersionCount +
+ chartWidgetCount >
+ 0
+ ) {
+ this.logger.log(
+ `${isDryRun ? '[DRY RUN] ' : ''}Rewrote record filters in workspace ${workspaceId}: ${workspaceWorkflowVersionCount} workflow version(s), ${coreWorkflowVersionCount} core workflow version(s), ${chartWidgetCount} chart widget(s)`,
+ );
+ }
+ }
+
+ private async rewriteWorkflowRunsWithNonStringRecordFilterValues({
+ workspaceId,
+ options,
+ dataSource,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ if (!isDefined(dataSource)) {
+ return;
+ }
+
+ const { flatObjectMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ ]);
+
+ const hasWorkflowRunObject = isDefined(
+ findFlatEntityByUniversalIdentifier<FlatObjectMetadata>({
+ flatEntityMaps: flatObjectMetadataMaps,
+ universalIdentifier: STANDARD_OBJECTS.workflowRun.universalIdentifier,
+ }),
+ );
+
+ if (!hasWorkflowRunObject) {
+ return;
+ }
+
+ const isDryRun = options.dryRun ?? false;
+
+ const workflowRunCount = await this.rewriteRows({
+ dataSource,
+ isDryRun,
+ tableName: `"${getWorkspaceSchemaName(workspaceId)}"."workflowRun"`,
+ columnName: 'state',
+ whereClause: 'jsonb_path_exists(state, $1::jsonpath)',
+ whereParameters: [NON_STRING_FIND_RECORDS_RECORD_FILTER_VALUE_JSON_PATH],
+ mapValue: (state) =>
+ mapWorkflowRunStateRecordFilters({
+ state,
+ mapRecordFilter: stripDerivedRecordFilterProperties,
+ }),
+ });
+
+ if (workflowRunCount > 0) {
+ this.logger.log(
+ `${isDryRun ? '[DRY RUN] ' : ''}Rewrote ${workflowRunCount} workflow run(s) whose record filters held a non-string value in workspace ${workspaceId}`,
+ );
+ }
+ }
+
+ private async rewriteRows(
+ rewriteRowsArgs: RewriteRowsArgs,
+ ): Promise<number> {
+ const {
+ dataSource,
+ isDryRun,
+ tableName,
+ columnName,
+ whereClause,
+ whereParameters,
+ mapValue,
+ afterRowId,
+ } = rewriteRowsArgs;
+
+ const candidateRows: { id: string; value: unknown }[] =
+ await dataSource.query(
+ `SELECT id, ${columnName} AS value FROM ${tableName} WHERE (${whereClause})${isDefined(afterRowId) ? ` AND id > $${whereParameters.length + 1}` : ''} ORDER BY id LIMIT ${REWRITE_BATCH_SIZE}`,
+ isDefined(afterRowId)
+ ? [...whereParameters, afterRowId]
+ : whereParameters,
+ );
+
+ const rewrittenRowIds: string[] = [];
+
+ for (const candidateRow of candidateRows) {
+ if (!mapValue(candidateRow.value).hasChanged) {
+ continue;
+ }
+
+ const hasRewritten =
+ isDryRun ||
+ (await this.rewriteRowUnderLock({
+ dataSource,
+ tableName,
+ columnName,
+ rowId: candidateRow.id,
+ mapValue,
+ }));
+
+ if (hasRewritten) {
+ rewrittenRowIds.push(candidateRow.id);
+ }
+ }
+
+ if (candidateRows.length < REWRITE_BATCH_SIZE) {
+ return rewrittenRowIds.length;
+ }
+
+ const nextPageRewrittenCount = await this.rewriteRows({
+ ...rewriteRowsArgs,
+ afterRowId: candidateRows[candidateRows.length - 1].id,
+ });
+
+ return rewrittenRowIds.length + nextPageRewrittenCount;
+ }
+
+ private async rewriteRowUnderLock({
+ dataSource,
+ tableName,
+ columnName,
+ rowId,
+ mapValue,
+ }: {
+ dataSource: DataSource;
+ tableName: string;
+ columnName: string;
+ rowId: string;
+ mapValue: (value: unknown) => { value: unknown; hasChanged: boolean };
+ }): Promise<boolean> {
+ return dataSource.transaction(async (manager) => {
+ const [lockedRow]: { value: unknown }[] = await manager.query(
+ `SELECT ${columnName} AS value FROM ${tableName} WHERE id = $1 FOR UPDATE`,
+ [rowId],
+ );
+
+ if (!isDefined(lockedRow)) {
+ return false;
+ }
+
+ const { value, hasChanged } = mapValue(lockedRow.value);
+
+ if (!hasChanged) {
+ return false;
+ }
+
+ await manager.query(
+ `UPDATE ${tableName} SET ${columnName} = $1::jsonb WHERE id = $2`,
+ [JSON.stringify(value), rowId],
+ );
+
+ return true;
+ });
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/map-stored-record-filters.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/map-stored-record-filters.util.spec.ts
new file mode 100644
index 00000000000..14130e2d703
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/map-stored-record-filters.util.spec.ts
@@ -0,0 +1,113 @@
+import {
+ mapChartWidgetRecordFilters,
+ mapFindRecordsStepRecordFilters,
+ mapWorkflowRunStateRecordFilters,
+} from 'src/database/commands/upgrade-version-command/2-49/utils/map-stored-record-filters.util';
+
+const labelledRecordFilter = {
+ id: 'filter-id',
+ label: 'Name',
+ fieldMetadataId: 'field-id',
+ operand: 'CONTAINS',
+ value: 'a',
+};
+
+const { label: _label, ...unlabelledRecordFilter } = labelledRecordFilter;
+
+const dropLabel = ({
+ recordFilter,
+}: {
+ recordFilter: Record<string, unknown>;
+}) => {
+ const { label: _recordFilterLabel, ...rest } = recordFilter;
+
+ return rest;
+};
+
+const buildSteps = (recordFilters: object[]) => [
+ {
+ id: 'find-step-id',
+ type: 'FIND_RECORDS',
+ settings: { input: { objectName: 'company', filter: { recordFilters } } },
+ },
+ {
+ id: 'code-step-id',
+ type: 'CODE',
+ settings: { input: { filter: { recordFilters } } },
+ },
+];
+
+describe('mapFindRecordsStepRecordFilters', () => {
+ it('should map the filters of Find Records steps only', () => {
+ expect(
+ mapFindRecordsStepRecordFilters({
+ steps: buildSteps([labelledRecordFilter]),
+ mapRecordFilter: dropLabel,
+ }),
+ ).toEqual({
+ value: [
+ buildSteps([unlabelledRecordFilter])[0],
+ buildSteps([labelledRecordFilter])[1],
+ ],
+ hasChanged: true,
+ });
+ });
+
+ it('should return the steps untouched when no filter changes', () => {
+ const steps = buildSteps([unlabelledRecordFilter]);
+
+ const result = mapFindRecordsStepRecordFilters({
+ steps,
+ mapRecordFilter: dropLabel,
+ });
+
+ expect(result.hasChanged).toBe(false);
+ expect(result.value).toBe(steps);
+ });
+});
+
+describe('mapWorkflowRunStateRecordFilters', () => {
+ it('should map the filters of the run flow and keep the rest of the state', () => {
+ expect(
+ mapWorkflowRunStateRecordFilters({
+ state: {
+ stepInfos: { 'find-step-id': { status: 'SUCCESS' } },
+ flow: { trigger: {}, steps: buildSteps([labelledRecordFilter]) },
+ },
+ mapRecordFilter: dropLabel,
+ }),
+ ).toEqual({
+ value: {
+ stepInfos: { 'find-step-id': { status: 'SUCCESS' } },
+ flow: {
+ trigger: {},
+ steps: [
+ buildSteps([unlabelledRecordFilter])[0],
+ buildSteps([labelledRecordFilter])[1],
+ ],
+ },
+ },
+ hasChanged: true,
+ });
+ });
+});
+
+describe('mapChartWidgetRecordFilters', () => {
+ it('should map the filters of a chart configuration', () => {
+ expect(
+ mapChartWidgetRecordFilters({
+ configuration: {
+ configurationType: 'AGGREGATE_CHART',
+ filter: { recordFilters: [labelledRecordFilter] },
+ },
+ mapRecordFilter: dropLabel,
+ }),
+ ).toEqual({
+ value: {
+ configurationType: 'AGGREGATE_CHART',
+ filter: { recordFilters: [unlabelledRecordFilter] },
+ },
+ hasChanged: true,
+ });
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/restore-derived-record-filter-properties.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/restore-derived-record-filter-properties.util.spec.ts
new file mode 100644
index 00000000000..0a849176262
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/restore-derived-record-filter-properties.util.spec.ts
@@ -0,0 +1,60 @@
+import { FieldMetadataType } from 'twenty-shared/types';
+
+import { restoreDerivedRecordFilterProperties } from 'src/database/commands/upgrade-version-command/2-49/utils/restore-derived-record-filter-properties.util';
+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
+import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
+
+const nameFlatFieldMetadata = getFlatFieldMetadataMock({
+ universalIdentifier: 'company-name-field-universal-identifier',
+ objectMetadataId: 'company-object-id',
+ type: FieldMetadataType.TEXT,
+ id: 'company-name-field-id',
+ name: 'name',
+ label: 'Name',
+});
+
+const flatFieldMetadataMaps = addFlatEntityToFlatEntityMapsOrThrow({
+ flatEntity: nameFlatFieldMetadata,
+ flatEntityMaps: createEmptyFlatEntityMaps(),
+});
+
+describe('restoreDerivedRecordFilterProperties', () => {
+ it('should restore the type, label and display value from field metadata', () => {
+ expect(
+ restoreDerivedRecordFilterProperties({
+ recordFilter: {
+ id: 'filter-id',
+ fieldMetadataId: nameFlatFieldMetadata.id,
+ operand: 'CONTAINS',
+ value: '{{trigger.name}}',
+ },
+ flatFieldMetadataMaps,
+ }),
+ ).toEqual({
+ id: 'filter-id',
+ fieldMetadataId: nameFlatFieldMetadata.id,
+ operand: 'CONTAINS',
+ value: '{{trigger.name}}',
+ type: 'TEXT',
+ label: 'Name',
+ displayValue: '{{trigger.name}}',
+ });
+ });
+
+ it('should leave a filter whose field no longer exists unchanged', () => {
+ const recordFilter = {
+ id: 'filter-id',
+ fieldMetadataId: 'deleted-field-id',
+ operand: 'CONTAINS',
+ value: 'a',
+ };
+
+ expect(
+ restoreDerivedRecordFilterProperties({
+ recordFilter,
+ flatFieldMetadataMaps,
+ }),
+ ).toBe(recordFilter);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/strip-derived-record-filter-properties.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/strip-derived-record-filter-properties.util.spec.ts
new file mode 100644
index 00000000000..18e489424c8
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/__tests__/strip-derived-record-filter-properties.util.spec.ts
@@ -0,0 +1,50 @@
+import { stripDerivedRecordFilterProperties } from 'src/database/commands/upgrade-version-command/2-49/utils/strip-derived-record-filter-properties.util';
+
+describe('stripDerivedRecordFilterProperties', () => {
+ it('should keep only the properties that reference the field', () => {
+ expect(
+ stripDerivedRecordFilterProperties({
+ recordFilter: {
+ id: 'filter-id',
+ type: 'TEXT',
+ label: 'Name',
+ value: '{{trigger.name}}',
+ displayValue: '{{trigger.name}}',
+ operand: 'CONTAINS',
+ fieldMetadataId: 'field-id',
+ recordFilterGroupId: 'group-id',
+ },
+ }),
+ ).toEqual({
+ id: 'filter-id',
+ value: '{{trigger.name}}',
+ operand: 'CONTAINS',
+ fieldMetadataId: 'field-id',
+ recordFilterGroupId: 'group-id',
+ });
+ });
+
+ it('should encode a value that is not a string', () => {
+ expect(
+ stripDerivedRecordFilterProperties({
+ recordFilter: {
+ fieldMetadataId: 'field-id',
+ operand: 'IS',
+ value: ['ACME'],
+ },
+ }),
+ ).toEqual({
+ fieldMetadataId: 'field-id',
+ operand: 'IS',
+ value: '["ACME"]',
+ });
+ });
+
+ it('should leave a missing id or value missing', () => {
+ expect(
+ stripDerivedRecordFilterProperties({
+ recordFilter: { fieldMetadataId: 'field-id', operand: 'IS_EMPTY' },
+ }),
+ ).toEqual({ fieldMetadataId: 'field-id', operand: 'IS_EMPTY' });
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/map-stored-record-filters.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/map-stored-record-filters.util.ts
new file mode 100644
index 00000000000..6e427a70353
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/map-stored-record-filters.util.ts
@@ -0,0 +1,122 @@
+import { isPlainObject } from 'twenty-shared/utils';
+
+type StoredRecordFilter = Record<string, unknown>;
+
+export type MapStoredRecordFilter = (args: {
+ recordFilter: StoredRecordFilter;
+}) => StoredRecordFilter;
+
+const mapRecordFiltersOfFilter = ({
+ filter,
+ mapRecordFilter,
+}: {
+ filter: unknown;
+ mapRecordFilter: MapStoredRecordFilter;
+}): unknown => {
+ if (!isPlainObject(filter) || !Array.isArray(filter.recordFilters)) {
+ return filter;
+ }
+
+ return {
+ ...filter,
+ recordFilters: filter.recordFilters.map((recordFilter) =>
+ isPlainObject(recordFilter)
+ ? mapRecordFilter({ recordFilter })
+ : recordFilter,
+ ),
+ };
+};
+
+const toResult = ({
+ original,
+ mapped,
+}: {
+ original: unknown;
+ mapped: unknown;
+}) => {
+ const hasChanged = JSON.stringify(original) !== JSON.stringify(mapped);
+
+ return { value: hasChanged ? mapped : original, hasChanged };
+};
+
+export const mapFindRecordsStepRecordFilters = ({
+ steps,
+ mapRecordFilter,
+}: {
+ steps: unknown;
+ mapRecordFilter: MapStoredRecordFilter;
+}): { value: unknown; hasChanged: boolean } => {
+ if (!Array.isArray(steps)) {
+ return { value: steps, hasChanged: false };
+ }
+
+ const mappedSteps = steps.map((step) => {
+ if (
+ !isPlainObject(step) ||
+ step.type !== 'FIND_RECORDS' ||
+ !isPlainObject(step.settings) ||
+ !isPlainObject(step.settings.input)
+ ) {
+ return step;
+ }
+
+ return {
+ ...step,
+ settings: {
+ ...step.settings,
+ input: {
+ ...step.settings.input,
+ filter: mapRecordFiltersOfFilter({
+ filter: step.settings.input.filter,
+ mapRecordFilter,
+ }),
+ },
+ },
+ };
+ });
+
+ return toResult({ original: steps, mapped: mappedSteps });
+};
+
+export const mapWorkflowRunStateRecordFilters = ({
+ state,
+ mapRecordFilter,
+}: {
+ state: unknown;
+ mapRecordFilter: MapStoredRecordFilter;
+}): { value: unknown; hasChanged: boolean } => {
+ if (!isPlainObject(state) || !isPlainObject(state.flow)) {
+ return { value: state, hasChanged: false };
+ }
+
+ const { value: steps, hasChanged } = mapFindRecordsStepRecordFilters({
+ steps: state.flow.steps,
+ mapRecordFilter,
+ });
+
+ return hasChanged
+ ? { value: { ...state, flow: { ...state.flow, steps } }, hasChanged }
+ : { value: state, hasChanged };
+};
+
+export const mapChartWidgetRecordFilters = ({
+ configuration,
+ mapRecordFilter,
+}: {
+ configuration: unknown;
+ mapRecordFilter: MapStoredRecordFilter;
+}): { value: unknown; hasChanged: boolean } => {
+ if (!isPlainObject(configuration) || !('filter' in configuration)) {
+ return { value: configuration, hasChanged: false };
+ }
+
+ const mappedConfiguration = {
+ ...configuration,
+ filter: mapRecordFiltersOfFilter({
+ filter: configuration.filter,
+ mapRecordFilter,
+ }),
+ };
+
+ return toResult({ original: configuration, mapped: mappedConfiguration });
+};
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/restore-derived-record-filter-properties.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/restore-derived-record-filter-properties.util.ts
new file mode 100644
index 00000000000..e37e6042c2a
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/restore-derived-record-filter-properties.util.ts
@@ -0,0 +1,68 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';
+
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/search-field-metadata/constants/search-vector-field.constants';
+
+export const restoreDerivedRecordFilterProperties = ({
+ recordFilter,
+ flatFieldMetadataMaps,
+}: {
+ recordFilter: Record<string, unknown>;
+ flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+}): Record<string, unknown> => {
+ const { fieldMetadataId, relationTargetFieldMetadataId, value } =
+ recordFilter;
+
+ const sourceFieldMetadata = isNonEmptyString(fieldMetadataId)
+ ? findFlatEntityByIdInFlatEntityMaps({
+ flatEntityId: fieldMetadataId,
+ flatEntityMaps: flatFieldMetadataMaps,
+ })
+ : undefined;
+
+ if (!isDefined(sourceFieldMetadata)) {
+ return recordFilter;
+ }
+
+ const relationTargetFieldMetadata = isNonEmptyString(
+ relationTargetFieldMetadataId,
+ )
+ ? findFlatEntityByIdInFlatEntityMaps({
+ flatEntityId: relationTargetFieldMetadataId,
+ flatEntityMaps: flatFieldMetadataMaps,
+ })
+ : undefined;
+
+ return {
+ ...recordFilter,
+ type: getFilterTypeFromFieldType(
+ (relationTargetFieldMetadata ?? sourceFieldMetadata).type,
+ ),
+ label: getRestoredRecordFilterLabel({
+ sourceFieldMetadata,
+ relationTargetFieldMetadata,
+ }),
+ displayValue: value,
+ };
+};
+
+const getRestoredRecordFilterLabel = ({
+ sourceFieldMetadata,
+ relationTargetFieldMetadata,
+}: {
+ sourceFieldMetadata: FlatFieldMetadata;
+ relationTargetFieldMetadata: FlatFieldMetadata | undefined;
+}): string => {
+ if (sourceFieldMetadata.name === SEARCH_VECTOR_FIELD.name) {
+ return 'Search';
+ }
+
+ if (isDefined(relationTargetFieldMetadata)) {
+ return `${sourceFieldMetadata.label} → ${relationTargetFieldMetadata.label}`;
+ }
+
+ return sourceFieldMetadata.label;
+};
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/strip-derived-record-filter-properties.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/strip-derived-record-filter-properties.util.ts
new file mode 100644
index 00000000000..4d810a3615e
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/utils/strip-derived-record-filter-properties.util.ts
@@ -0,0 +1,31 @@
+import { isString } from '@sniptt/guards';
+import { isDefined } from 'twenty-shared/utils';
+
+const PERSISTED_RECORD_FILTER_PROPERTIES = new Set([
+ 'id',
+ 'fieldMetadataId',
+ 'operand',
+ 'value',
+ 'recordFilterGroupId',
+ 'positionInRecordFilterGroup',
+ 'subFieldName',
+ 'relationTargetFieldMetadataId',
+]);
+
+export const stripDerivedRecordFilterProperties = ({
+ recordFilter,
+}: {
+ recordFilter: Record<string, unknown>;
+}): Record<string, unknown> => {
+ const persistedRecordFilter = Object.fromEntries(
+ Object.entries(recordFilter).filter(([property]) =>
+ PERSISTED_RECORD_FILTER_PROPERTIES.has(property),
+ ),
+ );
+
+ const { value } = persistedRecordFilter;
+
+ return isDefined(value) && !isString(value)
+ ? { ...persistedRecordFilter, value: JSON.stringify(value) }
+ : persistedRecordFilter;
+};
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
index b846324d62f..660399a4be0 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
@@ -10,7 +10,6 @@ import {
assertIsDefinedOrThrow,
combineFilters,
convertViewFilterValueToString,
- getFilterTypeFromFieldType,
isDefined,
turnAnyFieldFilterIntoRecordGqlFilter,
} from 'twenty-shared/utils';
@@ -235,7 +234,6 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServic
id: viewFilter.id,
fieldMetadataId: viewFilter.fieldMetadataId,
value: convertViewFilterValueToString(viewFilter.value),
- type: getFilterTypeFromFieldType(fieldMetadata.type),
operand: viewFilter.operand,
recordFilterGroupId: viewFilter.viewFilterGroupId,
positionInRecordFilterGroup: viewFilter.positionInViewFilterGroup,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.ts
index 17caf080790..319d19bf814 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'twenty-shared/types';
+import { FieldMetadataType, ViewFilterOperand } from 'twenty-shared/types';
import {
workflowStepManifestSchema,
type WorkflowStepManifest,
@@ -11,6 +11,7 @@ const STEP_ID = '11111111-1111-4111-8111-111111111111';
const REFERENCE_ID = '22222222-2222-4222-8222-222222222222';
const FIELD_ID = '33333333-3333-4333-8333-333333333333';
const LOCAL_ID = '44444444-4444-4444-8444-444444444444';
+const RECORD_FILTER_ID = '55555555-5555-4555-8555-555555555555';
const references = {
logicFunctionIdByUniversalIdentifier: new Map([[REFERENCE_ID, LOCAL_ID]]),
agentIdByUniversalIdentifier: new Map([[REFERENCE_ID, LOCAL_ID]]),
@@ -65,8 +66,9 @@ const inputs = {
filter: {
recordFilters: [
{
+ id: RECORD_FILTER_ID,
fieldMetadataUniversalIdentifier: FIELD_ID,
- operand: 'Is',
+ operand: ViewFilterOperand.IS,
value: 'x',
},
],
@@ -209,7 +211,12 @@ describe('application workflow actions', () => {
objectName: 'company',
filter: {
recordFilters: [
- { fieldMetadataId: LOCAL_ID, operand: 'Is', value: 'x' },
+ {
+ id: RECORD_FILTER_ID,
+ fieldMetadataId: LOCAL_ID,
+ operand: ViewFilterOperand.IS,
+ value: 'x',
+ },
],
},
orderBy: {
@@ -227,6 +234,50 @@ describe('application workflow actions', () => {
]);
});
+ it('accepts record filters declared without an id or a value', () => {
+ const step = workflowStepManifestSchema.parse({
+ universalIdentifier: STEP_ID,
+ name: 'Find records',
+ type: WorkflowActionType.FIND_RECORDS,
+ input: {
+ objectUniversalIdentifier: REFERENCE_ID,
+ filter: {
+ recordFilters: [
+ {
+ fieldMetadataUniversalIdentifier: FIELD_ID,
+ operand: ViewFilterOperand.IS,
+ value: 'x',
+ },
+ {
+ fieldMetadataUniversalIdentifier: FIELD_ID,
+ operand: ViewFilterOperand.IS_EMPTY,
+ },
+ ],
+ },
+ },
+ nextStepIds: [],
+ });
+
+ expect(
+ fromWorkflowStepManifestToActionOrThrow({ step, index: 0, references })
+ .settings.input,
+ ).toMatchObject({
+ filter: {
+ recordFilters: [
+ {
+ fieldMetadataId: LOCAL_ID,
+ operand: ViewFilterOperand.IS,
+ value: 'x',
+ },
+ {
+ fieldMetadataId: LOCAL_ID,
+ operand: ViewFilterOperand.IS_EMPTY,
+ },
+ ],
+ },
+ });
+ });
+
it('rejects unavailable metadata and fields from another object', () => {
expect(() =>
fromWorkflowStepManifestToActionOrThrow({
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-id-by-name-maps.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-id-by-name-maps.util.ts
index ece07e724cd..2ea1e9685b4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-id-by-name-maps.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-id-by-name-maps.util.ts
@@ -1,4 +1,3 @@
-import { type FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
@@ -9,10 +8,8 @@ export const buildFieldIdByNameMaps = (
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
): {
fieldIdByObjectIdAndName: Map<string, string>;
- fieldById: Map<string, { type: FieldMetadataType }>;
} => {
const fieldIdByObjectIdAndName = new Map<string, string>();
- const fieldById = new Map<string, { type: FieldMetadataType }>();
for (const fieldMetadata of Object.values(
flatFieldMetadataMaps.byUniversalIdentifier,
@@ -28,11 +25,7 @@ export const buildFieldIdByNameMaps = (
),
fieldMetadata.id,
);
-
- fieldById.set(fieldMetadata.id, {
- type: fieldMetadata.type,
- });
}
- return { fieldIdByObjectIdAndName, fieldById };
+ return { fieldIdByObjectIdAndName };
};
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
index 5ef5c2854a1..315e4e6a57b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
@@ -108,7 +108,6 @@ export class ViewQueryParamsService {
id: viewFilter.id,
fieldMetadataId: viewFilter.fieldMetadataId,
value: convertViewFilterValueToString(viewFilter.value ?? ''),
- type: field.type,
recordFilterGroupId: viewFilter.viewFilterGroupId,
operand: viewFilter.operand,
subFieldName: viewFilter.subFieldName,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
index 26eecfef772..ebfd10aacc9 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
@@ -9,7 +9,6 @@ import {
} from 'twenty-shared/types';
import {
convertViewFilterValueToString,
- getFilterTypeFromFieldType,
isDefined,
type RecordFilter,
type RecordFilterGroup,
@@ -161,7 +160,6 @@ const buildRecordFilterForRole = ({
id: predicate.id,
fieldMetadataId: predicate.fieldMetadataId,
value: convertViewFilterValueToString(predicateValue),
- type: getFilterTypeFromFieldType(fieldMetadata.type),
operand: predicate.operand as unknown as RecordFilter['operand'],
recordFilterGroupId: predicate.rowLevelPermissionPredicateGroupId,
subFieldName: effectiveSubFieldName,
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
index 4a5e7873154..f53b4f4a8c6 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
@@ -525,11 +525,8 @@ export const prefillWorkflows = async (
recordFilters: [
{
id: 'a9b917a0-5c4c-4e8f-bf91-160d0b888693',
- type: 'LINKS',
- label: 'Domain Name',
value: '{{1b01193b-8300-4d79-940b-44464bf45505.domain}}',
operand: 'CONTAINS',
- displayValue: '{{1b01193b-8300-4d79-940b-44464bf45505.domain}}',
subFieldName: 'primaryLinkUrl',
fieldMetadataId: companyDomainNameFieldMetadata.id,
recordFilterGroupId: '194e151c-cf46-4e8f-a48b-649c36082dfa',
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/compute-my-first-dashboard-widgets.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/compute-my-first-dashboard-widgets.util.ts
index ab8fcd6d24e..158a9a14645 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/compute-my-first-dashboard-widgets.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/compute-my-first-dashboard-widgets.util.ts
@@ -25,10 +25,7 @@ type DashboardWidgetBuilderArgs = Omit<
const createFilterConfigs = (
filters: Array<{
- type: string;
- label: string;
value: string;
- displayValue: string;
operand: string;
fieldMetadataId: string;
fieldMetadataUniversalIdentifier: string;
@@ -43,13 +40,13 @@ const createFilterConfigs = (
},
];
+ const filtersWithIds = filters.map((filter) => ({ ...filter, id: v4() }));
+
return {
configuration: {
- recordFilters: filters.map((filter) => ({
- type: filter.type,
- label: filter.label,
+ recordFilters: filtersWithIds.map((filter) => ({
+ id: filter.id,
value: filter.value,
- displayValue: filter.displayValue,
operand: filter.operand,
fieldMetadataId: filter.fieldMetadataId,
recordFilterGroupId: groupId,
@@ -57,11 +54,9 @@ const createFilterConfigs = (
recordFilterGroups,
},
universal: {
- recordFilters: filters.map((filter) => ({
- type: filter.type,
- label: filter.label,
+ recordFilters: filtersWithIds.map((filter) => ({
+ id: filter.id,
value: filter.value,
- displayValue: filter.displayValue,
operand: filter.operand,
fieldMetadataUniversalIdentifier:
filter.fieldMetadataUniversalIdentifier,
@@ -577,10 +572,7 @@ const createDealsCreatedThisMonth = ({
const filterConfigs = createFilterConfigs([
{
- type: 'DATE_TIME',
- label: 'Creation date',
value: 'THIS_1_MONTH;;UTC;;SUNDAY;;',
- displayValue: 'THIS_1_MONTH;;UTC;;SUNDAY;;',
operand: 'IS_RELATIVE',
fieldMetadataId: opportunityFields.createdAt.id,
fieldMetadataUniversalIdentifier:
@@ -645,10 +637,7 @@ const createDealValueCreatedThisMonth = ({
const filterConfigs = createFilterConfigs([
{
- type: 'DATE_TIME',
- label: 'Creation date',
value: 'THIS_1_MONTH;;UTC;;SUNDAY;;',
- displayValue: 'THIS_1_MONTH;;UTC;;SUNDAY;;',
operand: 'IS_RELATIVE',
fieldMetadataId: opportunityFields.createdAt.id,
fieldMetadataUniversalIdentifier:
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts b/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts
index 963259e2e52..211b87547a5 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts
@@ -177,7 +177,6 @@ describe('convertChartFilterToGqlOperationFilter', () => {
isCurrentWorkspaceMemberSelected: true,
selectedRecordIds: [],
}),
- type: FieldMetadataType.RELATION,
},
],
};
@@ -207,7 +206,6 @@ describe('convertChartFilterToGqlOperationFilter', () => {
isCurrentWorkspaceMemberSelected: true,
selectedRecordIds: [],
}),
- type: FieldMetadataType.RELATION,
},
],
};
@@ -229,7 +227,6 @@ describe('convertChartFilterToGqlOperationFilter', () => {
fieldMetadataId: ownerHeadFieldMetadata.id,
operand: ViewFilterOperand.IS_NOT_EMPTY,
value: '',
- type: FieldMetadataType.MORPH_RELATION,
},
],
};
@@ -258,7 +255,6 @@ describe('convertChartFilterToGqlOperationFilter', () => {
fieldMetadataId: ownerCompanyFieldMetadata.id,
operand: ViewFilterOperand.IS_EMPTY,
value: '',
- type: FieldMetadataType.MORPH_RELATION,
},
],
};
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts b/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts
index d2b7713e385..ce2b234b989 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts
@@ -1,7 +1,6 @@
import {
type ChartFilter,
type CompositeFieldSubFieldName,
- type FilterableAndTSVectorFieldType,
type RecordFilterGroupLogicalOperator,
type ViewFilterOperand,
} from 'twenty-shared/types';
@@ -14,7 +13,6 @@ import {
import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { computeRecordGqlOperationFilterFromFlatMaps } from 'src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util';
@@ -46,27 +44,17 @@ export const convertChartFilterToGqlOperationFilter = ({
}
const convertedRecordFilters: Omit<RecordFilter, 'id'>[] = recordFilters.map(
- (recordFilter) => {
- const field = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: recordFilter.fieldMetadataId,
- flatEntityMaps: flatFieldMetadataMaps,
- });
-
- return {
- fieldMetadataId: recordFilter.fieldMetadataId,
- value: recordFilter.value ?? '',
- type: (field?.type ??
- recordFilter.type ??
- '') as FilterableAndTSVectorFieldType,
- recordFilterGroupId: recordFilter.recordFilterGroupId ?? undefined,
- operand: recordFilter.operand as ViewFilterOperand,
- subFieldName: (recordFilter.subFieldName ?? undefined) as
- | CompositeFieldSubFieldName
- | undefined,
- relationTargetFieldMetadataId:
- recordFilter.relationTargetFieldMetadataId ?? null,
- };
- },
+ (recordFilter) => ({
+ fieldMetadataId: recordFilter.fieldMetadataId,
+ value: recordFilter.value ?? '',
+ recordFilterGroupId: recordFilter.recordFilterGroupId ?? undefined,
+ operand: recordFilter.operand as ViewFilterOperand,
+ subFieldName: (recordFilter.subFieldName ?? undefined) as
+ | CompositeFieldSubFieldName
+ | undefined,
+ relationTargetFieldMetadataId:
+ recordFilter.relationTargetFieldMetadataId ?? null,
+ }),
);
const convertedRecordFilterGroups: RecordFilterGroup[] =
diff --git a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-identifier-maps.type.ts b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-identifier-maps.type.ts
index 89840da2781..a88eb918c03 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-identifier-maps.type.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-identifier-maps.type.ts
@@ -1,7 +1,4 @@
-import { FieldMetadataType } from 'twenty-shared/types';
-
export type DashboardIdentifierMaps = {
objectIdByName: Record<string, string>;
fieldIdByObjectIdAndName: Map<string, string>;
- fieldById: Map<string, { type: FieldMetadataType }>;
};
diff --git a/packages/twenty-server/src/modules/dashboard/tools/utils/__tests__/resolve-widget-field-names-to-metadata-ids.util.spec.ts b/packages/twenty-server/src/modules/dashboard/tools/utils/__tests__/resolve-widget-field-names-to-metadata-ids.util.spec.ts
index aa7477695ca..843ddeb19a3 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/utils/__tests__/resolve-widget-field-names-to-metadata-ids.util.spec.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/utils/__tests__/resolve-widget-field-names-to-metadata-ids.util.spec.ts
@@ -1,6 +1,5 @@
import {
AggregateOperations,
- FieldMetadataType,
PageLayoutTabLayoutMode,
ViewFilterOperand,
WidgetType,
@@ -16,7 +15,6 @@ const OBJECT_ID = '11111111-1111-4111-8111-111111111111';
const AMOUNT_FIELD_ID = '22222222-2222-4222-8222-222222222222';
const STAGE_FIELD_ID = '33333333-3333-4333-8333-333333333333';
const CREATED_AT_FIELD_ID = '44444444-4444-4444-8444-444444444444';
-const OWNER_FIELD_ID = '55555555-5555-4555-8555-555555555555';
const buildMaps = (): DashboardIdentifierMaps => ({
objectIdByName: { opportunity: OBJECT_ID, opportunities: OBJECT_ID },
@@ -27,13 +25,6 @@ const buildMaps = (): DashboardIdentifierMaps => ({
buildFieldByObjectIdAndNameKey(OBJECT_ID, 'createdAt'),
CREATED_AT_FIELD_ID,
],
- [buildFieldByObjectIdAndNameKey(OBJECT_ID, 'owner'), OWNER_FIELD_ID],
- ]),
- fieldById: new Map([
- [AMOUNT_FIELD_ID, { type: FieldMetadataType.CURRENCY }],
- [STAGE_FIELD_ID, { type: FieldMetadataType.SELECT }],
- [CREATED_AT_FIELD_ID, { type: FieldMetadataType.DATE_TIME }],
- [OWNER_FIELD_ID, { type: FieldMetadataType.MORPH_RELATION }],
]),
});
@@ -106,7 +97,7 @@ describe('resolveWidgetFieldNamesToIds - chart filters', () => {
).not.toHaveProperty('fieldName');
});
- it('enriches the filter with a root group, type and displayValue for the UI', () => {
+ it('places the filter in a root group and references its field by id only', () => {
const widget = buildAggregateWidget({
recordFilters: [
{
@@ -127,35 +118,14 @@ describe('resolveWidgetFieldNamesToIds - chart filters', () => {
expect(rootGroup).toMatchObject({ logicalOperator: 'AND' });
expect(rootGroup.parentRecordFilterGroupId).toBeUndefined();
- expect(filter.recordFilters[0]).toMatchObject({
+ expect(filter.recordFilters[0]).toEqual({
+ id: expect.any(String),
fieldMetadataId: STAGE_FIELD_ID,
operand: ViewFilterOperand.IS_NOT,
value: '["NEW"]',
- displayValue: '["NEW"]',
- type: 'SELECT',
recordFilterGroupId: rootGroup.id,
positionInRecordFilterGroup: 0,
});
- expect(filter.recordFilters[0].id).toEqual(expect.any(String));
- });
-
- it('stores the filter type rather than the raw field type', () => {
- const widget = buildAggregateWidget({
- recordFilters: [
- {
- fieldName: 'owner',
- operand: ViewFilterOperand.IS_EMPTY,
- },
- ],
- });
-
- const result = resolveWidgetFieldNamesToIds(widget, buildMaps());
- const filter = getResolvedFilter(result.configuration);
-
- expect(filter.recordFilters[0]).toMatchObject({
- fieldMetadataId: OWNER_FIELD_ID,
- type: 'RELATION',
- });
});
it('preserves an explicit filter fieldMetadataId', () => {
diff --git a/packages/twenty-server/src/modules/dashboard/tools/utils/compute-dashboard-identifier-maps.util.ts b/packages/twenty-server/src/modules/dashboard/tools/utils/compute-dashboard-identifier-maps.util.ts
index baafba21168..00d73c17505 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/utils/compute-dashboard-identifier-maps.util.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/utils/compute-dashboard-identifier-maps.util.ts
@@ -22,13 +22,12 @@ export const computeDashboardIdentifierMaps = async (
flatObjectMetadataMaps,
);
- const { fieldIdByObjectIdAndName, fieldById } = buildFieldIdByNameMaps(
+ const { fieldIdByObjectIdAndName } = buildFieldIdByNameMaps(
flatFieldMetadataMaps,
);
return {
objectIdByName: { ...idByNamePlural, ...idByNameSingular },
fieldIdByObjectIdAndName,
- fieldById,
};
};
diff --git a/packages/twenty-server/src/modules/dashboard/tools/utils/resolve-widget-field-names-to-metadata-ids.util.ts b/packages/twenty-server/src/modules/dashboard/tools/utils/resolve-widget-field-names-to-metadata-ids.util.ts
index 38c74b5d7e9..2323bd24277 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/utils/resolve-widget-field-names-to-metadata-ids.util.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/utils/resolve-widget-field-names-to-metadata-ids.util.ts
@@ -4,7 +4,7 @@ import {
type ChartRecordFilter,
type ChartRecordFilterGroup,
} from 'twenty-shared/types';
-import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';
+import { isDefined } from 'twenty-shared/utils';
import { v4 as uuidv4 } from 'uuid';
import { buildFieldByObjectIdAndNameKey } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-by-object-id-and-name-key.util';
@@ -87,12 +87,6 @@ export const getObjectMetadataId = ({
return objectMetadataIdForName;
};
-type ResolvedChartRecordFilter = ChartRecordFilter & {
- id: string;
- displayValue: string;
- positionInRecordFilterGroup: number;
-};
-
const resolveChartFilterFieldNamesToIds = (
filter: ChartFilterInput | undefined,
objectMetadataId: string | undefined,
@@ -129,7 +123,7 @@ const resolveChartFilterFieldNamesToIds = (
const positionByGroupId = new Map<string, number>();
- const recordFilters: ResolvedChartRecordFilter[] = inputRecordFilters.map(
+ const recordFilters: ChartRecordFilter[] = inputRecordFilters.map(
(recordFilter) => {
const { fieldName, fieldMetadataId, ...rest } = recordFilter;
@@ -159,16 +153,11 @@ const resolveChartFilterFieldNamesToIds = (
positionInRecordFilterGroup + 1,
);
- const field = maps.fieldById.get(resolvedFieldMetadataId);
- const value = rest.value ?? '';
-
return {
id: uuidv4(),
fieldMetadataId: resolvedFieldMetadataId,
operand: rest.operand,
- value,
- displayValue: value,
- type: isDefined(field) ? getFilterTypeFromFieldType(field.type) : '',
+ value: rest.value ?? '',
recordFilterGroupId,
positionInRecordFilterGroup,
...(isDefined(rest.subFieldName)
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
index 33239526fa5..0142139cb41 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
@@ -26,6 +26,7 @@ import { isWorkflowFindRecordsAction } from 'src/modules/workflow/workflow-execu
import { type WorkflowFindRecordsActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/types/workflow-record-crud-action-input.type';
import { resolveLimitInput } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/resolve-limit-input.util';
import { resolveOffsetInput } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/resolve-offset-input.util';
+import { findRecordFilterWithMissingField } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/find-record-filter-with-missing-field.util';
import { resolveRecordFilters } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/resolve-record-filters.util';
@Injectable()
@@ -86,6 +87,18 @@ export class FindRecordsWorkflowAction implements WorkflowAction {
}
}
+ const recordFilterWithMissingField = findRecordFilterWithMissingField({
+ recordFilters: recordFilters ?? [],
+ flatFieldMetadataMaps,
+ });
+
+ if (isDefined(recordFilterWithMissingField)) {
+ throw new WorkflowStepExecutorException(
+ `Filter references a field that no longer exists. Filter field: ${recordFilterWithMissingField.fieldMetadataId}`,
+ WorkflowStepExecutorExceptionCode.INVALID_STEP_INPUT,
+ );
+ }
+
let gqlOperationFilter: RecordGqlOperationFilter;
try {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/__tests__/find-record-filter-with-missing-field.util.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/__tests__/find-record-filter-with-missing-field.util.spec.ts
new file mode 100644
index 00000000000..2ccc64289cd
--- /dev/null
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/__tests__/find-record-filter-with-missing-field.util.spec.ts
@@ -0,0 +1,54 @@
+import { findRecordFilterWithMissingField } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/find-record-filter-with-missing-field.util';
+
+const flatFieldMetadataMaps = {
+ universalIdentifierById: {
+ 'name-field-id': 'name-field-universal-identifier',
+ 'company-field-id': 'company-field-universal-identifier',
+ 'company-name-field-id': 'company-name-field-universal-identifier',
+ },
+};
+
+describe('findRecordFilterWithMissingField', () => {
+ it('should return undefined when every filtered field exists', () => {
+ expect(
+ findRecordFilterWithMissingField({
+ recordFilters: [
+ { fieldMetadataId: 'name-field-id' },
+ {
+ fieldMetadataId: 'company-field-id',
+ relationTargetFieldMetadataId: 'company-name-field-id',
+ },
+ ],
+ flatFieldMetadataMaps,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('should return the filter whose field no longer exists', () => {
+ const deletedFieldRecordFilter = { fieldMetadataId: 'deleted-field-id' };
+
+ expect(
+ findRecordFilterWithMissingField({
+ recordFilters: [
+ { fieldMetadataId: 'name-field-id' },
+ deletedFieldRecordFilter,
+ ],
+ flatFieldMetadataMaps,
+ }),
+ ).toBe(deletedFieldRecordFilter);
+ });
+
+ it('should return the filter whose relation target field no longer exists', () => {
+ const deletedTargetRecordFilter = {
+ fieldMetadataId: 'company-field-id',
+ relationTargetFieldMetadataId: 'deleted-field-id',
+ };
+
+ expect(
+ findRecordFilterWithMissingField({
+ recordFilters: [deletedTargetRecordFilter],
+ flatFieldMetadataMaps,
+ }),
+ ).toBe(deletedTargetRecordFilter);
+ });
+});
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/find-record-filter-with-missing-field.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/find-record-filter-with-missing-field.util.ts
new file mode 100644
index 00000000000..5109c950047
--- /dev/null
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/utils/find-record-filter-with-missing-field.util.ts
@@ -0,0 +1,28 @@
+import { isDefined, type RecordFilter } from 'twenty-shared/utils';
+
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+
+export const findRecordFilterWithMissingField = ({
+ recordFilters,
+ flatFieldMetadataMaps,
+}: {
+ recordFilters: Pick<
+ RecordFilter,
+ 'fieldMetadataId' | 'relationTargetFieldMetadataId'
+ >[];
+ flatFieldMetadataMaps: Pick<
+ FlatEntityMaps<FlatFieldMetadata>,
+ 'universalIdentifierById'
+ >;
+}) => {
+ const isExistingField = (fieldMetadataId: string) =>
+ isDefined(flatFieldMetadataMaps.universalIdentifierById[fieldMetadataId]);
+
+ return recordFilters.find(
+ (recordFilter) =>
+ !isExistingField(recordFilter.fieldMetadataId) ||
+ (isDefined(recordFilter.relationTargetFieldMetadataId) &&
+ !isExistingField(recordFilter.relationTargetFieldMetadataId)),
+ );
+};
diff --git a/packages/twenty-server/test/integration/graphql/suites/chart-data-relation-traversal-filter.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/chart-data-relation-traversal-filter.integration-spec.ts
index 92cf14a4eb9..2d8210c5eb8 100644
--- a/packages/twenty-server/test/integration/graphql/suites/chart-data-relation-traversal-filter.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/chart-data-relation-traversal-filter.integration-spec.ts
@@ -129,7 +129,6 @@ describe('BarChartData with relation-traversal filter (e2e)', () => {
const allRecordFilters = [
{
id: uuidv4(),
- type: 'TEXT',
operand: 'CONTAINS',
value: SHARED_JOB_TITLE,
fieldMetadataId: personJobTitleFieldMetadataId,
@@ -217,7 +216,6 @@ describe('BarChartData with relation-traversal filter (e2e)', () => {
const count = await queryBarChartCount([
{
id: uuidv4(),
- type: 'TEXT',
operand: 'CONTAINS',
value: 'AirbnbChartTest',
fieldMetadataId: personCompanyFieldMetadataId,
diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/find-records-relation-traversal-workflow.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/find-records-relation-traversal-workflow.integration-spec.ts
index 4ca0c27be64..92554454de8 100644
--- a/packages/twenty-server/test/integration/graphql/suites/workflow/find-records-relation-traversal-workflow.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/find-records-relation-traversal-workflow.integration-spec.ts
@@ -167,11 +167,8 @@ describe('FindRecords workflow action with relation-traversal filter (e2e)', ()
recordFilters: [
{
id: filterId,
- type: 'TEXT',
- label: 'Company → Name',
value: '{{trigger.companyName}}',
operand: 'CONTAINS',
- displayValue: '{{trigger.companyName}}',
fieldMetadataId: personCompanyFieldMetadataId,
relationTargetFieldMetadataId: companyNameFieldMetadataId,
recordFilterGroupId: filterGroupId,
diff --git a/packages/twenty-shared/src/application/workflowStepManifestType.ts b/packages/twenty-shared/src/application/workflowStepManifestType.ts
index c40296e5e19..d664a8d6c5e 100644
--- a/packages/twenty-shared/src/application/workflowStepManifestType.ts
+++ b/packages/twenty-shared/src/application/workflowStepManifestType.ts
@@ -19,6 +19,8 @@ import { workflowFindRecordsActionSettingsSchema } from '@/workflow/schemas/find
import { workflowFormActionSettingsSchema } from '@/workflow/schemas/form-action-settings-schema';
import { workflowFilterActionSettingsSchema } from '@/workflow/schemas/filter-action-settings-schema';
import { workflowIfElseActionSettingsSchema } from '@/workflow/schemas/if-else-action-settings-schema';
+import { recordFilterGroupSchema } from '@/workflow/schemas/record-filter-group-schema';
+import { recordFilterSchema } from '@/workflow/schemas/record-filter-schema';
import { stepFilterSchema } from '@/workflow/schemas/step-filter-schema';
import { workflowPickRecordStrategySchema } from '@/workflow/schemas/pick-record-action-settings-schema';
@@ -48,6 +50,11 @@ export const workflowStepFilterManifestSchema = stepFilterSchema
.extend({ fieldMetadataUniversalIdentifier: z.uuid().optional() })
.strict();
+const recordFilterManifestSchema = recordFilterSchema
+ .omit({ fieldMetadataId: true, relationTargetFieldMetadataId: true })
+ .extend({ fieldMetadataUniversalIdentifier: z.uuid() })
+ .strict();
+
const recordObjectShape = { objectUniversalIdentifier: z.uuid() };
const workflowStepManifestOptions = [
@@ -105,10 +112,8 @@ const workflowStepManifestOptions = [
...recordObjectShape,
filter: z
.strictObject({
- recordFilterGroups: z
- .array(z.record(z.string(), z.unknown()))
- .optional(),
- recordFilters: z.array(fieldReferenceSchema).optional(),
+ recordFilterGroups: z.array(recordFilterGroupSchema).optional(),
+ recordFilters: z.array(recordFilterManifestSchema).optional(),
})
.optional(),
orderBy: z
diff --git a/packages/twenty-shared/src/types/page-layout/ChartFilter.ts b/packages/twenty-shared/src/types/page-layout/ChartFilter.ts
index 5469ee333f3..2b269113492 100644
--- a/packages/twenty-shared/src/types/page-layout/ChartFilter.ts
+++ b/packages/twenty-shared/src/types/page-layout/ChartFilter.ts
@@ -2,11 +2,12 @@ import { type FormatRecordSerializedRelationProperties } from '../FormatRecordSe
import { type SerializedRelation } from '../SerializedRelation';
export type ChartRecordFilter = {
+ id?: string;
fieldMetadataId: SerializedRelation;
operand: string;
value?: string | null;
- type?: string;
recordFilterGroupId?: string | null;
+ positionInRecordFilterGroup?: number | null;
subFieldName?: string | null;
relationTargetFieldMetadataId?: SerializedRelation | null;
};
@@ -15,6 +16,7 @@ export type ChartRecordFilterGroup = {
id: string;
logicalOperator: string;
parentRecordFilterGroupId?: string | null;
+ positionInRecordFilterGroup?: number | null;
};
export type ChartFilter = {
diff --git a/packages/twenty-shared/src/utils/filter/__tests__/computeRecordGqlOperationFilter.test.ts b/packages/twenty-shared/src/utils/filter/__tests__/computeRecordGqlOperationFilter.test.ts
index 6fd0d3ced11..dece397de3b 100644
--- a/packages/twenty-shared/src/utils/filter/__tests__/computeRecordGqlOperationFilter.test.ts
+++ b/packages/twenty-shared/src/utils/filter/__tests__/computeRecordGqlOperationFilter.test.ts
@@ -21,7 +21,6 @@ describe('computeRecordGqlOperationFilter', () => {
id: 'uuid-filter',
fieldMetadataId: companyIdField.id,
value: uuidValue,
- type: 'UUID',
operand: ViewFilterOperand.IS,
},
];
diff --git a/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterGroupIntoGqlOperationFilter.test.ts b/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterGroupIntoGqlOperationFilter.test.ts
index 389c7c2b4e4..ade9dc0744b 100644
--- a/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterGroupIntoGqlOperationFilter.test.ts
+++ b/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterGroupIntoGqlOperationFilter.test.ts
@@ -44,7 +44,6 @@ describe('turnRecordFilterGroupsIntoGqlOperationFilter', () => {
{
fieldMetadataId: 'f1',
value: 'test',
- type: 'TEXT',
operand: ViewFilterOperand.CONTAINS,
recordFilterGroupId: 'group1',
},
@@ -69,7 +68,6 @@ describe('turnRecordFilterGroupsIntoGqlOperationFilter', () => {
{
fieldMetadataId: 'f1',
value: 'test',
- type: 'TEXT',
operand: ViewFilterOperand.CONTAINS,
recordFilterGroupId: 'group1',
},
@@ -94,7 +92,6 @@ describe('turnRecordFilterGroupsIntoGqlOperationFilter', () => {
{
fieldMetadataId: 'f1',
value: 'test',
- type: 'TEXT',
operand: ViewFilterOperand.CONTAINS,
recordFilterGroupId: 'subgroup1',
},
diff --git a/packages/twenty-shared/src/utils/filter/turnAnyFieldFilterIntoRecordGqlFilter.ts b/packages/twenty-shared/src/utils/filter/turnAnyFieldFilterIntoRecordGqlFilter.ts
index 6f4e4e8c9f7..55a10825a10 100644
--- a/packages/twenty-shared/src/utils/filter/turnAnyFieldFilterIntoRecordGqlFilter.ts
+++ b/packages/twenty-shared/src/utils/filter/turnAnyFieldFilterIntoRecordGqlFilter.ts
@@ -45,7 +45,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'TEXT',
} satisfies RecordFilter);
break;
}
@@ -56,7 +55,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'ADDRESS',
} satisfies RecordFilter);
break;
}
@@ -67,7 +65,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'LINKS',
} satisfies RecordFilter);
break;
}
@@ -78,7 +75,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'FULL_NAME',
} satisfies RecordFilter);
break;
}
@@ -89,7 +85,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'ACTOR',
} satisfies RecordFilter);
break;
}
@@ -100,7 +95,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'ARRAY',
} satisfies RecordFilter);
break;
}
@@ -111,7 +105,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'EMAILS',
} satisfies RecordFilter);
break;
}
@@ -122,7 +115,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'PHONES',
} satisfies RecordFilter);
break;
}
@@ -134,7 +126,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.IS,
- type: 'NUMBER',
} satisfies RecordFilter);
}
break;
@@ -147,7 +138,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.IS,
- type: 'CURRENCY',
} satisfies RecordFilter);
}
if (isNonEmptyString(filterValue)) {
@@ -168,7 +158,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
fieldMetadataItem: field,
}),
operand: ViewFilterOperand.IS,
- type: 'CURRENCY',
subFieldName: 'currencyCode',
} satisfies RecordFilter);
}
@@ -196,7 +185,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
filterValue: arrayOfSelectValues,
}),
operand: ViewFilterOperand.IS,
- type: 'SELECT',
} satisfies RecordFilter);
}
}
@@ -223,7 +211,6 @@ export const turnAnyFieldFilterIntoRecordGqlFilter = ({
filterValue: arrayOfSelectValues,
}),
operand: ViewFilterOperand.CONTAINS,
- type: 'MULTI_SELECT',
} satisfies RecordFilter);
}
}
diff --git a/packages/twenty-shared/src/utils/filter/turnRecordFilterGroupIntoGqlOperationFilter.ts b/packages/twenty-shared/src/utils/filter/turnRecordFilterGroupIntoGqlOperationFilter.ts
index 91a45a450a2..cfbd7ac2257 100644
--- a/packages/twenty-shared/src/utils/filter/turnRecordFilterGroupIntoGqlOperationFilter.ts
+++ b/packages/twenty-shared/src/utils/filter/turnRecordFilterGroupIntoGqlOperationFilter.ts
@@ -1,6 +1,5 @@
import {
type CompositeFieldSubFieldName,
- type FilterableAndTSVectorFieldType,
RecordFilterGroupLogicalOperator,
type RecordFilterValueDependencies,
type RecordGqlOperationFilter,
@@ -17,8 +16,8 @@ export type RecordFilter = {
id: string;
fieldMetadataId: string;
value: string;
- type: FilterableAndTSVectorFieldType;
recordFilterGroupId?: string | null;
+ positionInRecordFilterGroup?: number | null;
operand: ViewFilterOperand;
subFieldName?: CompositeFieldSubFieldName | null | undefined;
relationTargetFieldMetadataId?: string | null | undefined;
@@ -28,6 +27,7 @@ export type RecordFilterGroup = {
id: string;
parentRecordFilterGroupId?: string | null;
logicalOperator: RecordFilterGroupLogicalOperator;
+ positionInRecordFilterGroup?: number | null;
};
export const turnRecordFilterGroupsIntoGqlOperationFilter = ({
diff --git a/packages/twenty-shared/src/workflow/index.ts b/packages/twenty-shared/src/workflow/index.ts
index ffc113870c4..55b0947d5ce 100644
--- a/packages/twenty-shared/src/workflow/index.ts
+++ b/packages/twenty-shared/src/workflow/index.ts
@@ -86,6 +86,8 @@ export {
workflowPickRecordStrategySchema,
workflowPickRecordActionSettingsSchema,
} from './schemas/pick-record-action-settings-schema';
+export { recordFilterGroupSchema } from './schemas/record-filter-group-schema';
+export { recordFilterSchema } from './schemas/record-filter-schema';
export { workflowSendChatMessageActionSchema } from './schemas/send-chat-message-action-schema';
export { workflowSendChatMessageActionSettingsSchema } from './schemas/send-chat-message-action-settings-schema';
export { workflowSendEmailActionSchema } from './schemas/send-email-action-schema';
diff --git a/packages/twenty-shared/src/workflow/schemas/__tests__/find-records-action-settings-schema.test.ts b/packages/twenty-shared/src/workflow/schemas/__tests__/find-records-action-settings-schema.test.ts
new file mode 100644
index 00000000000..4ba392fe587
--- /dev/null
+++ b/packages/twenty-shared/src/workflow/schemas/__tests__/find-records-action-settings-schema.test.ts
@@ -0,0 +1,97 @@
+import { workflowFindRecordsActionSettingsSchema } from '../find-records-action-settings-schema';
+
+const buildSettings = (filter: unknown) => ({
+ input: {
+ objectName: 'company',
+ filter,
+ },
+ outputSchema: {},
+ errorHandlingOptions: {
+ retryOnFailure: { value: 0 },
+ continueOnFailure: { value: false },
+ },
+});
+
+const recordFilter = {
+ id: 'filter-id',
+ fieldMetadataId: 'field-id',
+ operand: 'CONTAINS',
+ value: '{{trigger.name}}',
+ recordFilterGroupId: 'group-id',
+};
+
+const recordFilterGroup = { id: 'group-id', logicalOperator: 'AND' };
+
+describe('workflowFindRecordsActionSettingsSchema', () => {
+ it('should accept record filters that reference fields by id', () => {
+ const result = workflowFindRecordsActionSettingsSchema.safeParse(
+ buildSettings({
+ recordFilters: [recordFilter],
+ recordFilterGroups: [recordFilterGroup],
+ }),
+ );
+
+ expect(result.success).toBe(true);
+ });
+
+ it('should drop properties derived from field metadata', () => {
+ const result = workflowFindRecordsActionSettingsSchema.safeParse(
+ buildSettings({
+ recordFilters: [
+ {
+ ...recordFilter,
+ type: 'TEXT',
+ label: 'Name',
+ displayValue: '{{trigger.name}}',
+ },
+ ],
+ }),
+ );
+
+ expect(result.success).toBe(true);
+ expect(result.data?.input.filter?.recordFilters?.[0]).toEqual(recordFilter);
+ });
+
+ it('should accept a record filter without an id or a value, like chart filters', () => {
+ const {
+ id: _id,
+ value: _value,
+ ...recordFilterWithoutIdAndValue
+ } = recordFilter;
+
+ const result = workflowFindRecordsActionSettingsSchema.safeParse(
+ buildSettings({ recordFilters: [recordFilterWithoutIdAndValue] }),
+ );
+
+ expect(result.success).toBe(true);
+ });
+
+ it('should reject a record filter whose value is not a string', () => {
+ const result = workflowFindRecordsActionSettingsSchema.safeParse(
+ buildSettings({ recordFilters: [{ ...recordFilter, value: ['a'] }] }),
+ );
+
+ expect(result.success).toBe(false);
+ });
+
+ it('should reject a record filter without a field', () => {
+ const { fieldMetadataId: _fieldMetadataId, ...recordFilterWithoutField } =
+ recordFilter;
+
+ const result = workflowFindRecordsActionSettingsSchema.safeParse(
+ buildSettings({ recordFilters: [recordFilterWithoutField] }),
+ );
+
+ expect(result.success).toBe(false);
+ });
+
+ it('should reject an unknown logical operator', () => {
+ const result = workflowFindRecordsActionSettingsSchema.safeParse(
+ buildSettings({
+ recordFilterGroups: [{ id: 'group-id', logicalOperator: 'XOR' }],
+ }),
+ );
+
+ expect(result.success).toBe(false);
+ });
+});
diff --git a/packages/twenty-shared/src/workflow/schemas/find-records-action-settings-schema.ts b/packages/twenty-shared/src/workflow/schemas/find-records-action-settings-schema.ts
index 7d880d66280..ff3fd5677ae 100644
--- a/packages/twenty-shared/src/workflow/schemas/find-records-action-settings-schema.ts
+++ b/packages/twenty-shared/src/workflow/schemas/find-records-action-settings-schema.ts
@@ -1,5 +1,7 @@
import { z } from 'zod';
import { baseWorkflowActionSettingsSchema } from './base-workflow-action-settings-schema';
+import { recordFilterGroupSchema } from './record-filter-group-schema';
+import { recordFilterSchema } from './record-filter-schema';
import { workflowVariableReferenceSchema } from './workflow-variable-reference-schema';
export const workflowFindRecordsActionSettingsSchema =
@@ -15,8 +17,8 @@ export const workflowFindRecordsActionSettingsSchema =
.optional(),
filter: z
.object({
- recordFilterGroups: z.array(z.any()).optional(),
- recordFilters: z.array(z.any()).optional(),
+ recordFilterGroups: z.array(recordFilterGroupSchema).optional(),
+ recordFilters: z.array(recordFilterSchema).optional(),
})
.optional(),
orderBy: z
diff --git a/packages/twenty-shared/src/workflow/schemas/record-filter-group-schema.ts b/packages/twenty-shared/src/workflow/schemas/record-filter-group-schema.ts
new file mode 100644
index 00000000000..39f2ffbb667
--- /dev/null
+++ b/packages/twenty-shared/src/workflow/schemas/record-filter-group-schema.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { RecordFilterGroupLogicalOperator } from '../../types/RecordFilterGroupLogicalOperator';
+
+export const recordFilterGroupSchema = z.object({
+ id: z.string(),
+ logicalOperator: z.enum(RecordFilterGroupLogicalOperator),
+ parentRecordFilterGroupId: z.string().nullable().optional(),
+ positionInRecordFilterGroup: z.number().nullable().optional(),
+});
diff --git a/packages/twenty-shared/src/workflow/schemas/record-filter-schema.ts b/packages/twenty-shared/src/workflow/schemas/record-filter-schema.ts
new file mode 100644
index 00000000000..a014cc5678c
--- /dev/null
+++ b/packages/twenty-shared/src/workflow/schemas/record-filter-schema.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod';
+import { ViewFilterOperand } from '../../types/ViewFilterOperand';
+
+export const recordFilterSchema = z.object({
+ id: z.string().optional(),
+ fieldMetadataId: z.string(),
+ operand: z.enum(ViewFilterOperand),
+ value: z.string().nullable().optional(),
+ recordFilterGroupId: z.string().nullable().optional(),
+ positionInRecordFilterGroup: z.number().nullable().optional(),
+ subFieldName: z.string().nullable().optional(),
+ relationTargetFieldMetadataId: z.string().nullable().optional(),
+});