diff --git a/dmp-frontend/src/app/app.component.ts b/dmp-frontend/src/app/app.component.ts index b935104a9..0b1f2459e 100644 --- a/dmp-frontend/src/app/app.component.ts +++ b/dmp-frontend/src/app/app.component.ts @@ -25,6 +25,7 @@ import { CssColorsTenantConfiguration, TenantConfiguration } from './core/model/ import { nameof } from 'ts-simple-nameof'; import { TenantHandlingService } from './core/services/tenant/tenant-handling.service'; import { BreadcrumbService } from './ui/misc/breadcrumb/breadcrumb.service'; +import { RouterUtilsService } from './core/services/router/router-utils.service'; declare const gapi: any; @@ -49,6 +50,7 @@ export class AppComponent implements OnInit, AfterViewInit { constructor( private router: Router, + private routerUtils: RouterUtilsService, private route: ActivatedRoute, private authentication: AuthService, private translate: TranslateService, @@ -118,7 +120,7 @@ export class AppComponent implements OnInit, AfterViewInit { if (this.location.path() === '') { if (!this.configurationService.useSplash) { this.onlySplash = false; - this.router.navigate(['/home']); + this.router.navigate([this.routerUtils.generateUrl('/home')]); } else { this.onlySplash = true; this.router.navigate(['/reload']).then(() => this.router.navigate(['/splash'])); @@ -266,7 +268,7 @@ export class AppComponent implements OnInit, AfterViewInit { return this.authentication.currentAccountIsAuthenticated(); } - goToDMPs() { + goToDMPs() { //not used this.router.navigate(['/plans'], { queryParams: { /*refresh : Math.random() ,returnUrl: this.state.url*/ } }); } diff --git a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html index d5b39fccc..4a664faf7 100644 --- a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html @@ -21,7 +21,7 @@ - + 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 6bb1408a9..8282121c1 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 - + 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 31598a5d0..ea9ed51aa 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 constructor( protected router: Router, - protected routerUtils: RouterUtilsService, protected route: ActivatedRoute, protected uiNotificationService: UiNotificationService, protected httpErrorHandlingService: HttpErrorHandlingService, @@ -64,7 +63,7 @@ export class LockListingComponent extends BaseListingComponent private language: TranslateService, private dialog: MatDialog ) { - super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService); + super(router, 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 0df3fdbc8..250beb84d 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 constructor( protected router: Router, - protected routerUtils: RouterUtilsService, protected route: ActivatedRoute, protected uiNotificationService: UiNotificationService, protected httpErrorHandlingService: HttpErrorHandlingService, @@ -74,7 +73,7 @@ export class UserListingComponent extends BaseListingComponent private dialog: MatDialog, private fileUtils: FileUtils ) { - super(router, routerUtils, route, uiNotificationService, httpErrorHandlingService, queryParamsService); + super(router, 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 8f83b879c..89d932b4b 100644 --- a/dmp-frontend/src/common/base/base-listing-component.ts +++ b/dmp-frontend/src/common/base/base-listing-component.ts @@ -2,8 +2,7 @@ import { HttpErrorResponse } from '@angular/common/http'; 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 { UiNotificationService } from '@app/core/services/notification/ui-notification-service'; import { QueryParamsService } from '@app/core/services/utilities/query-params.service'; import { BaseComponent } from '@common/base/base.component'; import { Lookup } from '@common/model/lookup'; @@ -61,7 +60,6 @@ export abstract class BaseListingComponent