From 328ed07386b769444b1d2cd2beff64a1a0e86f1a Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 31 Mar 2023 13:39:21 +0300 Subject: [PATCH] RED-6523: fix routerLinks for multi tenancy --- apps/red-ui/src/app/app.module.ts | 2 ++ .../base-screen/base-screen.component.html | 4 ++-- .../breadcrumbs/breadcrumbs.component.html | 4 ++-- apps/red-ui/src/app/modules/admin/admin.module.ts | 2 ++ .../entities-listing-screen.component.html | 2 +- .../admin/screens/watermark/watermark.module.ts | 2 ++ .../watermarks-listing-screen.component.html | 4 ++-- .../admin-side-nav/admin-side-nav.component.html | 2 +- .../admin-side-nav/admin-side-nav.component.ts | 4 ++-- .../dossier-template-breadcrumbs.component.html | 12 ++++++++---- .../dossier-template-breadcrumbs.component.ts | 3 ++- .../workflow-item/workflow-item.component.html | 2 +- .../dossier-overview/dossier-overview.module.ts | 2 ++ .../file-preview/file-preview-screen.component.html | 4 ++-- .../app/modules/file-preview/file-preview.module.ts | 2 ++ .../search-item-template.component.html | 2 +- apps/red-ui/src/app/modules/search/search.module.ts | 3 ++- .../trash-table-item/trash-table-item.component.html | 6 +++++- apps/red-ui/src/app/modules/trash/trash.module.ts | 3 ++- .../src/app/utils/configuration.initializer.ts | 1 + libs/common-ui | 2 +- 21 files changed, 45 insertions(+), 23 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 65adfd2ba..d296b2e47 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -31,6 +31,7 @@ import { ServerErrorInterceptor, SkeletonComponent, StopPropagationDirective, + TenantPipe, TenantsModule, ToastComponent, } from '@iqser/common-ui'; @@ -173,6 +174,7 @@ export const appModuleFactory = (config: AppConfig) => { IqserDenyDirective, IqserListingModule, IconButtonComponent, + TenantPipe, ], providers: [ { diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index f651a33a1..932500312 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -38,12 +38,12 @@
- + {{ item.name | translate }} - diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html index 4aac57f95..e43777811 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html @@ -14,7 +14,7 @@ [id]="first ? 'navigateToActiveDossiers' : ''" [matTooltip]="breadcrumb.options.clamp && (breadcrumb.name$ | async)" [routerLinkActiveOptions]="breadcrumb.options.routerLinkActiveOptions || { exact: false }" - [routerLink]="breadcrumb.options.routerLink" + [routerLink]="breadcrumb.options.routerLink | tenant" class="breadcrumb" routerLinkActive="active" > @@ -30,7 +30,7 @@ diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 881b9ddc6..8ce9a49ac 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -51,6 +51,7 @@ import { IqserUploadFileModule, IqserUsersModule, RoundCheckboxComponent, + TenantPipe, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { AuditInfoDialogComponent } from './dialogs/audit-info-dialog/audit-info-dialog.component'; @@ -121,6 +122,7 @@ const components = [ DetailsRadioComponent, IqserAllowDirective, IqserDenyDirective, + TenantPipe, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html index 6e8758ba7..1f613032f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html @@ -110,7 +110,7 @@ @@ -59,7 +59,7 @@
diff --git a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts index 41731fbe6..a80730466 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts @@ -5,7 +5,7 @@ import { adminSideNavTranslations } from '@translations/admin-side-nav-translati import { ActivatedRoute, RouterLink, RouterLinkActive } from '@angular/router'; import { AdminSideNavType, AdminSideNavTypes, ENTITY_TYPE, User } from '@red/domain'; import { ROLES } from '@users/roles'; -import { getCurrentUser, IqserHelpModeModule, IqserPermissionsService, SideNavComponent } from '@iqser/common-ui'; +import { getCurrentUser, IqserHelpModeModule, IqserPermissionsService, SideNavComponent, TenantPipe } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { NgForOf, NgIf } from '@angular/common'; @@ -21,7 +21,7 @@ interface NavItem { templateUrl: './admin-side-nav.component.html', styleUrls: ['./admin-side-nav.component.scss'], standalone: true, - imports: [TranslateModule, NgIf, IqserHelpModeModule, RouterLink, RouterLinkActive, NgForOf, SideNavComponent], + imports: [TranslateModule, NgIf, IqserHelpModeModule, RouterLink, RouterLinkActive, NgForOf, SideNavComponent, TenantPipe], }) export class AdminSideNavComponent implements OnInit { @Input() type: AdminSideNavType; diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html index 72551498d..73574d744 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html @@ -2,25 +2,29 @@ - + {{ dossierTemplate.name }} - + {{ 'admin-side-nav.entities' | translate }} - + {{ activeDictionary.label }} diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts index 9c0c5a773..62e110ec2 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts @@ -8,13 +8,14 @@ import { DictionariesMapService } from '@services/entity-services/dictionaries-m import { AsyncPipe, NgIf } from '@angular/common'; import { MatIconModule } from '@angular/material/icon'; import { TranslateModule } from '@ngx-translate/core'; +import { TenantPipe } from '@iqser/common-ui'; @Component({ selector: 'redaction-dossier-template-breadcrumbs', templateUrl: './dossier-template-breadcrumbs.component.html', styleUrls: ['./dossier-template-breadcrumbs.component.scss'], standalone: true, - imports: [NgIf, AsyncPipe, RouterLink, MatIconModule, TranslateModule, RouterLinkActive], + imports: [NgIf, AsyncPipe, RouterLink, MatIconModule, TranslateModule, RouterLinkActive, TenantPipe], }) export class DossierTemplateBreadcrumbsComponent { @Input() root = false; diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html index 27720cc5e..d96e0a42d 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html @@ -1,7 +1,7 @@
-
+
{{ file.filename }}
diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 8f23b68c9..f5f0111cf 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -13,6 +13,7 @@ import { IqserUsersModule, StatusBarComponent, StopPropagationDirective, + TenantPipe, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossierOverviewScreenComponent } from './screen/dossier-overview-screen.component'; @@ -68,6 +69,7 @@ const routes: IqserRoutes = [ HasScrollbarDirective, DynamicInputComponent, IqserAllowDirective, + TenantPipe, ], }) export class DossierOverviewModule {} diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html index 580ace65a..e123015fb 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html @@ -36,9 +36,9 @@ @@ -64,7 +64,7 @@
diff --git a/apps/red-ui/src/app/modules/search/search.module.ts b/apps/red-ui/src/app/modules/search/search.module.ts index 160d2a5bb..1a6943185 100644 --- a/apps/red-ui/src/app/modules/search/search.module.ts +++ b/apps/red-ui/src/app/modules/search/search.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchScreenComponent } from './search-screen/search-screen.component'; import { RouterModule } from '@angular/router'; -import { IqserListingModule, IqserUsersModule, StatusBarComponent, StopPropagationDirective } from '@iqser/common-ui'; +import { IqserListingModule, IqserUsersModule, StatusBarComponent, StopPropagationDirective, TenantPipe } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { TranslateModule } from '@ngx-translate/core'; import { SearchItemTemplateComponent } from './search-item-template/search-item-template.component'; @@ -20,6 +20,7 @@ const routes = [{ path: '', component: SearchScreenComponent }]; IqserListingModule, StatusBarComponent, StopPropagationDirective, + TenantPipe, ], }) export class SearchModule {} diff --git a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html index c328c4ca3..c7d6ebb58 100644 --- a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html +++ b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html @@ -20,7 +20,11 @@
- + {{ fileDossier.dossierName }} diff --git a/apps/red-ui/src/app/modules/trash/trash.module.ts b/apps/red-ui/src/app/modules/trash/trash.module.ts index a86df8312..aa1cfe00e 100644 --- a/apps/red-ui/src/app/modules/trash/trash.module.ts +++ b/apps/red-ui/src/app/modules/trash/trash.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { TrashScreenComponent } from './trash-screen/trash-screen.component'; -import { CircleButtonComponent, IqserListingModule, IqserUsersModule } from '@iqser/common-ui'; +import { CircleButtonComponent, IqserListingModule, IqserUsersModule, TenantPipe } from '@iqser/common-ui'; import { TrashTableItemComponent } from './trash-screen/trash-table-item/trash-table-item.component'; import { SharedModule } from '@shared/shared.module'; import { TrashDialogService } from './services/trash-dialog.service'; @@ -20,6 +20,7 @@ const routes = [{ path: '', component: TrashScreenComponent }]; TranslateModule, IqserListingModule, CircleButtonComponent, + TenantPipe, ], providers: [TrashDialogService], }) diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts index cb1655efc..2472b86cc 100644 --- a/apps/red-ui/src/app/utils/configuration.initializer.ts +++ b/apps/red-ui/src/app/utils/configuration.initializer.ts @@ -33,6 +33,7 @@ export function configurationInitializer( licenseService: LicenseService, permissionsService: IqserPermissionsService, ) { + console.log('BASE HREF: ', baseHref); const setup = keycloakStatusService.keycloakStatus$.pipe( filter(event => event === KeycloakStatus.READY || event === KeycloakStatus.NOT_ACTIVE), map(() => featuresService.loadConfig()), diff --git a/libs/common-ui b/libs/common-ui index 00d55e470..5c24018d1 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 00d55e470f99fb1defa1ae7250af793d6fe70115 +Subproject commit 5c24018d1265f53ec312ce79f03bbc7af14a53f5