Skip to content

fix: fix table scrolling and loading issues #309

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

Merged
merged 2 commits into from
Nov 2, 2020
Merged

fix: fix table scrolling and loading issues #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6978e41
fix: fix table scrolling and loading issues
anandtiwary Oct 30, 2020
d263eef
Merge branch 'main' into table-scroll-fix
anandtiwary Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions projects/components/src/table/data/table-cdk-data-source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ export class TableCdkDataSource implements DataSource<TableRow> {
private readonly cachedValues: Map<string, unknown[]> = new Map<string, unknown[]>();
private lastRowChange: StatefulTableRow | undefined;
private readonly rowsChange$: Subject<StatefulTableRow[]> = new Subject<StatefulTableRow[]>();
private readonly loadingStateSubject: Subject<Observable<StatefulTableRow[]>> = new Subject<
Observable<StatefulTableRow[]>
>();
public loadingStateChange$: Observable<Observable<StatefulTableRow[]>> = this.loadingStateSubject.asObservable();
private readonly loadingStateSubject: Subject<TableLoadingState> = new Subject<TableLoadingState>();

public loadingStateChange$: Observable<TableLoadingState> = this.loadingStateSubject.asObservable();

public constructor(
private readonly tableDataSourceProvider: TableDataSourceProvider,
Expand All @@ -54,7 +53,7 @@ export class TableCdkDataSource implements DataSource<TableRow> {
public connect(): Observable<ReadonlyArray<TableRow>> {
this.buildChangeObservable()
.pipe(
tap(() => this.loadingStateSubject.next(NEVER)),
tap(() => this.loadingStateSubject.next({ loading$: NEVER })),
mergeMap(([columnConfigs, pageEvent, filters, changedColumn, changedRow]) =>
this.buildDataObservable(columnConfigs, pageEvent, filters, changedColumn, changedRow)
)
Expand All @@ -64,7 +63,7 @@ export class TableCdkDataSource implements DataSource<TableRow> {
return this.rowsChange$.pipe(
tap(rows => this.cacheRows(rows)),
tap(rows => this.cacheFilterableValues(rows)),
tap(rows => this.loadingStateSubject.next(of(rows)))
tap(rows => this.loadingStateSubject.next({ loading$: of(rows), hide: rows.length > 1 }))
);
}

Expand Down Expand Up @@ -264,7 +263,7 @@ export class TableCdkDataSource implements DataSource<TableRow> {
: rows
),
catchError(error => {
this.loadingStateSubject.next(throwError(error));
this.loadingStateSubject.next({ loading$: throwError(error) });

return [];
})
Expand Down Expand Up @@ -324,3 +323,8 @@ export class TableCdkDataSource implements DataSource<TableRow> {
}
}
}

export interface TableLoadingState {
loading$: Observable<StatefulTableRow[]>;
hide?: boolean;
}
9 changes: 7 additions & 2 deletions projects/components/src/table/table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
@import 'mixins';
@import 'layout';

:host {
.table {
display: flex;
flex-direction: column;
height: 100%;
width: 100%;
position: relative;
}

.title-row {
Expand All @@ -18,6 +19,7 @@

.table {
width: 100%;
flex: 1 1 0;
overflow: auto;
}

Expand Down Expand Up @@ -108,7 +110,10 @@
}

.state-watcher {
flex: 1 1;
height: 100%;
width: 100%;
position: absolute;
background: transparent;
}

.pagination-controls {
Expand Down
207 changes: 110 additions & 97 deletions projects/components/src/table/table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,116 +46,129 @@ import {
} from './table-api';
import { TableColumnConfigExtended, TableService } from './table.service';

// tslint:disable max-file-line-count
// tslint:disable: template-cyclomatic-complexity component-max-inline-declarations max-file-line-count
Copy link
Contributor

Choose a reason for hiding this comment

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

😨

@Component({
selector: 'ht-table',
styleUrls: ['./table.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
template: `
<cdk-table
*ngIf="this.dataSource"
[multiTemplateDataRows]="this.isDetailType()"
[dataSource]="this.dataSource"
[ngClass]="[this.display, this.pageable && this.isTableFullPage ? 'bottom-margin' : '']"
class="table"
>
<!-- Columns -->
<div *ngFor="let columnDef of this.columnConfigs$ | async; trackBy: this.trackItem; index as index">
<ng-container [cdkColumnDef]="columnDef.id">
<cdk-header-cell
*cdkHeaderCellDef
[style.flex-basis]="columnDef.width"
[style.max-width]="columnDef.width"
class="header-cell"
>
<div
*ngIf="index !== 0"
class="header-column-resize-handle"
(mousedown)="this.onResizeMouseDown($event, index)"
<div class="table">
<cdk-table
*ngIf="this.dataSource"
[multiTemplateDataRows]="this.isDetailType()"
[dataSource]="this.dataSource"
[ngClass]="[this.display, this.pageable && this.isTableFullPage ? 'bottom-margin' : '']"
class="table"
>
<!-- Columns -->
<div *ngFor="let columnDef of this.columnConfigs$ | async; trackBy: this.trackItem; index as index">
<ng-container [cdkColumnDef]="columnDef.id">
<cdk-header-cell
*cdkHeaderCellDef
[style.flex-basis]="columnDef.width"
[style.max-width]="columnDef.width"
class="header-cell"
>
<div class="header-column-divider"></div>
</div>
<ht-table-header-cell-renderer
class="header-cell-renderer"
[metadata]="this.metadata"
[columnConfig]="columnDef"
[index]="index"
[sort]="columnDef.sort"
(sortChange)="this.onHeaderCellClick(columnDef)"
<div
*ngIf="index !== 0"
class="header-column-resize-handle"
(mousedown)="this.onResizeMouseDown($event, index)"
>
<div
*ngIf="index !== 0"
class="header-column-resize-handle"
(mousedown)="this.onResizeMouseDown($event, index)"
>
<div class="header-column-divider"></div>
</div>
<ht-table-header-cell-renderer
class="header-cell-renderer"
[metadata]="this.metadata"
[columnConfig]="columnDef"
[index]="index"
[sort]="columnDef.sort"
(sortChange)="this.onHeaderCellClick(columnDef)"
>
</ht-table-header-cell-renderer>
</div>
</cdk-header-cell>
<cdk-cell
*cdkCellDef="let row"
[style.flex-basis]="columnDef.width"
[style.max-width]="columnDef.width"
[style.margin-left]="this.indent(columnDef, row)"
[ngClass]="{
'child-row': this.isChildRow(row),
'expander-column': this.isExpanderColumn(columnDef),
'detail-expanded': this.isDetailExpanded(row)
}"
class="data-cell"
>
</ht-table-header-cell-renderer>
</cdk-header-cell>
<cdk-cell
*cdkCellDef="let row"
[style.flex-basis]="columnDef.width"
[style.max-width]="columnDef.width"
[style.margin-left]="this.indent(columnDef, row)"
[ngClass]="{
'child-row': this.isChildRow(row),
'expander-column': this.isExpanderColumn(columnDef),
'detail-expanded': this.isDetailExpanded(row)
}"
class="data-cell"
>
<ht-table-data-cell-renderer
class="data-cell-renderer"
[metadata]="this.metadata"
[columnConfig]="columnDef"
[index]="this.columnIndex(columnDef, index)"
[rowData]="row"
[cellData]="row[columnDef.id]"
(click)="this.onDataCellClick(row)"
></ht-table-data-cell-renderer>
<ht-table-data-cell-renderer
class="data-cell-renderer"
[metadata]="this.metadata"
[columnConfig]="columnDef"
[index]="this.columnIndex(columnDef, index)"
[rowData]="row"
[cellData]="row[columnDef.id]"
(click)="this.onDataCellClick(row)"
></ht-table-data-cell-renderer>
</cdk-cell>
</ng-container>
</div>

<!-- Expandable Detail Column -->
<ng-container [cdkColumnDef]="this.expandedDetailColumnConfig.id" *ngIf="this.isDetailType()">
<cdk-cell *cdkCellDef="let row" [attr.colspan]="this.columnConfigsSubject.value.length" class="expanded-cell">
<ht-table-expanded-detail-row-cell-renderer
*ngIf="this.isRowExpanded(row)"
[row]="row"
[expanded]="this.isRowExpanded(row)"
[content]="this.detailContent"
></ht-table-expanded-detail-row-cell-renderer>
</cdk-cell>
</ng-container>
</div>

<!-- Expandable Detail Column -->
<ng-container [cdkColumnDef]="this.expandedDetailColumnConfig.id" *ngIf="this.isDetailType()">
<cdk-cell *cdkCellDef="let row" [attr.colspan]="this.columnConfigsSubject.value.length" class="expanded-cell">
<ht-table-expanded-detail-row-cell-renderer
*ngIf="this.isRowExpanded(row)"
[row]="row"
[expanded]="this.isRowExpanded(row)"
[content]="this.detailContent"
></ht-table-expanded-detail-row-cell-renderer>
</cdk-cell>
</ng-container>
<!-- Header Row -->
<ng-container *ngIf="this.isShowHeader()">
<cdk-header-row *cdkHeaderRowDef="this.visibleColumns()" class="header-row"></cdk-header-row>
</ng-container>

<!-- Header Row -->
<ng-container *ngIf="this.isShowHeader()">
<cdk-header-row *cdkHeaderRowDef="this.visibleColumns()" class="header-row"></cdk-header-row>
</ng-container>
<!-- Data Rows -->
<cdk-row
*cdkRowDef="let row; columns: this.visibleColumns()"
(mouseenter)="this.onDataRowMouseEnter(row)"
(mouseleave)="this.onDataRowMouseLeave()"
[ngClass]="{ 'selected-row': this.shouldHighlightRowAsSelection(row), 'hovered-row': this.isHoveredRow(row) }"
class="data-row"
></cdk-row>

<!-- Expandable Detail Rows -->
<ng-container *ngIf="this.isDetailType()">
<cdk-row *cdkRowDef="let row; columns: [this.expandedDetailColumnConfig.id]" class="expandable-row"></cdk-row>
</ng-container>
</cdk-table>

<!-- Data Rows -->
<cdk-row
*cdkRowDef="let row; columns: this.visibleColumns()"
(mouseenter)="this.onDataRowMouseEnter(row)"
(mouseleave)="this.onDataRowMouseLeave()"
[ngClass]="{ 'selected-row': this.shouldHighlightRowAsSelection(row), 'hovered-row': this.isHoveredRow(row) }"
class="data-row"
></cdk-row>

<!-- Expandable Detail Rows -->
<ng-container *ngIf="this.isDetailType()">
<cdk-row *cdkRowDef="let row; columns: [this.expandedDetailColumnConfig.id]" class="expandable-row"></cdk-row>
<!-- State Watcher -->
<ng-container *ngIf="this.dataSource?.loadingStateChange$ | async as loadingState">
<div class="state-watcher" *ngIf="!loadingState.hide">
<ng-container class="state-watcher" *htLoadAsync="loadingState.loading$"></ng-container>
</div>
</ng-container>
</cdk-table>

<!-- State Watcher -->
<div class="state-watcher">
<ng-container class="state-watcher" *htLoadAsync="this.dataSource?.loadingStateChange$ | async"></ng-container>
</div>

<!-- Pagination -->
<div class="pagination-controls" *ngIf="this.pageable" [style.position]="this.isTableFullPage ? 'fixed' : 'sticky'">
<ht-paginator
*htLetAsync="this.urlPageData$ as pageData"
(pageChange)="this.onPageChange($event)"
[pageSizeOptions]="this.pageSizeOptions"
[pageSize]="pageData?.pageSize"
[pageIndex]="pageData?.pageIndex"
></ht-paginator>
<!-- Pagination -->
<div
class="pagination-controls"
*ngIf="this.pageable"
[style.position]="this.isTableFullPage ? 'fixed' : 'sticky'"
>
<ht-paginator
*htLetAsync="this.urlPageData$ as pageData"
(pageChange)="this.onPageChange($event)"
[pageSizeOptions]="this.pageSizeOptions"
[pageSize]="pageData?.pageSize"
[pageIndex]="pageData?.pageIndex"
></ht-paginator>
</div>
</div>
`
})
Expand Down
3 changes: 1 addition & 2 deletions projects/observability/src/pages/explorer/explorer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

.visualization-panel {
padding-top: 8px;

.label {
@include body-1-medium;
}
Expand All @@ -31,7 +30,7 @@

.results-panel {
overflow: hidden;

flex: 1 1 auto;
.label {
@include body-1-medium;
}
Expand Down