Skip to content

Commit 0063d83

Browse files
authored
AAE-28333 Fix search process variabels payload for new API (#10387)
* AAE-28333 Fix search process variabels payload for new API * fix units
1 parent 9520b2a commit 0063d83

File tree

7 files changed

+10
-14
lines changed

7 files changed

+10
-14
lines changed

lib/process-services-cloud/src/lib/models/filter-cloud-model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export class TaskListRequestModel {
128128
candidateGroupId?: string[];
129129

130130
taskVariableFilters?: TaskListRequestTaskVariableFilter[];
131-
variableKeys?: string[];
131+
processVariableKeys?: string[];
132132

133133
constructor(obj: Partial<TaskListRequestModel>) {
134134
if (!obj.appName) {
@@ -161,7 +161,7 @@ export class TaskListRequestModel {
161161
this.candidateUserId = obj.candidateUserId;
162162
this.candidateGroupId = obj.candidateGroupId;
163163
this.taskVariableFilters = obj.taskVariableFilters;
164-
this.variableKeys = obj.variableKeys;
164+
this.processVariableKeys = obj.processVariableKeys;
165165
}
166166
}
167167

lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ describe('ProcessListCloudComponent', () => {
543543
component.ngAfterContentInit();
544544
component.reload();
545545

546-
expect(component.processListRequestNode.variableKeys).not.toBeDefined();
546+
expect(component.processListRequestNode.processVariableKeys).not.toBeDefined();
547547
});
548548

549549
it('should request process variable if column for process variable is displayed', () => {
@@ -568,7 +568,7 @@ describe('ProcessListCloudComponent', () => {
568568
component.ngAfterContentInit();
569569
component.reload();
570570

571-
expect(component.processListRequestNode.variableKeys).toEqual(['processKey/variableName']);
571+
expect(component.processListRequestNode.processVariableKeys).toEqual(['processKey/variableName']);
572572
});
573573

574574
it('should reload tasks when reload() is called', (done) => {

lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ export class ProcessListCloudComponent extends DataTableSchema<ProcessListDataCo
543543
completedTo: this.completedTo,
544544
suspendedFrom: this.suspendedFrom,
545545
suspendedTo: this.suspendedTo,
546-
variableKeys: this.getVariableDefinitionsRequestModel()
546+
processVariableKeys: this.getVariableDefinitionsRequestModel()
547547
};
548548

549549
return new ProcessListRequestModel(requestNode);

lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export class ProcessListRequestModel {
106106
suspendedTo?: string;
107107

108108
processVariableFilters?: ProcessListRequestProcessVariableFilter[];
109-
variableKeys?: string[];
109+
processVariableKeys?: string[];
110110

111111
constructor(obj: Partial<ProcessListRequestModel>) {
112112
if (!obj.appName) {
@@ -129,7 +129,7 @@ export class ProcessListRequestModel {
129129
this.completedTo = obj.completedTo;
130130
this.suspendedFrom = obj.suspendedFrom;
131131
this.suspendedTo = obj.suspendedTo;
132-
this.variableKeys = obj.variableKeys;
132+
this.processVariableKeys = obj.processVariableKeys;
133133
}
134134
}
135135

lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ export class ProcessListCloudService extends BaseCloudService {
102102
}
103103

104104
protected buildQueryData(requestNode: ProcessListRequestModel) {
105-
const variableKeys = requestNode.variableKeys?.length > 0 ? requestNode.variableKeys.join(',') : undefined;
106-
107105
const queryData: any = {
108106
name: requestNode.name,
109107
initiator: requestNode.initiator,
@@ -117,7 +115,7 @@ export class ProcessListCloudService extends BaseCloudService {
117115
completedTo: requestNode.completedTo,
118116
suspendedFrom: requestNode.suspendedFrom,
119117
suspendedTo: requestNode.suspendedTo,
120-
variableKeys: variableKeys
118+
processVariableKeys: requestNode.processVariableKeys
121119
};
122120

123121
Object.keys(queryData).forEach((key) => {

lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ export class TaskListCloudComponent extends BaseTaskListCloudComponent<ProcessLi
280280
dueDateTo: this.dueDateTo,
281281
completedFrom: this.completedFrom,
282282
completedTo: this.completedTo,
283-
variableKeys: this.getRequestNodeVariables()
283+
processVariableKeys: this.getRequestNodeVariables()
284284
};
285285

286286
return new TaskListRequestModel(requestNode);

lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ export class TaskListCloudService extends BaseCloudService implements TaskListCl
9999
}
100100

101101
protected buildQueryData(requestNode: TaskListRequestModel) {
102-
const variableKeys = requestNode.variableKeys?.length > 0 ? requestNode.variableKeys.join(',') : undefined;
103-
104102
const queryData: any = {
105103
status: requestNode.status,
106104
processDefinitionName: requestNode.processDefinitionName,
@@ -114,7 +112,7 @@ export class TaskListCloudService extends BaseCloudService implements TaskListCl
114112
createdTo: requestNode.createdTo,
115113
dueDateFrom: requestNode.dueDateFrom,
116114
dueDateTo: requestNode.dueDateTo,
117-
variableKeys
115+
processVariableKeys: requestNode.processVariableKeys
118116
};
119117

120118
Object.keys(queryData).forEach((key) => {

0 commit comments

Comments
 (0)