Skip to content

The open alternative to Salesforce, designed for AI.

Save nested new filter groups on dashboard widgets in one call (#28353)

nitin83e19366d8e8
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts
index cec633c2a01..306a1771792 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts
@@ -45,6 +45,7 @@ import {
ViewException,
ViewExceptionCode,
} from 'src/engine/metadata-modules/view/exceptions/view.exception';
+import { sortViewFilterGroupInputsParentsFirst } from 'src/engine/metadata-modules/view/utils/sort-view-filter-group-inputs-parents-first.util';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
@@ -282,17 +283,10 @@ export class ViewWidgetUpsertService {
flatViewMaps,
flatViewFilterGroupMaps,
})
- : EMPTY_FILTER_GROUP_OPS;
-
- const optimisticFilterGroupMaps =
- viewFilterGroupOperations.filterGroupsToCreate.reduce(
- (maps, group) =>
- addFlatEntityToFlatEntityMapsOrThrow({
- flatEntity: group,
- flatEntityMaps: maps,
- }),
- flatViewFilterGroupMaps,
- );
+ : {
+ ...EMPTY_FILTER_GROUP_OPS,
+ optimisticFlatViewFilterGroupMaps: flatViewFilterGroupMaps,
+ };
const viewFilterOperations = isDefined(input.viewFilters)
? this.computeViewFilterOperations({
@@ -301,7 +295,8 @@ export class ViewWidgetUpsertService {
...upsertContext,
flatFieldMetadataMaps,
flatViewMaps,
- flatViewFilterGroupMaps: optimisticFilterGroupMaps,
+ flatViewFilterGroupMaps:
+ viewFilterGroupOperations.optimisticFlatViewFilterGroupMaps,
})
: EMPTY_FILTER_OPS;
@@ -632,6 +627,7 @@ export class ViewWidgetUpsertService {
filterGroupsToCreate: FlatViewFilterGroup[];
filterGroupsToUpdate: FlatViewFilterGroup[];
filterGroupsToRemove: FlatViewFilterGroup[];
+ optimisticFlatViewFilterGroupMaps: FlatViewFilterGroupMaps;
} {
const filterGroupsToCreate: FlatViewFilterGroup[] = [];
const filterGroupsToUpdate: FlatViewFilterGroup[] = [];
@@ -639,7 +635,11 @@ export class ViewWidgetUpsertService {
inputFilterGroups.map((g) => g.id).filter(isDefined),
);
- for (const inputGroup of inputFilterGroups) {
+ let optimisticFlatViewFilterGroupMaps = flatViewFilterGroupMaps;
+
+ for (const inputGroup of sortViewFilterGroupInputsParentsFirst(
+ inputFilterGroups,
+ )) {
const existingGroup = isDefined(inputGroup.id)
? existingViewFilterGroups.find((g) => g.id === inputGroup.id)
: undefined;
@@ -656,10 +656,13 @@ export class ViewWidgetUpsertService {
viewId,
parentViewFilterGroupId: inputGroup.parentViewFilterGroupId,
},
- flatEntityMaps: { flatViewMaps, flatViewFilterGroupMaps },
+ flatEntityMaps: {
+ flatViewMaps,
+ flatViewFilterGroupMaps: optimisticFlatViewFilterGroupMaps,
+ },
});
- filterGroupsToCreate.push({
+ const filterGroupToCreate: FlatViewFilterGroup = {
id: filterGroupId,
workspaceId,
applicationId,
@@ -680,7 +683,15 @@ export class ViewWidgetUpsertService {
createdAt: now,
updatedAt: now,
deletedAt: null,
- });
+ };
+
+ filterGroupsToCreate.push(filterGroupToCreate);
+
+ optimisticFlatViewFilterGroupMaps =
+ addFlatEntityToFlatEntityMapsOrThrow({
+ flatEntity: filterGroupToCreate,
+ flatEntityMaps: optimisticFlatViewFilterGroupMaps,
+ });
} else {
const hasChanged =
existingGroup.logicalOperator !== inputGroup.logicalOperator ||
@@ -700,7 +711,9 @@ export class ViewWidgetUpsertService {
foreignKeyValues: {
parentViewFilterGroupId: resolvedParentId,
},
- flatEntityMaps: { flatViewFilterGroupMaps },
+ flatEntityMaps: {
+ flatViewFilterGroupMaps: optimisticFlatViewFilterGroupMaps,
+ },
});
filterGroupsToUpdate.push({
@@ -722,7 +735,12 @@ export class ViewWidgetUpsertService {
(g) => !inputFilterGroupIds.has(g.id),
);
- return { filterGroupsToCreate, filterGroupsToUpdate, filterGroupsToRemove };
+ return {
+ filterGroupsToCreate,
+ filterGroupsToUpdate,
+ filterGroupsToRemove,
+ optimisticFlatViewFilterGroupMaps,
+ };
}
private computeViewFilterOperations({
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/sort-view-filter-group-inputs-parents-first.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/sort-view-filter-group-inputs-parents-first.util.ts
new file mode 100644
index 00000000000..b8d5d2072b3
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/sort-view-filter-group-inputs-parents-first.util.ts
@@ -0,0 +1,39 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { type UpsertViewWidgetViewFilterGroupInput } from 'src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-filter-group.input';
+
+export const sortViewFilterGroupInputsParentsFirst = (
+ inputFilterGroups: UpsertViewWidgetViewFilterGroupInput[],
+): UpsertViewWidgetViewFilterGroupInput[] => {
+ const inputFilterGroupById = new Map(
+ inputFilterGroups
+ .filter((inputGroup) => isDefined(inputGroup.id))
+ .map((inputGroup) => [inputGroup.id, inputGroup]),
+ );
+
+ const sortedInputFilterGroups: UpsertViewWidgetViewFilterGroupInput[] = [];
+ const visitedInputFilterGroups =
+ new Set<UpsertViewWidgetViewFilterGroupInput>();
+
+ const visit = (inputGroup: UpsertViewWidgetViewFilterGroupInput) => {
+ if (visitedInputFilterGroups.has(inputGroup)) {
+ return;
+ }
+
+ visitedInputFilterGroups.add(inputGroup);
+
+ const parentInputGroup = isDefined(inputGroup.parentViewFilterGroupId)
+ ? inputFilterGroupById.get(inputGroup.parentViewFilterGroupId)
+ : undefined;
+
+ if (isDefined(parentInputGroup)) {
+ visit(parentInputGroup);
+ }
+
+ sortedInputFilterGroups.push(inputGroup);
+ };
+
+ inputFilterGroups.forEach(visit);
+
+ return sortedInputFilterGroups;
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget.integration-spec.ts
index fb0bf07c9ce..5ccb6db65a4 100644
--- a/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget.integration-spec.ts
@@ -648,6 +648,49 @@ describe('upsertViewWidget', () => {
expect(childGroup.length).toBe(1);
expect(childGroup[0].parentViewFilterGroupId).toBe(parentGroupId);
});
+
+ it('should create new nested filter groups in a single call, children listed first', async () => {
+ const rootGroupId = uuidv4();
+ const firstChildGroupId = uuidv4();
+ const secondChildGroupId = uuidv4();
+
+ const { errors } = await upsertViewWidget({
+ expectToFail: false,
+ input: {
+ widgetId: testSetup.widgetId,
+ viewFilterGroups: [
+ {
+ id: firstChildGroupId,
+ logicalOperator: ViewFilterGroupLogicalOperator.AND,
+ parentViewFilterGroupId: rootGroupId,
+ },
+ {
+ id: rootGroupId,
+ logicalOperator: ViewFilterGroupLogicalOperator.OR,
+ },
+ {
+ id: secondChildGroupId,
+ logicalOperator: ViewFilterGroupLogicalOperator.AND,
+ parentViewFilterGroupId: rootGroupId,
+ },
+ ],
+ },
+ });
+
+ expect(errors).toBeUndefined();
+
+ const childGroups = await global.testDataSource.query(
+ `SELECT id, "parentViewFilterGroupId"
+ FROM core."viewFilterGroup"
+ WHERE id = ANY($1) AND "deletedAt" IS NULL`,
+ [[firstChildGroupId, secondChildGroupId]],
+ );
+
+ expect(childGroups.length).toBe(2);
+ childGroups.forEach((childGroup: { parentViewFilterGroupId: string }) =>
+ expect(childGroup.parentViewFilterGroupId).toBe(rootGroupId),
+ );
+ });
});
describe('view filters', () => {