inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

AAE-28333 Fix search process variabels payload for new API (#10387)

Browse Source 
* AAE-28333 Fix search process variabels payload for new API

* fix units
This commit is contained in:
Bartosz Sekula
2024-11-13 05:36:04 -05:00
committed by GitHub
parent 9520b2a4e5
commit 0063d83044
7 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ export class TaskListRequestModel {
candidateGroupId?: string[]; candidateGroupId?: string[];
taskVariableFilters?: TaskListRequestTaskVariableFilter[]; taskVariableFilters?: TaskListRequestTaskVariableFilter[];
variableKeys?: string[]; processVariableKeys?: string[];
constructor(obj: Partial<TaskListRequestModel>) { constructor(obj: Partial<TaskListRequestModel>) {
if (!obj.appName) { if (!obj.appName) {
@@ -161,7 +161,7 @@ export class TaskListRequestModel {
this.candidateUserId = obj.candidateUserId; this.candidateUserId = obj.candidateUserId;
this.candidateGroupId = obj.candidateGroupId; this.candidateGroupId = obj.candidateGroupId;
this.taskVariableFilters = obj.taskVariableFilters; this.taskVariableFilters = obj.taskVariableFilters;
this.variableKeys = obj.variableKeys; this.processVariableKeys = obj.processVariableKeys;
} }
} }

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

@@ -543,7 +543,7 @@ describe('ProcessListCloudComponent', () => {
component.ngAfterContentInit(); component.ngAfterContentInit();
component.reload(); 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', () => { it('should request process variable if column for process variable is displayed', () => {
@@ -568,7 +568,7 @@ describe('ProcessListCloudComponent', () => {
component.ngAfterContentInit(); component.ngAfterContentInit();
component.reload(); 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) => { it('should reload tasks when reload() is called', (done) => {

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

@@ -543,7 +543,7 @@ export class ProcessListCloudComponent extends DataTableSchema<ProcessListDataCo
completedTo: this.completedTo, completedTo: this.completedTo,
suspendedFrom: this.suspendedFrom, suspendedFrom: this.suspendedFrom,
suspendedTo: this.suspendedTo, suspendedTo: this.suspendedTo,
variableKeys: this.getVariableDefinitionsRequestModel() processVariableKeys: this.getVariableDefinitionsRequestModel()
}; };
return new ProcessListRequestModel(requestNode); return new ProcessListRequestModel(requestNode);

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

@@ -106,7 +106,7 @@ export class ProcessListRequestModel {
suspendedTo?: string; suspendedTo?: string;
processVariableFilters?: ProcessListRequestProcessVariableFilter[]; processVariableFilters?: ProcessListRequestProcessVariableFilter[];
variableKeys?: string[]; processVariableKeys?: string[];
constructor(obj: Partial<ProcessListRequestModel>) { constructor(obj: Partial<ProcessListRequestModel>) {
if (!obj.appName) { if (!obj.appName) {
@@ -129,7 +129,7 @@ export class ProcessListRequestModel {
this.completedTo = obj.completedTo; this.completedTo = obj.completedTo;
this.suspendedFrom = obj.suspendedFrom; this.suspendedFrom = obj.suspendedFrom;
this.suspendedTo = obj.suspendedTo; this.suspendedTo = obj.suspendedTo;
this.variableKeys = obj.variableKeys; this.processVariableKeys = obj.processVariableKeys;
} }
} }

4
lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts
View File

@@ -102,8 +102,6 @@ export class ProcessListCloudService extends BaseCloudService {
} }
protected buildQueryData(requestNode: ProcessListRequestModel) { protected buildQueryData(requestNode: ProcessListRequestModel) {
const variableKeys = requestNode.variableKeys?.length > 0 ? requestNode.variableKeys.join(',') : undefined;
const queryData: any = { const queryData: any = {
name: requestNode.name, name: requestNode.name,
initiator: requestNode.initiator, initiator: requestNode.initiator,
@@ -117,7 +115,7 @@ export class ProcessListCloudService extends BaseCloudService {
completedTo: requestNode.completedTo, completedTo: requestNode.completedTo,
suspendedFrom: requestNode.suspendedFrom, suspendedFrom: requestNode.suspendedFrom,
suspendedTo: requestNode.suspendedTo, suspendedTo: requestNode.suspendedTo,
variableKeys: variableKeys processVariableKeys: requestNode.processVariableKeys
}; };
Object.keys(queryData).forEach((key) => { Object.keys(queryData).forEach((key) => {

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

@@ -280,7 +280,7 @@ export class TaskListCloudComponent extends BaseTaskListCloudComponent<ProcessLi
dueDateTo: this.dueDateTo, dueDateTo: this.dueDateTo,
completedFrom: this.completedFrom, completedFrom: this.completedFrom,
completedTo: this.completedTo, completedTo: this.completedTo,
variableKeys: this.getRequestNodeVariables() processVariableKeys: this.getRequestNodeVariables()
}; };
return new TaskListRequestModel(requestNode); return new TaskListRequestModel(requestNode);

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

@@ -99,8 +99,6 @@ export class TaskListCloudService extends BaseCloudService implements TaskListCl
} }
protected buildQueryData(requestNode: TaskListRequestModel) { protected buildQueryData(requestNode: TaskListRequestModel) {
const variableKeys = requestNode.variableKeys?.length > 0 ? requestNode.variableKeys.join(',') : undefined;
const queryData: any = { const queryData: any = {
status: requestNode.status, status: requestNode.status,
processDefinitionName: requestNode.processDefinitionName, processDefinitionName: requestNode.processDefinitionName,
@@ -114,7 +112,7 @@ export class TaskListCloudService extends BaseCloudService implements TaskListCl
createdTo: requestNode.createdTo, createdTo: requestNode.createdTo,
dueDateFrom: requestNode.dueDateFrom, dueDateFrom: requestNode.dueDateFrom,
dueDateTo: requestNode.dueDateTo, dueDateTo: requestNode.dueDateTo,
variableKeys processVariableKeys: requestNode.processVariableKeys
}; };
Object.keys(queryData).forEach((key) => { Object.keys(queryData).forEach((key) => {