From 33da1ce58575adf4fc0bddf8f8e3e8c0f4304765 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 28 Sep 2021 17:32:47 +0300 Subject: [PATCH] remove router links --- src/lib/listing/listing-component.directive.ts | 4 ---- src/lib/listing/table/table.component.html | 2 +- src/lib/listing/table/table.component.ts | 6 +----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/lib/listing/listing-component.directive.ts b/src/lib/listing/listing-component.directive.ts index 9d5e45b..571de6d 100644 --- a/src/lib/listing/listing-component.directive.ts +++ b/src/lib/listing/listing-component.directive.ts @@ -21,10 +21,6 @@ export abstract class ListingComponent extends AutoUnsubscr readonly noContent$ = this._noContent$; readonly sortedDisplayedEntities$ = this._sortedDisplayedEntities$; readonly listingMode$: Observable; - /** - * @deprecated Use routerLink getter from IListable - */ - readonly routerLinkFn?: (entity: T) => string | string[]; abstract readonly tableColumnConfigs: readonly TableColumnConfig[]; abstract readonly tableHeaderLabel: string; diff --git a/src/lib/listing/table/table.component.html b/src/lib/listing/table/table.component.html index 7f915fd..54bce21 100644 --- a/src/lib/listing/table/table.component.html +++ b/src/lib/listing/table/table.component.html @@ -28,7 +28,7 @@ (mouseleave)="itemMouseLeaveFn && itemMouseLeaveFn(entity)" *cdkVirtualFor="let entity of listingComponent.sortedDisplayedEntities$ | async" [ngClass]="getTableItemClasses(entity)" - [routerLink]="routerLinkFn && routerLinkFn(entity)" + [routerLink]="entity.routerLink" >
diff --git a/src/lib/listing/table/table.component.ts b/src/lib/listing/table/table.component.ts index b2890a9..458c721 100644 --- a/src/lib/listing/table/table.component.ts +++ b/src/lib/listing/table/table.component.ts @@ -57,10 +57,6 @@ export class TableComponent implements OnInit { return this._parent; } - get routerLinkFn(): ((entity: T) => string | string[]) | undefined { - return this.listingComponent.routerLinkFn; - } - get tableColumnConfigs(): readonly TableColumnConfig[] { return this.listingComponent.tableColumnConfigs; } @@ -82,7 +78,7 @@ export class TableComponent implements OnInit { getTableItemClasses(entity: T): { [key: string]: boolean } { const classes: { [key: string]: boolean } = { 'table-item': true, - pointer: !!this.routerLinkFn && this.routerLinkFn(entity).length > 0 + pointer: !!entity.routerLink && entity.routerLink.length > 0 }; for (const key in this.tableItemClasses) { if (Object.prototype.hasOwnProperty.call(this.tableItemClasses, key)) {