Skip to content

The open alternative to Salesforce, designed for AI.

Apply the unlisted-view rule to the AI view field, filter and sort tools (#29428)

Etienne6cc974340f2b
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-many-view-fields.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-many-view-fields.tool.ts
index 8c166826ddb..cd72fd27f42 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-many-view-fields.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-many-view-fields.tool.ts
@@ -8,6 +8,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';
import { createViewFieldInputSchema } from 'src/engine/metadata-modules/view-field/tools/schemas/create-view-field-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const createManyViewFieldsInputSchema = z.object({
viewFields: z
@@ -29,16 +30,30 @@ export class CreateManyViewFieldsTool extends BaseTool<
> {
readonly inputSchema = createManyViewFieldsInputSchema;
- constructor(private readonly viewFieldService: ViewFieldService) {
+ constructor(
+ private readonly viewFieldService: ViewFieldService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<
typeof createManyViewFieldsInputSchema
>): Promise<ToolOutput> {
+ await Promise.all(
+ input.viewFields.map(({ viewId }) =>
+ this.viewToolAccessService.findViewEditableByUserOrThrow({
+ viewId,
+ workspaceId,
+ userWorkspaceId,
+ operation: 'update',
+ }),
+ ),
+ );
+
await this.viewFieldService.createMany({
createViewFieldInputs: input.viewFields.map((viewField) => ({
viewId: viewField.viewId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-view-field.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-view-field.tool.ts
index 887ce01c197..5ab1a7cfaaa 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-view-field.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/create-view-field.tool.ts
@@ -7,6 +7,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';
import { createViewFieldInputSchema } from 'src/engine/metadata-modules/view-field/tools/schemas/create-view-field-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
@DefineTool({
name: 'create_view_field',
@@ -20,14 +21,24 @@ export class CreateViewFieldTool extends BaseTool<
> {
readonly inputSchema = createViewFieldInputSchema;
- constructor(private readonly viewFieldService: ViewFieldService) {
+ constructor(
+ private readonly viewFieldService: ViewFieldService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof createViewFieldInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findViewEditableByUserOrThrow({
+ viewId: input.viewId,
+ workspaceId,
+ userWorkspaceId,
+ operation: 'update',
+ });
+
const viewField = await this.viewFieldService.createOne({
createViewFieldInput: {
viewId: input.viewId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/delete-view-field.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/delete-view-field.tool.ts
index c42c4982f94..4943510e252 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/delete-view-field.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/delete-view-field.tool.ts
@@ -7,6 +7,7 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const deleteViewFieldInputSchema = z.object({
id: z
@@ -29,14 +30,24 @@ export class DeleteViewFieldTool extends BaseTool<
> {
readonly inputSchema = deleteViewFieldInputSchema;
- constructor(private readonly viewFieldService: ViewFieldService) {
+ constructor(
+ private readonly viewFieldService: ViewFieldService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof deleteViewFieldInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findParentViewEditableByUserOrThrow({
+ kind: 'viewField',
+ entityId: input.id,
+ workspaceId,
+ userWorkspaceId,
+ });
+
const viewField = await this.viewFieldService.deleteOne({
deleteViewFieldInput: { id: input.id },
workspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-many-view-fields.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-many-view-fields.tool.ts
index d6f9b17a4ec..7bc5021431b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-many-view-fields.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-many-view-fields.tool.ts
@@ -8,6 +8,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';
import { updateViewFieldInputSchema } from 'src/engine/metadata-modules/view-field/tools/schemas/update-view-field-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const updateManyViewFieldsInputSchema = z.object({
viewFields: z
@@ -29,16 +30,30 @@ export class UpdateManyViewFieldsTool extends BaseTool<
> {
readonly inputSchema = updateManyViewFieldsInputSchema;
- constructor(private readonly viewFieldService: ViewFieldService) {
+ constructor(
+ private readonly viewFieldService: ViewFieldService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<
typeof updateManyViewFieldsInputSchema
>): Promise<ToolOutput> {
+ await Promise.all(
+ input.viewFields.map(({ id }) =>
+ this.viewToolAccessService.findParentViewEditableByUserOrThrow({
+ kind: 'viewField',
+ entityId: id,
+ workspaceId,
+ userWorkspaceId,
+ }),
+ ),
+ );
+
await Promise.all(
input.viewFields.map(async (viewField) => {
await this.viewFieldService.updateOne({
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-view-field.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-view-field.tool.ts
index 0ea22ae8753..df4d3ae7643 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-view-field.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/tools/update-view-field.tool.ts
@@ -7,6 +7,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';
import { updateViewFieldInputSchema } from 'src/engine/metadata-modules/view-field/tools/schemas/update-view-field-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
@DefineTool({
name: 'update_view_field',
@@ -20,14 +21,24 @@ export class UpdateViewFieldTool extends BaseTool<
> {
readonly inputSchema = updateViewFieldInputSchema;
- constructor(private readonly viewFieldService: ViewFieldService) {
+ constructor(
+ private readonly viewFieldService: ViewFieldService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof updateViewFieldInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findParentViewEditableByUserOrThrow({
+ kind: 'viewField',
+ entityId: input.id,
+ workspaceId,
+ userWorkspaceId,
+ });
+
const viewField = await this.viewFieldService.updateOne({
updateViewFieldInput: {
id: input.id,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-many-view-filters.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-many-view-filters.tool.ts
index c7c7e76d92b..d08709c4269 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-many-view-filters.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-many-view-filters.tool.ts
@@ -8,6 +8,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';
import { createViewFilterInputSchema } from 'src/engine/metadata-modules/view-filter/tools/schemas/create-view-filter-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const createManyViewFiltersInputSchema = z.object({
filters: z
@@ -29,16 +30,30 @@ export class CreateManyViewFiltersTool extends BaseTool<
> {
readonly inputSchema = createManyViewFiltersInputSchema;
- constructor(private readonly viewFilterService: ViewFilterService) {
+ constructor(
+ private readonly viewFilterService: ViewFilterService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<
typeof createManyViewFiltersInputSchema
>): Promise<ToolOutput> {
+ await Promise.all(
+ input.filters.map(({ viewId }) =>
+ this.viewToolAccessService.findViewEditableByUserOrThrow({
+ viewId,
+ workspaceId,
+ userWorkspaceId,
+ operation: 'update',
+ }),
+ ),
+ );
+
const results = [];
for (const filterInput of input.filters) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-view-filter.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-view-filter.tool.ts
index 3a93b64a1bf..2adae2318d4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-view-filter.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/create-view-filter.tool.ts
@@ -7,6 +7,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';
import { createViewFilterInputSchema } from 'src/engine/metadata-modules/view-filter/tools/schemas/create-view-filter-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
@DefineTool({
name: 'create_view_filter',
@@ -20,14 +21,24 @@ export class CreateViewFilterTool extends BaseTool<
> {
readonly inputSchema = createViewFilterInputSchema;
- constructor(private readonly viewFilterService: ViewFilterService) {
+ constructor(
+ private readonly viewFilterService: ViewFilterService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof createViewFilterInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findViewEditableByUserOrThrow({
+ viewId: input.viewId,
+ workspaceId,
+ userWorkspaceId,
+ operation: 'update',
+ });
+
const filter = await this.viewFilterService.createOne({
createViewFilterInput: {
viewId: input.viewId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/delete-view-filter.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/delete-view-filter.tool.ts
index a7c7e6b9b09..c3200a349e1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/delete-view-filter.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/delete-view-filter.tool.ts
@@ -7,6 +7,7 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const deleteViewFilterInputSchema = z.object({
id: z.string().uuid().describe('ID of the view filter to delete'),
@@ -24,14 +25,24 @@ export class DeleteViewFilterTool extends BaseTool<
> {
readonly inputSchema = deleteViewFilterInputSchema;
- constructor(private readonly viewFilterService: ViewFilterService) {
+ constructor(
+ private readonly viewFilterService: ViewFilterService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof deleteViewFilterInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findParentViewEditableByUserOrThrow({
+ kind: 'viewFilter',
+ entityId: input.id,
+ workspaceId,
+ userWorkspaceId,
+ });
+
const filter = await this.viewFilterService.deleteOne({
deleteViewFilterInput: { id: input.id },
workspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/update-view-filter.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/update-view-filter.tool.ts
index c45220cb2e4..2560aa95b4a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/update-view-filter.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/tools/update-view-filter.tool.ts
@@ -8,6 +8,7 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const updateViewFilterInputSchema = z.object({
id: z.string().uuid().describe('ID of the view filter to update'),
@@ -42,14 +43,24 @@ export class UpdateViewFilterTool extends BaseTool<
> {
readonly inputSchema = updateViewFilterInputSchema;
- constructor(private readonly viewFilterService: ViewFilterService) {
+ constructor(
+ private readonly viewFilterService: ViewFilterService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof updateViewFilterInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findParentViewEditableByUserOrThrow({
+ kind: 'viewFilter',
+ entityId: input.id,
+ workspaceId,
+ userWorkspaceId,
+ });
+
const filter = await this.viewFilterService.updateOne({
updateViewFilterInput: {
id: input.id,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-many-view-sorts.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-many-view-sorts.tool.ts
index c604b1db798..2961da8e4a4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-many-view-sorts.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-many-view-sorts.tool.ts
@@ -8,6 +8,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';
import { createViewSortInputSchema } from 'src/engine/metadata-modules/view-sort/tools/schemas/create-view-sort-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const createManyViewSortsInputSchema = z.object({
sorts: z
@@ -29,16 +30,30 @@ export class CreateManyViewSortsTool extends BaseTool<
> {
readonly inputSchema = createManyViewSortsInputSchema;
- constructor(private readonly viewSortService: ViewSortService) {
+ constructor(
+ private readonly viewSortService: ViewSortService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<
typeof createManyViewSortsInputSchema
>): Promise<ToolOutput> {
+ await Promise.all(
+ input.sorts.map(({ viewId }) =>
+ this.viewToolAccessService.findViewEditableByUserOrThrow({
+ viewId,
+ workspaceId,
+ userWorkspaceId,
+ operation: 'update',
+ }),
+ ),
+ );
+
const results = [];
for (const sortInput of input.sorts) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-view-sort.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-view-sort.tool.ts
index dd4fda0c394..088eba2c919 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-view-sort.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/create-view-sort.tool.ts
@@ -7,6 +7,7 @@ import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/type
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';
import { createViewSortInputSchema } from 'src/engine/metadata-modules/view-sort/tools/schemas/create-view-sort-input.schema';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
@DefineTool({
name: 'create_view_sort',
@@ -20,14 +21,24 @@ export class CreateViewSortTool extends BaseTool<
> {
readonly inputSchema = createViewSortInputSchema;
- constructor(private readonly viewSortService: ViewSortService) {
+ constructor(
+ private readonly viewSortService: ViewSortService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof createViewSortInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findViewEditableByUserOrThrow({
+ viewId: input.viewId,
+ workspaceId,
+ userWorkspaceId,
+ operation: 'update',
+ });
+
const sort = await this.viewSortService.createOne({
createViewSortInput: {
viewId: input.viewId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/delete-view-sort.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/delete-view-sort.tool.ts
index 844536afc38..bd1da3f03a9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/delete-view-sort.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/delete-view-sort.tool.ts
@@ -7,6 +7,7 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const deleteViewSortInputSchema = z.object({
id: z.string().uuid().describe('ID of the view sort to delete'),
@@ -24,14 +25,24 @@ export class DeleteViewSortTool extends BaseTool<
> {
readonly inputSchema = deleteViewSortInputSchema;
- constructor(private readonly viewSortService: ViewSortService) {
+ constructor(
+ private readonly viewSortService: ViewSortService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof deleteViewSortInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findParentViewEditableByUserOrThrow({
+ kind: 'viewSort',
+ entityId: input.id,
+ workspaceId,
+ userWorkspaceId,
+ });
+
const sort = await this.viewSortService.deleteOne({
deleteViewSortInput: { id: input.id },
workspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/update-view-sort.tool.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/update-view-sort.tool.ts
index cc41878cb68..9fee8924fee 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/update-view-sort.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/tools/update-view-sort.tool.ts
@@ -8,6 +8,7 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';
+import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/services/view-tool-access.service';
const updateViewSortInputSchema = z.object({
id: z.string().uuid().describe('ID of the view sort to update'),
@@ -29,14 +30,24 @@ export class UpdateViewSortTool extends BaseTool<
> {
readonly inputSchema = updateViewSortInputSchema;
- constructor(private readonly viewSortService: ViewSortService) {
+ constructor(
+ private readonly viewSortService: ViewSortService,
+ private readonly viewToolAccessService: ViewToolAccessService,
+ ) {
super();
}
async execute({
input,
- context: { workspaceId },
+ context: { workspaceId, userWorkspaceId },
}: ToolExecuteArgs<typeof updateViewSortInputSchema>): Promise<ToolOutput> {
+ await this.viewToolAccessService.findParentViewEditableByUserOrThrow({
+ kind: 'viewSort',
+ entityId: input.id,
+ workspaceId,
+ userWorkspaceId,
+ });
+
const sort = await this.viewSortService.updateOne({
updateViewSortInput: {
id: input.id,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts
index c53df376f20..7bb1cded550 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/tools/__tests__/view-tools.spec.ts
@@ -5,6 +5,7 @@ import {
FieldMetadataType,
OrderByDirection,
ViewCalendarLayout,
+ ViewSortDirection,
ViewType,
ViewVisibility,
} from 'twenty-shared/types';
@@ -15,6 +16,8 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';
import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';
import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';
+import { CreateManyViewSortsTool } from 'src/engine/metadata-modules/view-sort/tools/create-many-view-sorts.tool';
+import { UpdateViewSortTool } from 'src/engine/metadata-modules/view-sort/tools/update-view-sort.tool';
import { CompleteViewUpsertService } from 'src/engine/metadata-modules/view/tools/services/complete-view-upsert.service';
import { ViewQueryParamsService } from 'src/engine/metadata-modules/view/services/view-query-params.service';
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
@@ -26,17 +29,21 @@ import { ViewToolAccessService } from 'src/engine/metadata-modules/view/tools/se
import { ViewToolIdentifierService } from 'src/engine/metadata-modules/view/tools/services/view-tool-identifier.service';
import { UpdateViewTool } from 'src/engine/metadata-modules/view/tools/update-view.tool';
import { UpsertCompleteViewTool } from 'src/engine/metadata-modules/view/tools/upsert-complete-view.tool';
+import { ViewEntityLookupService } from 'src/engine/permissions/view/services/view-entity-lookup.service';
describe('View tools', () => {
let testingModule: TestingModule;
let viewService: jest.Mocked<ViewService>;
let completeViewUpsertService: jest.Mocked<CompleteViewUpsertService>;
let viewFieldService: jest.Mocked<ViewFieldService>;
+ let viewSortService: jest.Mocked<ViewSortService>;
let viewQueryParamsService: jest.Mocked<ViewQueryParamsService>;
const mockWorkspaceId = 'workspace-id';
const mockUserWorkspaceId = 'user-workspace-id';
const mockViewId = 'c1f4b2a0-7d3e-4a8b-9c1d-2e3f4a5b6c7d';
+ const mockOtherUsersViewId = 'b8c1d9e7-4f0a-4b2c-9d3e-0f1a2b3c4d5e';
+ const mockViewSortId = 'a7b0c8d6-3e9f-4a1b-8c2d-9e0f1a2b3c4d';
const mockObjectMetadataId = 'object-metadata-id';
const mockObjectNameSingular = 'company';
const mockCalendarFieldMetadataId = 'f4c7e5d3-0a6b-4dbe-af4a-5b6c7d8e9fa0';
@@ -78,6 +85,20 @@ describe('View tools', () => {
},
};
+ const mockFlatViewSortMaps = {
+ byUniversalIdentifier: {
+ 'view-sort-universal-id': {
+ id: mockViewSortId,
+ viewId: mockViewId,
+ universalIdentifier: 'view-sort-universal-id',
+ },
+ },
+ universalIdentifierById: {
+ [mockViewSortId]: 'view-sort-universal-id',
+ },
+ universalIdentifiersByApplicationId: {},
+ };
+
const mockView = {
id: mockViewId,
name: 'All Companies',
@@ -115,7 +136,10 @@ describe('View tools', () => {
CreateViewTool,
UpdateViewTool,
DeleteViewTool,
+ CreateManyViewSortsTool,
+ UpdateViewSortTool,
ViewToolAccessService,
+ ViewEntityLookupService,
ViewToolIdentifierService,
{
provide: ViewService,
@@ -155,6 +179,7 @@ describe('View tools', () => {
provide: ViewSortService,
useValue: {
createOne: jest.fn(),
+ updateOne: jest.fn(),
findByViewId: jest.fn().mockResolvedValue([]),
deleteOne: jest.fn(),
},
@@ -171,6 +196,7 @@ describe('View tools', () => {
getOrRecomputeManyOrAllFlatEntityMaps: jest.fn().mockResolvedValue({
flatObjectMetadataMaps: mockFlatObjectMetadataMaps,
flatFieldMetadataMaps: mockFlatFieldMetadataMaps,
+ flatViewSortMaps: mockFlatViewSortMaps,
}),
},
},
@@ -181,6 +207,7 @@ describe('View tools', () => {
viewService = module.get(ViewService);
completeViewUpsertService = module.get(CompleteViewUpsertService);
viewFieldService = module.get(ViewFieldService);
+ viewSortService = module.get(ViewSortService);
viewQueryParamsService = module.get(ViewQueryParamsService);
});
@@ -247,6 +274,14 @@ describe('View tools', () => {
tool: testingModule.get(DeleteViewTool),
context,
}),
+ create_many_view_sorts: toToolExecutor({
+ tool: testingModule.get(CreateManyViewSortsTool),
+ context,
+ }),
+ update_view_sort: toToolExecutor({
+ tool: testingModule.get(UpdateViewSortTool),
+ context,
+ }),
};
};
@@ -986,5 +1021,97 @@ describe('View tools', () => {
).rejects.toThrow('You can only delete your own unlisted views');
});
});
+
+ describe('view sort tools', () => {
+ it('should update a sort on own unlisted view', async () => {
+ viewService.findById.mockResolvedValue({
+ ...mockView,
+ visibility: ViewVisibility.UNLISTED,
+ createdByUserWorkspaceId: mockUserWorkspaceId,
+ } as any);
+ viewSortService.updateOne.mockResolvedValue({
+ id: mockViewSortId,
+ viewId: mockViewId,
+ direction: ViewSortDirection.DESC,
+ } as any);
+
+ const tools = buildViewTools({
+ workspaceId: mockWorkspaceId,
+ userWorkspaceId: mockUserWorkspaceId,
+ });
+
+ const { result } = await tools.update_view_sort.execute({
+ id: mockViewSortId,
+ direction: ViewSortDirection.DESC,
+ });
+
+ expect(viewService.findById).toHaveBeenCalledTimes(1);
+ expect(viewService.findById).toHaveBeenCalledWith(
+ mockViewId,
+ mockWorkspaceId,
+ );
+ expect(viewSortService.updateOne).toHaveBeenCalledTimes(1);
+ expect(viewSortService.updateOne).toHaveBeenCalledWith({
+ updateViewSortInput: {
+ id: mockViewSortId,
+ update: { direction: ViewSortDirection.DESC },
+ },
+ workspaceId: mockWorkspaceId,
+ });
+ expect(result).toMatchObject({ direction: ViewSortDirection.DESC });
+ });
+
+ it('should reject updating a sort on another users unlisted view', async () => {
+ viewService.findById.mockResolvedValue({
+ ...mockView,
+ visibility: ViewVisibility.UNLISTED,
+ createdByUserWorkspaceId: 'other-user-workspace-id',
+ } as any);
+
+ const tools = buildViewTools({
+ workspaceId: mockWorkspaceId,
+ userWorkspaceId: mockUserWorkspaceId,
+ });
+
+ await expect(
+ tools.update_view_sort.execute({
+ id: mockViewSortId,
+ direction: ViewSortDirection.DESC,
+ }),
+ ).rejects.toThrow('You can only update your own unlisted views');
+ expect(viewSortService.updateOne).not.toHaveBeenCalled();
+ });
+
+ it('should add no sort when one of the views is another users unlisted view', async () => {
+ viewService.findById.mockImplementation(async (viewId) =>
+ viewId === mockViewId
+ ? (mockView as any)
+ : ({
+ ...mockView,
+ id: mockOtherUsersViewId,
+ visibility: ViewVisibility.UNLISTED,
+ createdByUserWorkspaceId: 'other-user-workspace-id',
+ } as any),
+ );
+
+ const tools = buildViewTools({
+ workspaceId: mockWorkspaceId,
+ userWorkspaceId: mockUserWorkspaceId,
+ });
+
+ await expect(
+ tools.create_many_view_sorts.execute({
+ sorts: [
+ { viewId: mockViewId, fieldMetadataId: mockNameFieldMetadataId },
+ {
+ viewId: mockOtherUsersViewId,
+ fieldMetadataId: mockNameFieldMetadataId,
+ },
+ ],
+ }),
+ ).rejects.toThrow('You can only update your own unlisted views');
+ expect(viewSortService.createOne).not.toHaveBeenCalled();
+ });
+ });
});
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/tools/services/view-tool-access.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/tools/services/view-tool-access.service.ts
index 6b9f967c378..576b420a933 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/tools/services/view-tool-access.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/tools/services/view-tool-access.service.ts
@@ -9,11 +9,16 @@ import {
ViewExceptionCode,
} from 'src/engine/metadata-modules/view/exceptions/view.exception';
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
+import { ViewEntityLookupService } from 'src/engine/permissions/view/services/view-entity-lookup.service';
+import { type ViewChildEntityKind } from 'src/engine/permissions/view/types/view-permissions.type';
// Stricter than ViewAccessService: holding VIEWS does not let an agent change another member's unlisted view
@Injectable()
export class ViewToolAccessService {
- constructor(private readonly viewService: ViewService) {}
+ constructor(
+ private readonly viewService: ViewService,
+ private readonly viewEntityLookupService: ViewEntityLookupService,
+ ) {}
async findViewEditableByUserOrThrow({
viewId,
@@ -47,4 +52,34 @@ export class ViewToolAccessService {
return view;
}
+
+ async findParentViewEditableByUserOrThrow({
+ kind,
+ entityId,
+ workspaceId,
+ userWorkspaceId,
+ }: {
+ kind: ViewChildEntityKind;
+ entityId: string;
+ workspaceId: string;
+ userWorkspaceId?: string;
+ }): Promise<ViewDTO | null> {
+ const viewId =
+ await this.viewEntityLookupService.findViewIdByEntityIdAndKind(
+ kind,
+ entityId,
+ workspaceId,
+ );
+
+ if (!isDefined(viewId)) {
+ return null;
+ }
+
+ return this.findViewEditableByUserOrThrow({
+ viewId,
+ workspaceId,
+ userWorkspaceId,
+ operation: 'update',
+ });
+ }
}