From 11b4f5186bacd688660b2b8c70ee739e69e0cc87 Mon Sep 17 00:00:00 2001 From: Tomasz Gnyp <49343696+tomgny@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:36:11 +0200 Subject: [PATCH] [AAE-16969] Remove force casting of all types to text (#8963) --- .../data-table-adapter.widget.spec.ts | 11 +---------- .../data-table/data-table-adapter.widget.ts | 6 ------ .../lib/form/mocks/data-table-widget.mock.ts | 17 ----------------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.spec.ts index cc776ea6e8..460e56a424 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.spec.ts @@ -20,8 +20,7 @@ import { mockEuropeCountriesData, mockCountriesIncorrectData, mockInvalidSchemaDefinition, - mockSchemaDefinition, - mockSchemaDefinitionWithDifferentTypes + mockSchemaDefinition } from '../../../mocks/data-table-widget.mock'; import { ObjectDataRow } from '@alfresco/adf-core'; @@ -32,14 +31,6 @@ describe('WidgetDataTableAdapter', () => { widgetDataTableAdapter = new WidgetDataTableAdapter(mockEuropeCountriesData, mockSchemaDefinition); }); - it('should set columns type to "text" during initialization', () => { - widgetDataTableAdapter = new WidgetDataTableAdapter(mockEuropeCountriesData, mockSchemaDefinitionWithDifferentTypes); - - widgetDataTableAdapter.getColumns().forEach(column => - expect(column.type).toBe('text') - ); - }); - it('should return rows if all columns are linked to data', () => { const rows = widgetDataTableAdapter.getRows(); diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.ts index f87a5af764..26d5201f31 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table-adapter.widget.ts @@ -30,8 +30,6 @@ export class WidgetDataTableAdapter extends ObjectDataTableAdapter { super(data, schema); this.rows = super.getRows(); this.columns = super.getColumns(); - - this.setColumnsTypeToText(); } getRows(): DataRow[] { @@ -55,8 +53,4 @@ export class WidgetDataTableAdapter extends ObjectDataTableAdapter { return availableColumnKeys.every(columnKey => this.rows.some(row => Object.keys(row.obj).includes(columnKey))); } - - private setColumnsTypeToText(): void { - super.setColumns(this.columns.map(column => ({ ...column, type: 'text' }))); - } } diff --git a/lib/process-services-cloud/src/lib/form/mocks/data-table-widget.mock.ts b/lib/process-services-cloud/src/lib/form/mocks/data-table-widget.mock.ts index 85c3cd41d6..ba06c4696f 100644 --- a/lib/process-services-cloud/src/lib/form/mocks/data-table-widget.mock.ts +++ b/lib/process-services-cloud/src/lib/form/mocks/data-table-widget.mock.ts @@ -35,23 +35,6 @@ export const mockSchemaDefinition: DataColumn[] = [ } ]; -export const mockSchemaDefinitionWithDifferentTypes: DataColumn[] = [ - { - type: 'json', - key: 'id', - title: 'Country ID', - sortable: true, - draggable: true - }, - { - type: 'date', - key: 'name', - title: 'Country Name', - sortable: true, - draggable: true - } -]; - export const mockInvalidSchemaDefinition: DataColumn[] = [ { type: 'text',