diff --git a/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.spec.ts b/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.spec.ts index f214c148108..d1887f15b34 100644 --- a/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.spec.ts +++ b/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.spec.ts @@ -32,11 +32,12 @@ describe('VariableMapperService', () => { 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(() => { service = new VariableMapperService(); + variable = getProcessInstanceVariableMock({ processDefinitionKey: 'processKey', name: 'variableName' @@ -44,7 +45,6 @@ describe('VariableMapperService', () => { column = getDataColumnMock({ title: 'Column Name', - id: 'columnId', key: '', customData: { 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 = { ...objectWithVariables, variablesMap: { - [column.id]: variable + [column.title]: variable } }; diff --git a/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts b/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts index 5792bb1d1fb..99f31bb6513 100644 --- a/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts +++ b/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts @@ -23,7 +23,7 @@ import { DataColumnType } from '@alfresco/adf-extensions'; @Injectable({ providedIn: 'root' }) export class VariableMapperService { - mapVariablesByColumnTitle( + mapVariablesByColumnTitle ( instancesList: T[] = [], columnsSchema: DataColumn[] = [] ): Array> { @@ -34,22 +34,19 @@ export class VariableMapperService { return instance; } - const variablesMap = (instance.variables ?? []).reduce<{ [columnTitle: string]: ProcessInstanceVariable }>( - (variableAccumulator, variable) => { - const processVariableDefinitionPayload = `${variable.processDefinitionKey}/${variable.name}`; + const variablesMap = (instance.variables ?? []).reduce<{[columnTitle: string]: ProcessInstanceVariable}>((variableAccumulator, variable) => { + const processVariableDefinitionPayload = `${variable.processDefinitionKey}/${variable.name}`; - const column = columnsByVariables[processVariableDefinitionPayload]; - if (column) { - variableAccumulator[column] = { - ...variable, - type: this.mapProcessVariableTypes(variable.type) - }; - } + const column = columnsByVariables[processVariableDefinitionPayload]; + if (column) { + variableAccumulator[column] = { + ...variable, + type: this.mapProcessVariableTypes(variable.type) + }; + } - return variableAccumulator; - }, - {} - ); + return variableAccumulator; + }, {}); return { ...instance, @@ -60,16 +57,20 @@ export class VariableMapperService { return rowsViewModel; } - private mapColumnKeysByVariable(columnsSchema: DataColumn[]): { [key: string]: string } { + private mapColumnKeysByVariable( + columnsSchema: DataColumn[] + ): { [key: string]: string } { const columnsByVariables = columnsSchema - .filter((column) => !!column.customData) + .filter(column => !!column.customData) .reduce<{ [key: string]: string }>((columnsByVariable, column) => { + const columnTitle = column.title; const variables = column.customData.variableDefinitionsPayload; variables.forEach((key) => { - columnsByVariable[key] = column.id; + columnsByVariable[key] = columnTitle; }); return columnsByVariable; + }, {}); return columnsByVariables;