Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove router links

Browse Source
This commit is contained in:
Dan Percic 2021-09-28 17:32:47 +03:00
parent 2835c812a1
commit 33da1ce585
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/listing/listing-component.directive.ts
View File

@ -21,10 +21,6 @@ export abstract class ListingComponent<T extends IListable> extends AutoUnsubscr
readonly noContent$ = this._noContent$; readonly noContent$ = this._noContent$;
readonly sortedDisplayedEntities$ = this._sortedDisplayedEntities$; readonly sortedDisplayedEntities$ = this._sortedDisplayedEntities$;
readonly listingMode$: Observable<ListingMode>; readonly listingMode$: Observable<ListingMode>;
/**
* @deprecated Use routerLink getter from IListable
*/
readonly routerLinkFn?: (entity: T) => string | string[];
abstract readonly tableColumnConfigs: readonly TableColumnConfig<T>[]; abstract readonly tableColumnConfigs: readonly TableColumnConfig<T>[];
abstract readonly tableHeaderLabel: string; abstract readonly tableHeaderLabel: string;

2
src/lib/listing/table/table.component.html
View File

@ -28,7 +28,7 @@
(mouseleave)="itemMouseLeaveFn && itemMouseLeaveFn(entity)" (mouseleave)="itemMouseLeaveFn && itemMouseLeaveFn(entity)"
*cdkVirtualFor="let entity of listingComponent.sortedDisplayedEntities$ | async" *cdkVirtualFor="let entity of listingComponent.sortedDisplayedEntities$ | async"
[ngClass]="getTableItemClasses(entity)" [ngClass]="getTableItemClasses(entity)"
[routerLink]="routerLinkFn && routerLinkFn(entity)" [routerLink]="entity.routerLink"
> >
<div (click)="listingComponent.toggleEntitySelected($event, entity)" *ngIf="selectionEnabled" class="selection-column"> <div (click)="listingComponent.toggleEntitySelected($event, entity)" *ngIf="selectionEnabled" class="selection-column">
<iqser-round-checkbox [active]="listingComponent.isSelected(entity)"></iqser-round-checkbox> <iqser-round-checkbox [active]="listingComponent.isSelected(entity)"></iqser-round-checkbox>

6
src/lib/listing/table/table.component.ts
View File

@ -57,10 +57,6 @@ export class TableComponent<T extends IListable> implements OnInit {
return this._parent; return this._parent;
} }
get routerLinkFn(): ((entity: T) => string | string[]) | undefined {
return this.listingComponent.routerLinkFn;
}
get tableColumnConfigs(): readonly TableColumnConfig<T>[] { get tableColumnConfigs(): readonly TableColumnConfig<T>[] {
return this.listingComponent.tableColumnConfigs; return this.listingComponent.tableColumnConfigs;
} }
@ -82,7 +78,7 @@ export class TableComponent<T extends IListable> implements OnInit {
getTableItemClasses(entity: T): { [key: string]: boolean } { getTableItemClasses(entity: T): { [key: string]: boolean } {
const classes: { [key: string]: boolean } = { const classes: { [key: string]: boolean } = {
'table-item': true, 'table-item': true,
pointer: !!this.routerLinkFn && this.routerLinkFn(entity).length > 0 pointer: !!entity.routerLink && entity.routerLink.length > 0
}; };
for (const key in this.tableItemClasses) { for (const key in this.tableItemClasses) {
if (Object.prototype.hasOwnProperty.call(this.tableItemClasses, key)) { if (Object.prototype.hasOwnProperty.call(this.tableItemClasses, key)) {