diff --git a/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.spec.ts index 480a4d85a7..7434720f08 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.spec.ts @@ -26,7 +26,7 @@ describe('ProcessListDatatableAdapter', () => { const viewModel: ProcessInstanceCloudListViewModel = { id: '1', variablesMap: { - columnDisplayName1: getProcessInstanceVariableMock({ type: 'number' }) + columnId1: getProcessInstanceVariableMock({ type: 'number' }) } }; @@ -38,7 +38,7 @@ describe('ProcessListDatatableAdapter', () => { }; const column: DataColumn = getDataColumnMock({ - title: 'columnDisplayName1', + id: 'columnId1', customData: { assignedVariableDefinitionIds: ['1'], variableDefinitionsPayload: ['processKey/variableName'], diff --git a/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.ts b/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.ts index cad6c4af74..054d9299ae 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/datatable/process-list-datatable-adapter.ts @@ -20,17 +20,13 @@ import { ProcessListDataColumnCustomData, PROCESS_LIST_CUSTOM_VARIABLE_COLUMN } import { ProcessInstanceCloudListViewModel } from '../models/perocess-instance-cloud-view.model'; export class ProcessListDatatableAdapter extends ObjectDataTableAdapter { - constructor( - data: ProcessInstanceCloudListViewModel[], - schema: DataColumn[] - ) { + constructor(data: ProcessInstanceCloudListViewModel[], schema: DataColumn[]) { super(data, schema); } getColumnType(row: DataRow, col: DataColumn): string { if (col.customData?.columnType === PROCESS_LIST_CUSTOM_VARIABLE_COLUMN) { - const variableDisplayName = col.title; - const columnType = row.obj.variablesMap?.[variableDisplayName]?.type; + const columnType = row.obj.variablesMap?.[col.id]?.type; return columnType ?? 'text'; } 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 d1887f15b3..79ebef8a7f 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,7 +32,7 @@ describe('VariableMapperService', () => { const viewModel = service.mapVariablesByColumnTitle([objectWithVariables], [column]); - expect(viewModel[0].variablesMap[column.title].type).toEqual(expectedColumnType); + expect(viewModel[0].variablesMap[column.id].type).toEqual(expectedColumnType); }; beforeEach(() => { @@ -58,11 +58,11 @@ describe('VariableMapperService', () => { }; }); - it('should map variables by column title', () => { + it('should map variables by column id', () => { const expectedObjectWithVariableMap = { ...objectWithVariables, variablesMap: { - [column.title]: variable + [column.id]: 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 99f31bb651..5792bb1d1f 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,19 +34,22 @@ 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, @@ -57,20 +60,16 @@ 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] = columnTitle; + columnsByVariable[key] = column.id; }); return columnsByVariable; - }, {}); return columnsByVariables; diff --git a/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.spec.ts index d7717f4bc3..59418027cc 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.spec.ts @@ -36,7 +36,7 @@ describe('TasksListDatatableAdapter', () => { const viewModel: TaskInstanceCloudListViewModel = { ...cloudModel, variablesMap: { - columnDisplayName1: processVariable + columnId1: processVariable } }; @@ -48,7 +48,7 @@ describe('TasksListDatatableAdapter', () => { }; const column: DataColumn = getDataColumnMock({ - title: 'columnDisplayName1', + id: 'columnId1', customData: { assignedVariableDefinitionIds: ['variableDefinitionId'], variableDefinitionsPayload: ['processKey/variableName'], diff --git a/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.ts b/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.ts index ad32bb15f1..9255a13df9 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/datatable/task-list-datatable-adapter.ts @@ -20,17 +20,13 @@ import { ProcessListDataColumnCustomData, PROCESS_LIST_CUSTOM_VARIABLE_COLUMN } import { TaskInstanceCloudListViewModel } from '../models/task-cloud-view.model'; export class TasksListDatatableAdapter extends ObjectDataTableAdapter { - constructor( - data: TaskInstanceCloudListViewModel[], - schema: DataColumn[] - ) { + constructor(data: TaskInstanceCloudListViewModel[], schema: DataColumn[]) { super(data, schema); } getColumnType(row: DataRow, col: DataColumn): string { if (col.customData?.columnType === PROCESS_LIST_CUSTOM_VARIABLE_COLUMN) { - const variableDisplayName = col.title; - const columnType = row.obj.variablesMap?.[variableDisplayName]?.type; + const columnType = row.obj.variablesMap?.[col.id]?.type; return columnType ?? 'text'; }