From 5c24018d1265f53ec312ce79f03bbc7af14a53f5 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 31 Mar 2023 13:38:39 +0300 Subject: [PATCH] fix routerLinks for multi tenancy --- src/lib/listing/listing.module.ts | 2 ++ .../table-content/table-content.component.html | 4 ++-- src/lib/tenants/index.ts | 1 + src/lib/tenants/tenant.pipe.ts | 16 ++++++++++++++++ src/lib/utils/tokens.ts | 2 ++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 src/lib/tenants/tenant.pipe.ts diff --git a/src/lib/listing/listing.module.ts b/src/lib/listing/listing.module.ts index bd16572..575ac93 100644 --- a/src/lib/listing/listing.module.ts +++ b/src/lib/listing/listing.module.ts @@ -21,6 +21,7 @@ import { CircleButtonComponent, IconButtonComponent } from '../buttons'; import { MatIconModule } from '@angular/material/icon'; import { EmptyStateComponent } from '../empty-state'; import { InputWithActionComponent, RoundCheckboxComponent } from '../inputs'; +import { TenantPipe } from '../tenants/tenant.pipe'; const matModules = [MatTooltipModule, MatIconModule]; const components = [ @@ -50,6 +51,7 @@ const modules = [DragDropModule, TranslateModule, IqserFiltersModule, ScrollingM RoundCheckboxComponent, InputWithActionComponent, SyncWidthDirective, + TenantPipe, ], }) export class IqserListingModule {} diff --git a/src/lib/listing/table-content/table-content.component.html b/src/lib/listing/table-content/table-content.component.html index af9337d..d2c8ecc 100644 --- a/src/lib/listing/table-content/table-content.component.html +++ b/src/lib/listing/table-content/table-content.component.html @@ -17,7 +17,7 @@ [class.help-mode]="helpModeService?.isHelpModeActive$ | async" [id]="'item-' + entity.id" [ngClass]="getTableItemClasses(entity)" - [routerLink]="entity.routerLink" + [routerLink]="entity.routerLink | tenant" > ('BASE_HREF', { return baseUrl.substring(0, baseUrl.length - 1); } + console.log('Base URL:', baseUrl); + return baseUrl; }, });