You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/05/27 18:43:59 UTC
[incubator-streampipes] branch dev updated: [hotfix] Fix display of current page title
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 26a113865 [hotfix] Fix display of current page title
26a113865 is described below
commit 26a1138652824876b8c7e13521b754f715b67a27
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri May 27 20:43:50 2022 +0200
[hotfix] Fix display of current page title
---
ui/deployment/base-navigation.component.mst | 8 +++++---
ui/src/app/core/components/iconbar/iconbar.component.ts | 6 ++++--
ui/src/app/core/components/toolbar/toolbar.component.ts | 6 ++++--
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ui/deployment/base-navigation.component.mst b/ui/deployment/base-navigation.component.mst
index 69be85cb3..f99a3d7ac 100644
--- a/ui/deployment/base-navigation.component.mst
+++ b/ui/deployment/base-navigation.component.mst
@@ -17,9 +17,10 @@
*/
-import {NavigationEnd, Router} from "@angular/router";
+import { NavigationEnd, Router } from '@angular/router';
import { PageName } from '../../_enums/page-name.enum';
import { AuthService } from '../../services/auth.service';
+import { AppConstants } from '../../services/app.constants';
export abstract class BaseNavigationComponent {
@@ -67,7 +68,8 @@ export abstract class BaseNavigationComponent {
constructor(protected authService: AuthService,
- protected router: Router) {
+ protected router: Router,
+ private router: Router) {
}
@@ -93,7 +95,7 @@ export abstract class BaseNavigationComponent {
getPageTitle(path) {
const allMenuItems = this.menu.concat(this.admin);
- let currentTitle = 'StreamPipes';
+ let currentTitle = this.appConstants.APP_NAME;
allMenuItems.forEach(m => {
if (m.link === path) {
currentTitle = m.title;
diff --git a/ui/src/app/core/components/iconbar/iconbar.component.ts b/ui/src/app/core/components/iconbar/iconbar.component.ts
index ee86a6fc0..a670fda90 100644
--- a/ui/src/app/core/components/iconbar/iconbar.component.ts
+++ b/ui/src/app/core/components/iconbar/iconbar.component.ts
@@ -24,6 +24,7 @@ import { AuthService } from '../../../services/auth.service';
import { Subscription, timer } from 'rxjs';
import { exhaustMap } from 'rxjs/operators';
import { RestApi } from '../../../services/rest-api.service';
+import { AppConstants } from '../../../services/app.constants';
@Component({
selector: 'iconbar',
@@ -38,8 +39,9 @@ export class IconbarComponent extends BaseNavigationComponent implements OnInit,
constructor(router: Router,
authService: AuthService,
public notificationCountService: NotificationCountService,
- private restApi: RestApi) {
- super(authService, router);
+ private restApi: RestApi,
+ appConstants: AppConstants) {
+ super(authService, router, appConstants);
}
ngOnInit(): void {
diff --git a/ui/src/app/core/components/toolbar/toolbar.component.ts b/ui/src/app/core/components/toolbar/toolbar.component.ts
index ee52a2850..68a6ecc09 100644
--- a/ui/src/app/core/components/toolbar/toolbar.component.ts
+++ b/ui/src/app/core/components/toolbar/toolbar.component.ts
@@ -26,6 +26,7 @@ import { OverlayContainer } from '@angular/cdk/overlay';
import { ProfileService } from '../../../profile/profile.service';
import { VersionInfo } from '../../../info/versions/service/version-info.model';
import { AuthService } from '../../../services/auth.service';
+import { AppConstants } from '../../../services/app.constants';
@Component({
selector: 'toolbar',
@@ -47,8 +48,9 @@ export class ToolbarComponent extends BaseNavigationComponent implements OnInit
private profileService: ProfileService,
private restApi: RestApi,
private overlay: OverlayContainer,
- authService: AuthService) {
- super(authService, router);
+ authService: AuthService,
+ appConstants: AppConstants) {
+ super(authService, router, appConstants);
}
ngOnInit(): void {