diff --git a/lib/process-services-cloud/src/lib/models/filter-cloud-model.ts b/lib/process-services-cloud/src/lib/models/filter-cloud-model.ts index 5fa08899ee..444fcf9107 100644 --- a/lib/process-services-cloud/src/lib/models/filter-cloud-model.ts +++ b/lib/process-services-cloud/src/lib/models/filter-cloud-model.ts @@ -104,6 +104,7 @@ export class TaskListRequestModel { name?: string[]; description?: string[]; processDefinitionName?: string[]; + processName?: string[]; priority?: string[]; status?: string[]; completedBy?: string[]; @@ -139,6 +140,7 @@ export class TaskListRequestModel { this.name = obj.name; this.description = obj.description; this.processDefinitionName = obj.processDefinitionName; + this.processName = obj.processName; this.priority = obj.priority; this.status = obj.status; this.completedBy = obj.completedBy; @@ -175,6 +177,7 @@ export class TaskFilterCloudAdapter extends TaskListRequestModel { onlyStandalone: filter.standalone, name: filter.taskNames, processDefinitionName: filter.processDefinitionNames, + processName: filter.processNames, priority: filter.priorities?.map((priority) => priority.toString()), status: filter.statuses, completedBy: filter.completedByUsers, diff --git a/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts b/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts index 7a5bee22c2..476b62e7b9 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts @@ -50,6 +50,7 @@ export class ProcessFilterCloudModel { environmentId?: string; processDefinitionNames: string[] | null; + processNames: string[] | null; initiators: string[] | null; appVersions: string[] | null; statuses: string[] | null; @@ -104,6 +105,7 @@ export class ProcessFilterCloudModel { this._suspendedTo = obj._suspendedTo || null; this.processDefinitionNames = obj.processDefinitionNames || null; + this.processNames = obj.processNames || null; this.initiators = obj.initiators || null; this.appVersions = obj.appVersions || null; this.statuses = obj.statuses || null; diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts index 672f3d2050..f1b5f1bdc7 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts @@ -213,7 +213,14 @@ export class ProcessListCloudComponent * This input will be used only if PROCESS_SEARCH_API_METHOD_TOKEN is provided with 'POST' value. */ @Input() - names: string[] = []; + processNames: string[] = []; + + /** + * Filter the processes. Display only processes with definition names matching any of the supplied strings. + * This input will be used only if PROCESS_SEARCH_API_METHOD_TOKEN is provided with 'POST' value. + */ + @Input() + processDefinitionNames: string[] = []; /** * Filter the processes. Display only processes started by any of the users whose usernames are present in the array. @@ -536,7 +543,8 @@ export class ProcessListCloudComponent skipCount: this.skipCount }, sorting: this.getProcessListRequestSorting(), - name: this.names, + processName: this.processNames, + processDefinitionName: this.processDefinitionNames, initiator: this.initiators, appVersion: this.appVersions, status: this.statuses, diff --git a/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts b/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts index 42060fa7ac..9fcccd071f 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts @@ -85,7 +85,8 @@ export class ProcessListRequestModel { pagination?: Pagination; sorting?: ProcessListRequestSortingModel; - name?: string[]; + processName?: string[]; + processDefinitionName?: string[]; initiator?: string[]; appVersion?: string[]; status?: string[]; @@ -110,7 +111,8 @@ export class ProcessListRequestModel { this.pagination = obj.pagination; this.sorting = obj.sorting; - this.name = obj.name; + this.processName = obj.processName; + this.processDefinitionName = obj.processDefinitionName; this.initiator = obj.initiator; this.appVersion = obj.appVersion; this.status = obj.status; @@ -138,7 +140,8 @@ export class ProcessFilterCloudAdapter extends ProcessListRequestModel { isFieldProcessVariable: false }), - name: filter.processDefinitionNames, + processDefinitionName: filter.processDefinitionNames, + processName: filter.processNames, initiator: filter.initiators, appVersion: filter.appVersions, status: filter.statuses, diff --git a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts index 79ccce3dae..8c8f5774d4 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts @@ -102,7 +102,8 @@ export class ProcessListCloudService extends BaseCloudService { protected buildQueryData(requestNode: ProcessListRequestModel) { const queryData: any = { - name: requestNode.name, + name: requestNode.processName, + processDefinitionName: requestNode.processDefinitionName, initiator: requestNode.initiator, appVersion: requestNode.appVersion, status: requestNode.status, diff --git a/lib/process-services-cloud/src/lib/task/task-filters/models/filter-cloud.model.ts b/lib/process-services-cloud/src/lib/task/task-filters/models/filter-cloud.model.ts index 28062ec3a8..1dfa2e686e 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/models/filter-cloud.model.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/models/filter-cloud.model.ts @@ -64,6 +64,7 @@ export class TaskFilterCloudModel { taskNames: string[] | null; statuses: TaskStatusFilter[] | null; assignees: string[] | null; + processNames: string[] | null; processDefinitionNames: string[] | null; priorities: string[] | null; completedByUsers: string[] | null; @@ -121,6 +122,7 @@ export class TaskFilterCloudModel { this.taskNames = obj.taskNames || null; this.statuses = obj.statuses || null; this.assignees = obj.assignees || null; + this.processNames = obj.processNames || null; this.processDefinitionNames = obj.processDefinitionNames || null; this.priorities = obj.priorities || null; this.completedByUsers = obj.completedByUsers || null; diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts index 26f3ecf0ee..58fcbb71b8 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts @@ -170,12 +170,19 @@ export class TaskListCloudComponent extends BaseTaskListCloudComponent