From 854a513c0108a71e55fdc2a14b7fdf4317413315 Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Thu, 13 Jun 2024 11:16:53 +0300
Subject: [PATCH] fixes on tenant urls

---
 .../editor/description-template-editor.component.ts  | 12 +++++++-----
 .../description-template-listing.component.ts        |  2 +-
 .../description-template-type-listing.component.ts   |  2 +-
 .../listing/dmp-blueprint-listing.component.ts       |  2 +-
 .../ui/admin/entity-locks/lock-listing.component.ts  |  4 +++-
 .../language/listing/language-listing.component.ts   |  2 +-
 .../listing/prefilling-source-listing.component.ts   |  2 +-
 .../listing/reference-type-listing.component.ts      |  2 +-
 .../reference/listing/reference-listing.component.ts |  2 +-
 .../admin/tenant/listing/tenant-listing.component.ts |  2 +-
 .../ui/admin/user/listing/user-listing.component.ts  |  4 +++-
 .../src/common/base/base-listing-component.ts        |  4 +++-
 .../notification-template-listing.component.ts       |  2 +-
 .../notification/notification-listing.component.ts   |  4 +++-
 .../mine-inapp-notification-listing.component.ts     |  4 +++-
 15 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
index 7ab8b30bb..4681157a1 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
@@ -43,6 +43,7 @@ import { DescriptionTemplateEditorModel, DescriptionTemplateFieldEditorModel, De
 import { DescriptionTemplateEditorResolver } from './description-template-editor.resolver';
 import { DescriptionTemplateEditorService } from './description-template-editor.service';
 import { NewEntryType, ToCEntry, ToCEntryType } from './table-of-contents/description-template-table-of-contents-entry';
+import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
 
 
 @Component({
@@ -138,7 +139,8 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 		private languageInfoService: LanguageInfoService,
 		public userService: UserService,
 		public titleService: Title,
-		private analyticsService: AnalyticsService
+		private analyticsService: AnalyticsService,
+		private routerUtils: RouterUtilsService
 	) {
 		const descriptionLabel: string = route.snapshot.data['entity']?.label;
 		if (descriptionLabel) {
@@ -225,10 +227,10 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 		let route = [];
 
 		if (id === null) {
-			route.push('../..');
+			route.push(this.routerUtils.generateUrl('/description-templates/'));
 			this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
 		} else if (this.isNew || this.isNewVersion || this.isClone) {
-			route.push('/description-templates/' + id);
+			route.push(this.routerUtils.generateUrl('/description-templates/' + id));
 			this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
 		} else {
 			this.refreshData();
@@ -271,7 +273,7 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 			this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
 			if (close) {
 				this.formGroup = null;
-				this.router.navigate(['/description-templates']);
+				this.router.navigate([this.routerUtils.generateUrl('/description-templates')]);
 			} else {
 				this.refreshOnNavigateToData(data ? data.id : null);
 			}
@@ -1270,6 +1272,6 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 	}
 
 	public cancel(): void {
-		this.router.navigate(['/description-templates']);
+		this.router.navigate([this.routerUtils.generateUrl('/description-templates')]);
 	}
 }
diff --git a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
index 8282121c1..6bb1408a9 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
@@ -82,7 +82,7 @@ export class DescriptionTemplateListingComponent extends BaseListingComponent<De
 		private analyticsService: AnalyticsService,
 		public routerUtils: RouterUtilsService,
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.mode = this.route.snapshot?.data['mode'];
diff --git a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.ts b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.ts
index 20680cd0e..8265877e5 100644
--- a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.ts
@@ -66,7 +66,7 @@ export class DescriptionTemplateTypeListingComponent extends BaseListingComponen
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts
index ea9ed51aa..31598a5d0 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts
@@ -79,7 +79,7 @@ export class DmpBlueprintListingComponent extends BaseListingComponent<DmpBluepr
 		private fileUtils: FileUtils,
 		private analyticsService: AnalyticsService
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.mode = this.route.snapshot?.data['mode'];
diff --git a/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.ts b/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.ts
index 939c9c4fa..c38229d34 100644
--- a/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.ts
@@ -22,6 +22,7 @@ import { LockService } from '@app/core/services/lock/lock.service';
 import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
 import { LockTargetTypePipe } from '@common/formatting/pipes/lock-target-type.pipe';
 import { User } from '@app/core/model/user/user';
+import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
 
 @Component({
 	templateUrl: './lock-listing.component.html',
@@ -51,6 +52,7 @@ export class LockListingComponent extends BaseListingComponent<Lock, LockLookup>
 
 	constructor(
 		protected router: Router,
+		protected routerUtils: RouterUtilsService,
 		protected route: ActivatedRoute,
 		protected uiNotificationService: UiNotificationService,
 		protected httpErrorHandlingService: HttpErrorHandlingService,
@@ -62,7 +64,7 @@ export class LockListingComponent extends BaseListingComponent<Lock, LockLookup>
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.ts b/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.ts
index 250beb84d..0df3fdbc8 100644
--- a/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.ts
@@ -63,7 +63,7 @@ export class LanguageListingComponent extends BaseListingComponent<Language, Lan
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.ts b/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.ts
index 282a37c0d..97f115944 100644
--- a/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.ts
@@ -64,7 +64,7 @@ export class PrefillingSourceListingComponent extends BaseListingComponent<Prefi
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.ts b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.ts
index b76619c73..41da73d74 100644
--- a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.ts
@@ -64,7 +64,7 @@ export class ReferenceTypeListingComponent extends BaseListingComponent<Referenc
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.ts b/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.ts
index 9ff3c1f43..e27589c37 100644
--- a/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.ts
@@ -68,7 +68,7 @@ export class ReferenceListingComponent extends BaseListingComponent<Reference, R
 		private dialog: MatDialog,
 		private sumarizeText: SumarizeTextPipe
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.ts b/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.ts
index 1a1e48f77..c69aac5ff 100644
--- a/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.ts
@@ -63,7 +63,7 @@ export class TenantListingComponent extends BaseListingComponent<Tenant, TenantL
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts
index 025473a7f..22e262f84 100644
--- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts
@@ -24,6 +24,7 @@ import * as FileSaver from 'file-saver';
 import { Observable } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { nameof } from 'ts-simple-nameof';
+import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
 
 @Component({
 	templateUrl: './user-listing.component.html',
@@ -60,6 +61,7 @@ export class UserListingComponent extends BaseListingComponent<User, UserLookup>
 
 	constructor(
 		protected router: Router,
+		protected routerUtils: RouterUtilsService,
 		protected route: ActivatedRoute,
 		protected uiNotificationService: UiNotificationService,
 		protected httpErrorHandlingService: HttpErrorHandlingService,
@@ -72,7 +74,7 @@ export class UserListingComponent extends BaseListingComponent<User, UserLookup>
 		private dialog: MatDialog,
 		private fileUtils: FileUtils
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/common/base/base-listing-component.ts b/dmp-frontend/src/common/base/base-listing-component.ts
index d1a69835e..8f83b879c 100644
--- a/dmp-frontend/src/common/base/base-listing-component.ts
+++ b/dmp-frontend/src/common/base/base-listing-component.ts
@@ -3,6 +3,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { UserSettingsKey } from '@app/core/model/user-settings/user-settings.model';
 import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
+import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
 import { QueryParamsService } from '@app/core/services/utilities/query-params.service';
 import { BaseComponent } from '@common/base/base.component';
 import { Lookup } from '@common/model/lookup';
@@ -60,6 +61,7 @@ export abstract class BaseListingComponent<ItemModel, LookupModel extends Lookup
 
 	constructor(
 		protected router: Router,
+		protected routerUtils: RouterUtilsService,
 		protected route: ActivatedRoute,
 		protected uiNotificationService: UiNotificationService,
 		protected httpErrorHandlingService: HttpErrorHandlingService,
@@ -174,7 +176,7 @@ export abstract class BaseListingComponent<ItemModel, LookupModel extends Lookup
 				route += `${baseRoute}/`;
 			}
 			route += event.row.id;
-			this.router.navigate([route], { relativeTo: this.route, queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookup), 'lv': ++this.lv } });
+			this.router.navigate([this.routerUtils.generateUrl(route)], { relativeTo: this.route, queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookup), 'lv': ++this.lv } });
 		}
 	}
 
diff --git a/dmp-frontend/src/notification-service/ui/admin/notification-template/listing/notification-template-listing.component.ts b/dmp-frontend/src/notification-service/ui/admin/notification-template/listing/notification-template-listing.component.ts
index 9bb602f7d..cea38ab7c 100644
--- a/dmp-frontend/src/notification-service/ui/admin/notification-template/listing/notification-template-listing.component.ts
+++ b/dmp-frontend/src/notification-service/ui/admin/notification-template/listing/notification-template-listing.component.ts
@@ -67,7 +67,7 @@ export class NotificationTemplateListingComponent extends BaseListingComponent<N
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/notification-service/ui/admin/notification/notification-listing.component.ts b/dmp-frontend/src/notification-service/ui/admin/notification/notification-listing.component.ts
index 8938ec5a2..55400862c 100644
--- a/dmp-frontend/src/notification-service/ui/admin/notification/notification-listing.component.ts
+++ b/dmp-frontend/src/notification-service/ui/admin/notification/notification-listing.component.ts
@@ -27,6 +27,7 @@ import { NotificationTrackingStatePipe } from '@common/formatting/pipes/notifica
 import { NotificationTrackingProcessPipe } from '@common/formatting/pipes/notification-tracking-process.pipe';
 import { IsActive } from '@notification-service/core/enum/is-active.enum';
 import { DataTableDateTimeFormatPipe } from '@app/core/pipes/date-time-format.pipe';
+import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
 
 @Component({
 	templateUrl: './notification-listing.component.html',
@@ -62,6 +63,7 @@ export class NotificationListingComponent extends BaseListingComponent<Notificat
 
 	constructor(
 		protected router: Router,
+		protected routerUtils: RouterUtilsService,
 		protected route: ActivatedRoute,
 		protected uiNotificationService: UiNotificationService,
 		protected httpErrorHandlingService: HttpErrorHandlingService,
@@ -73,7 +75,7 @@ export class NotificationListingComponent extends BaseListingComponent<Notificat
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();
diff --git a/dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts b/dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
index 1d7c209f0..a8ad8e174 100644
--- a/dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
+++ b/dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
@@ -23,6 +23,7 @@ import { NotificationTypePipe } from '@common/formatting/pipes/notification-type
 import { NotificationInAppTracking } from '@notification-service/core/enum/notification-inapp-tracking.enum';
 import { InAppNotification } from '@notification-service/core/model/inapp-notification.model';
 import { DataTableDateTimeFormatPipe } from '@app/core/pipes/date-time-format.pipe';
+import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
 
 @Component({
 	selector: 'app-mine-inapp-notification-listing',
@@ -52,6 +53,7 @@ export class MineInAppNotificationListingComponent extends BaseListingComponent<
 
 	constructor(
 		protected router: Router,
+		protected routerUtils: RouterUtilsService,
 		protected route: ActivatedRoute,
 		protected uiNotificationService: UiNotificationService,
 		protected httpErrorHandlingService: HttpErrorHandlingService,
@@ -63,7 +65,7 @@ export class MineInAppNotificationListingComponent extends BaseListingComponent<
 		private language: TranslateService,
 		private dialog: MatDialog
 	) {
-		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
+		super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
 		this.lookup = this.initializeLookup();