13507117968

Committed 24 Feb 2025 08:23PM UTC coverage: 85.576% (+1.1%) from 84.467%

Build # 13507117968

Build Type

Pull #1120

github

Committed by

web-flow

Commit Message

Merge 90ab2bb22 into 77e75b46a

Pull Request Pull Request #1120: Datahub: Add pagination for table component

Run Details

1358 of 1755 branches covered (77.38%)

Branch coverage included in aggregate %.

105 of 120 new or added lines in 8 files covered. (87.5%)

15 existing lines in 1 file now uncovered.

3851 of 4332 relevant lines covered (88.9%)

245.29 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

76.67

/libs/ui/dataviz/src/lib/data-table/data-table.component.ts

import { ScrollingModule } from '@angular/cdk/scrolling'
import {
  AfterViewInit,
  ChangeDetectionStrategy,
  ChangeDetectorRef,
  Component,
  ElementRef,
  EventEmitter,
  Input,
  OnChanges,
  OnInit,
  Output,
  ViewChild,
} from '@angular/core'
import { MatSort, MatSortModule } from '@angular/material/sort'
import { MatTableModule } from '@angular/material/table'
import { TranslateModule, TranslateService } from '@ngx-translate/core'
import { DataTableDataSource } from './data-table.data.source'
import { BaseReader, FetchError } from '@geonetwork-ui/data-fetcher'
import {
  MatPaginator,
  MatPaginatorIntl,
  MatPaginatorModule,
} from '@angular/material/paginator'
import { CustomMatPaginatorIntl } from './custom.mat.paginator.intl'
import { CommonModule } from '@angular/common'
import { BehaviorSubject, filter, firstValueFrom } from 'rxjs'
import {
  LoadingMaskComponent,
  PopupAlertComponent,
} from '@geonetwork-ui/ui/widgets'
import { LetDirective } from '@ngrx/component'

const rowIdPrefix = 'table-item-'

export type TableItemId = string | number
type TableItemType = string | number | Date

export interface TableItemModel {
  id: TableItemId
  [key: string]: TableItemType
}

@Component({
  standalone: true,
  imports: [
    MatTableModule,
    MatSortModule,
    MatPaginatorModule,
    ScrollingModule,
    TranslateModule,
    CommonModule,
    LoadingMaskComponent,
    PopupAlertComponent,
    LetDirective,
  ],
  providers: [{ provide: MatPaginatorIntl, useClass: CustomMatPaginatorIntl }],
  selector: 'gn-ui-data-table',
  templateUrl: './data-table.component.html',
  styleUrls: ['./data-table.component.css'],
  changeDetection: ChangeDetectionStrategy.OnPush,
})
export class DataTableComponent implements OnInit, AfterViewInit, OnChanges {
  @Input() set dataset(value: BaseReader) {
    this.properties$.next(null)
    this.dataset_ = value
    this.dataset_.load()
    this.dataset_.properties.then((properties) =>
      this.properties$.next(properties.map((p) => p.name))
    )
    this.dataset_.info.then((info) => (this.count = info.itemsCount))
  }
  @Input() activeId: TableItemId
  @Output() selected = new EventEmitter<any>()

  @ViewChild(MatSort) sort: MatSort
  @ViewChild(MatPaginator) paginator: MatPaginator

  dataset_: BaseReader
  properties$ = new BehaviorSubject<string[]>(null)
  dataSource: DataTableDataSource
  headerHeight: number
  count: number
  loading$ = new BehaviorSubject<boolean>(false)
  error = null

  constructor(
    private eltRef: ElementRef,
    private cdr: ChangeDetectorRef,
    private translateService: TranslateService
  ) {}

  ngOnInit() {
    this.dataSource = new DataTableDataSource()
  }

  ngAfterViewInit() {
    this.headerHeight =
      this.eltRef.nativeElement.querySelector('thead').offsetHeight
    this.setPagination()
    this.cdr.detectChanges()
  }

  ngOnChanges() {
    this.setPagination()
  }

  setSort(sort: MatSort) {
    if (!this.dataset_) return
    if (!sort.active) {
      this.dataset_.orderBy()
    } else {
      this.dataset_.orderBy([sort.direction || 'asc', sort.active])
    }
    this.readData()
  }

  setPagination() {
    if (!this.paginator) return
    if (!this.dataset_) return
    this.dataset_.limit(
      this.paginator.pageIndex * this.paginator.pageSize,
      this.paginator.pageSize
    )
    this.readData()
  }

  async readData() {
    this.loading$.next(true)
    // wait for properties to be read
    const properties = await firstValueFrom(
      this.properties$.pipe(filter((p) => !!p))
    )
    const propsWithoutGeom = properties.filter(
      (p) => !p.toLowerCase().startsWith('geom')
    )
    this.dataset_.select(...propsWithoutGeom)
    try {
      await this.dataSource.showData(this.dataset_.read())
      this.error = null
    } catch (error) {
      this.handleError(error as FetchError | Error | string)
    }
    this.loading$.next(false)
  }

  scrollToItem(itemId: TableItemId): void {
    const row = this.eltRef.nativeElement.querySelector(
      `#${this.getRowEltId(itemId)}`
    )
    this.eltRef.nativeElement.scrollTop = row.offsetTop - this.headerHeight
  }

  public getRowEltId(id: TableItemId): string {
    return rowIdPrefix + id
  }

  handleError(error: FetchError | Error | string) {
    this.dataSource.clearData()
    if (error instanceof FetchError) {
      this.error = this.translateService.instant(
        `dataset.error.${error.type}`,
        {
          info: error.info,
        }
      )
      console.warn(error.message)
    } else if (error instanceof Error) {
      this.error = this.translateService.instant(error.message)
      console.warn(error.stack || error)
    } else {
      this.error = this.translateService.instant(error)
      console.warn(error)
    }
  }
}

1	import { ScrollingModule } from '@angular/cdk/scrolling'	1✔
2	import {	1✔
3	AfterViewInit,
4	ChangeDetectionStrategy,
5	ChangeDetectorRef,
6	Component,
7	ElementRef,
8	EventEmitter,
9	Input,
10	OnChanges,
11	OnInit,
12	Output,
13	ViewChild,
14	} from '@angular/core'
15	import { MatSort, MatSortModule } from '@angular/material/sort'	1✔
16	import { MatTableModule } from '@angular/material/table'	1✔
17	import { TranslateModule, TranslateService } from '@ngx-translate/core'	1✔
18	import { DataTableDataSource } from './data-table.data.source'	1✔
19	import { BaseReader, FetchError } from '@geonetwork-ui/data-fetcher'	1✔
20	import {	1✔
21	MatPaginator,
22	MatPaginatorIntl,
23	MatPaginatorModule,
24	} from '@angular/material/paginator'
25	import { CustomMatPaginatorIntl } from './custom.mat.paginator.intl'	1✔
26	import { CommonModule } from '@angular/common'	1✔
27	import { BehaviorSubject, filter, firstValueFrom } from 'rxjs'	1✔
28	import {	1✔
29	LoadingMaskComponent,
30	PopupAlertComponent,
31	} from '@geonetwork-ui/ui/widgets'
32	import { LetDirective } from '@ngrx/component'	1✔
33
34	const rowIdPrefix = 'table-item-'	1✔
35
36	export type TableItemId = string \| number
37	type TableItemType = string \| number \| Date
38
39	export interface TableItemModel {
40	id: TableItemId
41	[key: string]: TableItemType
42	}
43
44	@Component({
45	standalone: true,
46	imports: [
47	MatTableModule,
48	MatSortModule,
49	MatPaginatorModule,
50	ScrollingModule,
51	TranslateModule,
52	CommonModule,
53	LoadingMaskComponent,
54	PopupAlertComponent,
55	LetDirective,
56	],
57	providers: [{ provide: MatPaginatorIntl, useClass: CustomMatPaginatorIntl }],
58	selector: 'gn-ui-data-table',
59	templateUrl: './data-table.component.html',
60	styleUrls: ['./data-table.component.css'],
61	changeDetection: ChangeDetectionStrategy.OnPush,
62	})
63	export class DataTableComponent implements OnInit, AfterViewInit, OnChanges {	1✔
64	@Input() set dataset(value: BaseReader) {
65	this.properties$.next(null)	16✔
66	this.dataset_ = value	16✔
67	this.dataset_.load()	16✔
68	this.dataset_.properties.then((properties) =>	16✔
69	this.properties$.next(properties.map((p) => p.name))	48✔
70	)
71	this.dataset_.info.then((info) => (this.count = info.itemsCount))	16✔
72	}
73	@Input() activeId: TableItemId
74	@Output() selected = new EventEmitter<any>()	14✔
75
76	@ViewChild(MatSort) sort: MatSort
77	@ViewChild(MatPaginator) paginator: MatPaginator
78
79	dataset_: BaseReader
80	properties$ = new BehaviorSubject<string[]>(null)	14✔
81	dataSource: DataTableDataSource
82	headerHeight: number
83	count: number
84	loading$ = new BehaviorSubject<boolean>(false)	14✔
85	error = null	14✔
86
87	constructor(
88	private eltRef: ElementRef,	14!
89	private cdr: ChangeDetectorRef,	14!
90	private translateService: TranslateService	14✔
91	) {}
92
93	ngOnInit() {
94	this.dataSource = new DataTableDataSource()	14✔
95	}
96
97	ngAfterViewInit() {
98	this.headerHeight =	13✔
99	this.eltRef.nativeElement.querySelector('thead').offsetHeight
100	this.setPagination()	13✔
101	this.cdr.detectChanges()	13✔
102	}
103
104	ngOnChanges() {
NEW 105	this.setPagination()	×
106	}
107
108	setSort(sort: MatSort) {
109	if (!this.dataset_) return	1!
110	if (!sort.active) {	1!
NEW 111	this.dataset_.orderBy()	×
112	} else {
113	this.dataset_.orderBy([sort.direction \|\| 'asc', sort.active])	1!
114	}
115	this.readData()	1✔
116	}
117
118	setPagination() {
119	if (!this.paginator) return	15!
120	if (!this.dataset_) return	15!
121	this.dataset_.limit(	15✔
122	this.paginator.pageIndex * this.paginator.pageSize,
123	this.paginator.pageSize
124	)
125	this.readData()	15✔
126	}
127
128	async readData() {
129	this.loading$.next(true)	17✔
130	// wait for properties to be read
131	const properties = await firstValueFrom(	17✔
132	this.properties$.pipe(filter((p) => !!p))	19✔
133	)
134	const propsWithoutGeom = properties.filter(	17✔
135	(p) => !p.toLowerCase().startsWith('geom')	51✔
136	)
137	this.dataset_.select(...propsWithoutGeom)	17✔
138	try {	17✔
139	await this.dataSource.showData(this.dataset_.read())	17✔
140	this.error = null	16✔
141	} catch (error) {
142	this.handleError(error as FetchError \| Error \| string)	1✔
143	}
144	this.loading$.next(false)	17✔
145	}
146
147	scrollToItem(itemId: TableItemId): void {
NEW 148	const row = this.eltRef.nativeElement.querySelector(	×
149	`#${this.getRowEltId(itemId)}`
150	)
NEW 151	this.eltRef.nativeElement.scrollTop = row.offsetTop - this.headerHeight	×
152	}
153
154	public getRowEltId(id: TableItemId): string {
NEW 155	return rowIdPrefix + id	×
156	}
157
158	handleError(error: FetchError \| Error \| string) {
159	this.dataSource.clearData()	1✔
160	if (error instanceof FetchError) {	1!
NEW 161	this.error = this.translateService.instant(	×
162	`dataset.error.${error.type}`,
163	{
164	info: error.info,
165	}
166	)
NEW 167	console.warn(error.message)	×
168	} else if (error instanceof Error) {	1!
NEW 169	this.error = this.translateService.instant(error.message)	×
NEW 170	console.warn(error.stack \|\| error)	×
171	} else {
172	this.error = this.translateService.instant(error)	1✔
173	console.warn(error)	1✔
174	}
175	}
176	}

geonetwork / geonetwork-ui / 13507117968

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous