From e40c7bbe85888316ca3ff0105893a3565a0faeb3 Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Thu, 25 Sep 2025 15:44:32 +0300
Subject: [PATCH] Refactor: navigate fullscreen dashboard logo via dynamic
 routerLink in anchor wrap.

---
 .../dashboard-page.component.html             |  5 +++--
 .../dashboard-page.component.ts               | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 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 e2443a529d..b9cd87709e 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,8 +74,9 @@
               {{'dashboard.states-short' | translate}}
             </button>
         </ng-container>
-          <img *ngIf="showDashboardLogo()" [src]="dashboardLogo | image | async" (click)="goHome()"
-               aria-label="dashboard_logo" class="dashboard_logo pointer-events-auto cursor-pointer"/>
+          <a *ngIf="showDashboardLogo()" [routerLink]="dashboardLogoLink" class="dashboard_logo pointer-events-auto">
+            <img [src]="dashboardLogo | image | async" aria-label="dashboard_logo" alt="Dashboard logo" class="h-full"/>
+          </a>
         </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 e9a61cd6fd..084321177b 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,
@@ -157,6 +157,7 @@ import {
   MoveWidgetsDialogResult
 } from '@home/components/dashboard-page/layout/move-widgets-dialog.component';
 import { HttpStatusCode } from '@angular/common/http';
+import { AuthService } from '@core/auth/auth.service';
 
 // @dynamic
 @Component({
@@ -272,6 +273,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%'};
 
+  dashboardLogoLink: string | UrlTree;
+
   private dashboardLogoCache: SafeUrl;
   private defaultDashboardLogo = 'assets/logo_title_white.svg';
 
@@ -374,6 +377,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
               private dialog: MatDialog,
               public translate: TranslateService,
               private popoverService: TbPopoverService,
+              private authService: AuthService,
               private renderer: Renderer2,
               private ngZone: NgZone,
               @Optional() @Inject('embeddedValue') private embeddedValue,
@@ -516,6 +520,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     this.layouts.right.layoutCtx.widgets = new LayoutWidgetsArray(this.dashboardCtx);
     this.widgetEditMode = data.widgetEditMode;
     this.singlePageMode = data.singlePageMode;
+    this.dashboardLogoLink = this.getDashboardLogoLink();
 
     this.readonly = this.embedded || (this.singlePageMode && !this.widgetEditMode && !this.route.snapshot.queryParamMap.get('edit'))
                     || this.forceFullscreen || this.isMobileApp || this.authUser.authority === Authority.CUSTOMER_USER ||
@@ -1800,10 +1805,6 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     }
   }
 
-  goHome() {
-    this.router.navigate(['home']);
-  }
-
   get showMainLayoutFiller(): boolean {
     const layoutMaxWidth = this.dashboardUtils.getBreakpointInfoById(this.layouts.main.layoutCtx.breakpoint)?.maxWidth || Infinity;
     const dashboardMaxWidth = this.dashboardUtils.getBreakpointInfoById(this.dashboardCtx.breakpoint)?.maxWidth || Infinity;
@@ -1830,4 +1831,12 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     }
     return false;
   }
+
+  private getDashboardLogoLink(): string | UrlTree {
+    if (this.authUser.isPublic) {
+      return this.dashboardService.getPublicDashboardLink(this.dashboard);
+    } else {
+      return this.authService.defaultUrl(true, this.authState);
+    }
+  }
 }