Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ACA-3368] Update datatable columns when presetColumn schema changes #5732

Merged
merged 4 commits into from
May 29, 2020
Merged

[ACA-3368] Update datatable columns when presetColumn schema changes #5732

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
924fd6c
[ACA-3368] Update datatable columns when presetColumn schema changes
May 27, 2020
0ec5648
[ACA-3368] Add presetColumn change detection for task list
May 28, 2020
4349980
[ACA-3368] Improve unit tests, fix comments
May 28, 2020
f0a6c64
[ACA-3368] More unit test improvements
May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/core/datatable/components/datatable/datatable.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,18 @@ describe('DataTable', () => {
expect(dataTable.data.getRows().length).toEqual(2);
expect(dataTable.resolverFn).toHaveBeenCalledTimes(4);
});

it('should update data columns when columns input changes', () => {
dataTable.data = new ObjectDataTableAdapter(
[{ id: 'fake-data' }],
[new ObjectDataColumn({ key: 'id' })]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use column-1 column-2 to make clear what we are testing?

);

const columnsChange = new SimpleChange(null, [{ key: 'fake-key' }], false);
dataTable.ngOnChanges({ 'columns': columnsChange });
const expectedDataColumns = [new ObjectDataColumn({ key: 'fake-key' })];
expect(dataTable.data.getColumns()).toEqual(expectedDataColumns);
});
});

describe('Accesibility', () => {
Expand Down
25 changes: 24 additions & 1 deletion lib/core/datatable/components/datatable/datatable.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { DataTableAdapter } from '../../data/datatable-adapter';
import { DataTableRowComponent } from './datatable-row.component';

import { ObjectDataRow } from '../../data/object-datarow.model';
import { ObjectDataColumn } from '../../data/object-datacolumn.model';
import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter';
import { DataCellEvent } from './data-cell.event';
import { DataRowActionEvent } from './data-row-action.event';
Expand Down Expand Up @@ -244,6 +245,15 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
return;
}

if (this.isPropertyChanged(changes['columns'])) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we rewrite it like

if (this.isPropertyChanged(changes['rows'] || this.isPropertyChanged(changes['columns'])) {
           if (this.isTableEmpty()) {
               this.initTable();
           } 
           if (this.isPropertyChanged(changes['rows']) {
               this.setTableRows(changes['rows'].currentValue);
           } else {
              this.setTableColumns(changes['columns'].currentValue);
           }
           return;
       }

if (this.isTableEmpty()) {
this.initTable();
} else {
this.setTableColumns(changes['columns'].currentValue);
}
return;
}

if (changes.selectionMode && !changes.selectionMode.isFirstChange()) {
this.resetSelection();
this.emitRowSelectionEvent('row-unselect', null);
Expand Down Expand Up @@ -280,6 +290,10 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
return rows.map((row) => new ObjectDataRow(row, row.isSelected));
}

convertToColumnsData(columns: any []): ObjectDataColumn[] {
return columns.map((column) => new ObjectDataColumn(column));
}

convertToDataSorting(sorting: any[]): DataSorting | null {
if (sorting && sorting.length > 0) {
return new DataSorting(sorting[0], sorting[1]);
Expand Down Expand Up @@ -366,7 +380,16 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
private setTableRows(rows: any[]) {
if (this.data) {
this.resetSelection();
this.data.setRows(this.convertToRowsData(rows));
const rowsData = this.convertToRowsData(rows);
this.data.setRows(rowsData);
}
}

private setTableColumns(columns: any[]) {
if (this.data) {
this.resetSelection();
const columnsData = this.convertToColumnsData(columns);
this.data.setColumns(columnsData);
}
}

Expand Down
8 changes: 8 additions & 0 deletions lib/process-services/src/lib/process-list/components/process-list.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,14 @@ describe('ProcessInstanceListComponent', () => {

component.ngOnChanges({'processInstanceId': change});
});

it('should update columns when presetColumn schema changes', () => {
component.ngAfterContentInit();
component.columns = [];
const presetColumnChange = new SimpleChange(null, 'fakeProcessCustomSchema', false);
component.ngOnChanges({ 'presetColumn': presetColumnChange });
expect(component.columns).toEqual(component.mergeJsonAndHtmlSchema());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't get it.
can we have a column preset, i.e. col-1 col-2
we change it and we expect to have col-3 col-4 ?

});
});
});

Expand Down
5 changes: 5 additions & 0 deletions lib/process-services/src/lib/process-list/components/process-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ export class ProcessInstanceListComponent extends DataTableSchema implements OnC
}
this.reload();
}

const presetColumnChanges = changes['presetColumn'];
if (presetColumnChanges && !presetColumnChanges.firstChange) {
this.columns = this.mergeJsonAndHtmlSchema();
}
}

private isSortChanged(changes: SimpleChanges): boolean {
Expand Down
8 changes: 8 additions & 0 deletions lib/process-services/src/lib/task-list/components/task-list.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,14 @@ describe('TaskListComponent', () => {
responseText: JSON.stringify(fakeGlobalTask)
});
});

it('should update columns when presetColumn schema changes', () => {
component.ngAfterContentInit();
component.columns = [];
const presetColumnChange = new SimpleChange(null, 'fakeCustomSchema', false);
component.ngOnChanges({ 'presetColumn': presetColumnChange });
expect(component.columns).toEqual(component.mergeJsonAndHtmlSchema());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as before

});
});

it('should show the updated list when pagination changes', async(() => {
Expand Down
5 changes: 5 additions & 0 deletions lib/process-services/src/lib/task-list/components/task-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,11 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
}
this.reload();
}

const presetColumnChanges = changes['presetColumn'];
if (presetColumnChanges && !presetColumnChanges.firstChange) {
this.columns = this.mergeJsonAndHtmlSchema();
}
}

private isSortChanged(changes: SimpleChanges): boolean {
Expand Down