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 7d78f685f4..88dfa19461 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 @@ -128,7 +128,7 @@ export class TaskListRequestModel { candidateGroupId?: string[]; taskVariableFilters?: TaskListRequestTaskVariableFilter[]; - variableKeys?: string[]; + processVariableKeys?: string[]; constructor(obj: Partial) { if (!obj.appName) { @@ -161,7 +161,7 @@ export class TaskListRequestModel { this.candidateUserId = obj.candidateUserId; this.candidateGroupId = obj.candidateGroupId; this.taskVariableFilters = obj.taskVariableFilters; - this.variableKeys = obj.variableKeys; + this.processVariableKeys = obj.processVariableKeys; } } diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts index dbc9495ff4..05be96706a 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts @@ -543,7 +543,7 @@ describe('ProcessListCloudComponent', () => { component.ngAfterContentInit(); component.reload(); - expect(component.processListRequestNode.variableKeys).not.toBeDefined(); + expect(component.processListRequestNode.processVariableKeys).not.toBeDefined(); }); it('should request process variable if column for process variable is displayed', () => { @@ -568,7 +568,7 @@ describe('ProcessListCloudComponent', () => { component.ngAfterContentInit(); component.reload(); - expect(component.processListRequestNode.variableKeys).toEqual(['processKey/variableName']); + expect(component.processListRequestNode.processVariableKeys).toEqual(['processKey/variableName']); }); it('should reload tasks when reload() is called', (done) => { 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 d72678a6c8..17e80536dd 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 @@ -543,7 +543,7 @@ export class ProcessListCloudComponent extends DataTableSchema) { if (!obj.appName) { @@ -129,7 +129,7 @@ export class ProcessListRequestModel { this.completedTo = obj.completedTo; this.suspendedFrom = obj.suspendedFrom; this.suspendedTo = obj.suspendedTo; - this.variableKeys = obj.variableKeys; + this.processVariableKeys = obj.processVariableKeys; } } 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 5e83f84e87..93c74196af 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,8 +102,6 @@ export class ProcessListCloudService extends BaseCloudService { } protected buildQueryData(requestNode: ProcessListRequestModel) { - const variableKeys = requestNode.variableKeys?.length > 0 ? requestNode.variableKeys.join(',') : undefined; - const queryData: any = { name: requestNode.name, initiator: requestNode.initiator, @@ -117,7 +115,7 @@ export class ProcessListCloudService extends BaseCloudService { completedTo: requestNode.completedTo, suspendedFrom: requestNode.suspendedFrom, suspendedTo: requestNode.suspendedTo, - variableKeys: variableKeys + processVariableKeys: requestNode.processVariableKeys }; Object.keys(queryData).forEach((key) => { 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 f862d571a9..81e7f6a6a6 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 @@ -280,7 +280,7 @@ export class TaskListCloudComponent extends BaseTaskListCloudComponent 0 ? requestNode.variableKeys.join(',') : undefined; - const queryData: any = { status: requestNode.status, processDefinitionName: requestNode.processDefinitionName, @@ -114,7 +112,7 @@ export class TaskListCloudService extends BaseCloudService implements TaskListCl createdTo: requestNode.createdTo, dueDateFrom: requestNode.dueDateFrom, dueDateTo: requestNode.dueDateTo, - variableKeys + processVariableKeys: requestNode.processVariableKeys }; Object.keys(queryData).forEach((key) => {