diff --git a/packages/oss-console/src/components/Entities/generators.ts b/packages/oss-console/src/components/Entities/generators.ts index aa19456c2..8006a7d85 100644 --- a/packages/oss-console/src/components/Entities/generators.ts +++ b/packages/oss-console/src/components/Entities/generators.ts @@ -8,12 +8,22 @@ export const executionFilterGenerator: { [k in ResourceType]: (id: ResourceIdentifier, version?: string) => FilterOperation[]; } = { [ResourceType.DATASET]: noFilters, - [ResourceType.LAUNCH_PLAN]: ({ name }, version) => [ + [ResourceType.LAUNCH_PLAN]: ({ name, project, domain }, version) => [ { key: 'launch_plan.name', operation: FilterOperationName.EQ, value: name, }, + { + key: 'launch_plan.project', + operation: FilterOperationName.EQ, + value: project, + }, + { + key: 'launch_plan.domain', + operation: FilterOperationName.EQ, + value: domain, + }, ...(version ? [ { @@ -24,12 +34,22 @@ export const executionFilterGenerator: { ] : []), ], - [ResourceType.TASK]: ({ name }, version) => [ + [ResourceType.TASK]: ({ name, project, domain }, version) => [ { key: 'task.name', operation: FilterOperationName.EQ, value: name, }, + { + key: 'task.project', + operation: FilterOperationName.EQ, + value: project, + }, + { + key: 'task.domain', + operation: FilterOperationName.EQ, + value: domain, + }, ...(version ? [ { @@ -41,12 +61,22 @@ export const executionFilterGenerator: { : []), ], [ResourceType.UNSPECIFIED]: noFilters, - [ResourceType.WORKFLOW]: ({ name }, version) => [ + [ResourceType.WORKFLOW]: ({ name, project, domain }, version) => [ { key: 'workflow.name', operation: FilterOperationName.EQ, value: name, }, + { + key: 'workflow.project', + operation: FilterOperationName.EQ, + value: project, + }, + { + key: 'workflow.domain', + operation: FilterOperationName.EQ, + value: domain, + }, ...(version ? [ { diff --git a/packages/oss-console/src/components/Workflow/SearchableWorkflowNameList.tsx b/packages/oss-console/src/components/Workflow/SearchableWorkflowNameList.tsx index b7e2bb98b..f18dddf25 100644 --- a/packages/oss-console/src/components/Workflow/SearchableWorkflowNameList.tsx +++ b/packages/oss-console/src/components/Workflow/SearchableWorkflowNameList.tsx @@ -286,6 +286,16 @@ const WorkflowCard = ({ item, inView }: { item: NamedEntity; inView: boolean }) operation: FilterOperationName.EQ, value: item.id.name, }, + { + key: 'workflow.project', + operation: FilterOperationName.EQ, + value: item.id.project, + }, + { + key: 'workflow.domain', + operation: FilterOperationName.EQ, + value: item.id.domain, + }, ], }), enabled: !!inView && !!item.id.name,