diff --git a/plugins/scaffolder-backend/report-alpha.api.md b/plugins/scaffolder-backend/report-alpha.api.md index 47b87602f6..966d71acaa 100644 --- a/plugins/scaffolder-backend/report-alpha.api.md +++ b/plugins/scaffolder-backend/report-alpha.api.md @@ -11,6 +11,7 @@ import { PermissionCriteria } from '@backstage/plugin-permission-common'; import { PermissionRule } from '@backstage/plugin-permission-node'; import { ResourcePermission } from '@backstage/plugin-permission-common'; import { SerializedTask } from '@backstage/plugin-scaffolder-node'; +import { TaskFilter } from '@backstage/plugin-scaffolder-node'; import { TemplateEntityStepV1beta3 } from '@backstage/plugin-scaffolder-common'; import { TemplateParametersV1beta3 } from '@backstage/plugin-scaffolder-common'; @@ -87,10 +88,7 @@ export const scaffolderActionConditions: Conditions<{ export const scaffolderTaskConditions: Conditions<{ isTaskOwner: PermissionRule< SerializedTask, - { - key: string; - values: any; - }, + TaskFilter, 'scaffolder-task', { createdBy: string[]; diff --git a/plugins/scaffolder-backend/src/service/rules.ts b/plugins/scaffolder-backend/src/service/rules.ts index 05575cbbe3..5753668089 100644 --- a/plugins/scaffolder-backend/src/service/rules.ts +++ b/plugins/scaffolder-backend/src/service/rules.ts @@ -27,7 +27,7 @@ import { TemplateParametersV1beta3, } from '@backstage/plugin-scaffolder-common'; -import { SerializedTask } from '@backstage/plugin-scaffolder-node'; +import { SerializedTask, TaskFilter } from '@backstage/plugin-scaffolder-node'; import { z } from 'zod'; import { JsonObject, JsonPrimitive } from '@backstage/types'; @@ -135,10 +135,7 @@ function buildHasProperty>({ export const createTaskPermissionRule = makeCreatePermissionRule< SerializedTask, - { - key: string; - values: any; - }, + TaskFilter, typeof RESOURCE_TYPE_SCAFFOLDER_TASK >();