From de34e0de3b14d5f3ad93d4a65d549b442771209c Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Tue, 30 Sep 2025 16:42:17 +0300
Subject: [PATCH] Fix `tb-logo` feature to navigate to root dashboard in
 expanded fullscreen.

---
 .../dashboard-page.component.html               |  2 +-
 .../dashboard-page/dashboard-page.component.ts  |  8 +++++++-
 .../app/shared/components/logo.component.html   |  2 +-
 .../src/app/shared/components/logo.component.ts | 17 ++++++++++-------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html
index 9faba789ce..55fca1d782 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.html
@@ -74,7 +74,7 @@
               {{'dashboard.states-short' | translate}}
             </button>
           </ng-container>
-          <tb-logo *ngIf="showDashboardLogo()" [logoSrc]="dashboardLogo | image | async" class="dashboard_logo"></tb-logo>
+          <tb-logo *ngIf="showDashboardLogo()" [logoUrl]="dashboardLogoUrl" [logoSrc]="dashboardLogo | image | async" class="dashboard_logo"></tb-logo>
         </div>
         <div class="tb-dashboard-action-panel">
           <button [class.!hidden]="!showCloseToolbar()" mat-icon-button class="close-action"
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
index 0099fa83a7..6d212cb6dc 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
@@ -38,7 +38,7 @@ import {
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, Router, UrlTree } from '@angular/router';
 import { UtilsService } from '@core/services/utils.service';
 import {
   BreakpointId,
@@ -272,6 +272,8 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     {width: '100%', height: '100%', maxWidth: '100%', minWidth: '100%'};
   rightLayoutSize: {width: string; height: string} = {width: '100%', height: '100%'};
 
+  dashboardLogoUrl = this.getDashboardLogoUrl();
+
   private dashboardLogoCache: SafeUrl;
   private defaultDashboardLogo = 'assets/logo_title_white.svg';
 
@@ -1826,4 +1828,8 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     }
     return false;
   }
+
+  private getDashboardLogoUrl(): UrlTree {
+    return this.forceFullscreen ? null : this.router.createUrlTree([], {relativeTo: this.route});
+  }
 }
diff --git a/ui-ngx/src/app/shared/components/logo.component.html b/ui-ngx/src/app/shared/components/logo.component.html
index 655da6da40..52497f2268 100644
--- a/ui-ngx/src/app/shared/components/logo.component.html
+++ b/ui-ngx/src/app/shared/components/logo.component.html
@@ -20,7 +20,7 @@
     <ng-container *ngTemplateOutlet="logo"></ng-container>
   </a>
 } @else {
-  <a [routerLink]="logoLink">
+  <a [routerLink]="logoUrl">
     <ng-container *ngTemplateOutlet="logo"></ng-container>
   </a>
 }
diff --git a/ui-ngx/src/app/shared/components/logo.component.ts b/ui-ngx/src/app/shared/components/logo.component.ts
index 895d6494d4..1ac07612cb 100644
--- a/ui-ngx/src/app/shared/components/logo.component.ts
+++ b/ui-ngx/src/app/shared/components/logo.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, AfterViewInit } from '@angular/core';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { AuthService } from '@core/auth/auth.service';
 import { AppState } from '@core/core.state';
@@ -28,7 +28,7 @@ import { UrlHolder } from '@shared/pipe/image.pipe';
   templateUrl: './logo.component.html',
   styleUrls: ['./logo.component.scss']
 })
-export class LogoComponent implements OnInit {
+export class LogoComponent implements AfterViewInit {
 
   @Input()
   @coerceBoolean()
@@ -37,16 +37,19 @@ export class LogoComponent implements OnInit {
   @Input()
   logoSrc: string | UrlHolder = 'assets/logo_title_white.svg';
 
-  logoLink: UrlTree;
+  @Input()
+  logoUrl: string | UrlTree;
 
   constructor(private authService: AuthService,
               private store: Store<AppState>) {
   }
 
-  ngOnInit() {
-    if (!this.isLogin) {
-      const authState = getCurrentAuthState(this.store);
-      this.logoLink = this.authService.defaultUrl(true, authState);
+  ngAfterViewInit() {
+    if (!this.isLogin && !this.logoUrl) {
+      setTimeout(() => {
+        const authState = getCurrentAuthState(this.store);
+        this.logoUrl = this.authService.defaultUrl(true, authState);
+      }, 0);
     }
   }
 }