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

Revert "AAE-21967 Use column id to reference process variables (#9604)" (#9613)

Browse Source 
This reverts commit 7ac7db4945.
This commit is contained in:
Ehsan Rezaei
2024-04-26 19:50:45 +02:00
committed by GitHub
parent a03936715a
commit 571fc3dce1
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/process-services-cloud/src/lib/services/variable-mapper.sevice.spec.ts
View File

@@ -32,11 +32,12 @@ describe('VariableMapperService', () => {
const viewModel = service.mapVariablesByColumnTitle([objectWithVariables], [column]); const viewModel = service.mapVariablesByColumnTitle([objectWithVariables], [column]);
expect(viewModel[0].variablesMap[column.id].type).toEqual(expectedColumnType); expect(viewModel[0].variablesMap[column.title].type).toEqual(expectedColumnType);
}; };
beforeEach(() => { beforeEach(() => {
service = new VariableMapperService(); service = new VariableMapperService();
variable = getProcessInstanceVariableMock({ variable = getProcessInstanceVariableMock({
processDefinitionKey: 'processKey', processDefinitionKey: 'processKey',
name: 'variableName' name: 'variableName'
@@ -44,7 +45,6 @@ describe('VariableMapperService', () => {
column = getDataColumnMock<ProcessListDataColumnCustomData>({ column = getDataColumnMock<ProcessListDataColumnCustomData>({
title: 'Column Name', title: 'Column Name',
id: 'columnId',
key: '', key: '',
customData: { customData: {
variableDefinitionsPayload: ['processKey/variableName'], variableDefinitionsPayload: ['processKey/variableName'],
@@ -58,11 +58,11 @@ describe('VariableMapperService', () => {
}; };
}); });
it('should map variables by column id', () => { it('should map variables by column title', () => {
const expectedObjectWithVariableMap = { const expectedObjectWithVariableMap = {
...objectWithVariables, ...objectWithVariables,
variablesMap: { variablesMap: {
[column.id]: variable [column.title]: variable
} }
}; };

37
lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts
View File

@@ -23,7 +23,7 @@ import { DataColumnType } from '@alfresco/adf-extensions';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class VariableMapperService { export class VariableMapperService {
mapVariablesByColumnTitle<T extends { variables?: ProcessInstanceVariable[] }>( mapVariablesByColumnTitle <T extends { variables?: ProcessInstanceVariable[] }>(
instancesList: T[] = [], instancesList: T[] = [],
columnsSchema: DataColumn<ProcessListDataColumnCustomData>[] = [] columnsSchema: DataColumn<ProcessListDataColumnCustomData>[] = []
): Array<WithVariablesMap<T>> { ): Array<WithVariablesMap<T>> {
@@ -34,22 +34,19 @@ export class VariableMapperService {
return instance; return instance;
} }
const variablesMap = (instance.variables ?? []).reduce<{ [columnTitle: string]: ProcessInstanceVariable }>( const variablesMap = (instance.variables ?? []).reduce<{[columnTitle: string]: ProcessInstanceVariable}>((variableAccumulator, variable) => {
(variableAccumulator, variable) => { const processVariableDefinitionPayload = `${variable.processDefinitionKey}/${variable.name}`;
const processVariableDefinitionPayload = `${variable.processDefinitionKey}/${variable.name}`;
const column = columnsByVariables[processVariableDefinitionPayload]; const column = columnsByVariables[processVariableDefinitionPayload];
if (column) { if (column) {
variableAccumulator[column] = { variableAccumulator[column] = {
...variable, ...variable,
type: this.mapProcessVariableTypes(variable.type) type: this.mapProcessVariableTypes(variable.type)
}; };
} }
return variableAccumulator; return variableAccumulator;
}, }, {});
{}
);
return { return {
...instance, ...instance,
@@ -60,16 +57,20 @@ export class VariableMapperService {
return rowsViewModel; return rowsViewModel;
} }
private mapColumnKeysByVariable(columnsSchema: DataColumn<ProcessListDataColumnCustomData>[]): { [key: string]: string } { private mapColumnKeysByVariable(
columnsSchema: DataColumn<ProcessListDataColumnCustomData>[]
): { [key: string]: string } {
const columnsByVariables = columnsSchema const columnsByVariables = columnsSchema
.filter((column) => !!column.customData) .filter(column => !!column.customData)
.reduce<{ [key: string]: string }>((columnsByVariable, column) => { .reduce<{ [key: string]: string }>((columnsByVariable, column) => {
const columnTitle = column.title;
const variables = column.customData.variableDefinitionsPayload; const variables = column.customData.variableDefinitionsPayload;
variables.forEach((key) => { variables.forEach((key) => {
columnsByVariable[key] = column.id; columnsByVariable[key] = columnTitle;
}); });
return columnsByVariable; return columnsByVariable;
}, {}); }, {});
return columnsByVariables; return columnsByVariables;