From 295d96f5b27984d616ec6b36bae74f9629cd644f Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Thu, 25 Sep 2025 10:17:36 +0300
Subject: [PATCH 1/9] Dashboard fullscreen: add navigation 'home' on logo
 click.

---
 .../components/dashboard-page/dashboard-page.component.html   | 4 ++--
 .../components/dashboard-page/dashboard-page.component.ts     | 4 ++++
 2 files changed, 6 insertions(+), 2 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 77f882d191..e2443a529d 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,8 @@
               {{'dashboard.states-short' | translate}}
             </button>
         </ng-container>
-          <img *ngIf="showDashboardLogo()" [src]="dashboardLogo | image | async"
-               aria-label="dashboard_logo" class="dashboard_logo"/>
+          <img *ngIf="showDashboardLogo()" [src]="dashboardLogo | image | async" (click)="goHome()"
+               aria-label="dashboard_logo" class="dashboard_logo pointer-events-auto cursor-pointer"/>
         </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..e9a61cd6fd 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
@@ -1800,6 +1800,10 @@ 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;

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 2/9] 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);
+    }
+  }
 }

From a865c253d23b3f57b017694de4905c1f04da744e Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Fri, 26 Sep 2025 15:30:49 +0300
Subject: [PATCH 3/9] Refactor tb-logo as link to use in Login/Dashboard/Menu.

---
 .../dashboard-page.component.html             |  6 +--
 .../dashboard-page.component.ts               | 15 +------
 .../src/app/modules/home/home.component.html  |  3 +-
 .../login/pages/login/login.component.html    |  2 +-
 .../login/pages/login/login.component.scss    | 12 ++++++
 .../app/shared/components/logo.component.html |  5 ++-
 .../app/shared/components/logo.component.scss | 16 ++------
 .../app/shared/components/logo.component.ts   | 39 ++++++++++++++++---
 8 files changed, 58 insertions(+), 40 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 b9cd87709e..9faba789ce 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
@@ -73,10 +73,8 @@
               <mat-icon>layers</mat-icon>
               {{'dashboard.states-short' | translate}}
             </button>
-        </ng-container>
-          <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>
+          </ng-container>
+          <tb-logo *ngIf="showDashboardLogo()" [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 084321177b..0099fa83a7 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, UrlTree } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { UtilsService } from '@core/services/utils.service';
 import {
   BreakpointId,
@@ -157,7 +157,6 @@ 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({
@@ -273,8 +272,6 @@ 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';
 
@@ -377,7 +374,6 @@ 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,
@@ -520,7 +516,6 @@ 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 ||
@@ -1831,12 +1826,4 @@ 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);
-    }
-  }
 }
diff --git a/ui-ngx/src/app/modules/home/home.component.html b/ui-ngx/src/app/modules/home/home.component.html
index 48b6105bf9..8a7838cb0a 100644
--- a/ui-ngx/src/app/modules/home/home.component.html
+++ b/ui-ngx/src/app/modules/home/home.component.html
@@ -24,8 +24,7 @@
     <header class="tb-nav-header">
       <mat-toolbar color="primary" class="tb-nav-header-toolbar">
         <div class="flex flex-auto">
-          <img [src]="logo"
-               aria-label="logo" class="tb-logo-title"/>
+          <tb-logo [logoSrc]="logo" class="tb-logo-title"></tb-logo>
         </div>
       </mat-toolbar>
     </header>
diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.html b/ui-ngx/src/app/modules/login/pages/login/login.component.html
index 65b82023fe..25d860256b 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.html
@@ -21,7 +21,7 @@
       <form class="tb-login-form" [formGroup]="loginFormGroup" (ngSubmit)="login()">
         <fieldset class="flex flex-col">
           <div class="flex flex-col items-center justify-start" style="padding: 15px 0;">
-            <tb-logo class="login-logo"></tb-logo>
+            <tb-logo isLogin class="login-logo"></tb-logo>
           </div>
           <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
           </mat-progress-bar>
diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.scss b/ui-ngx/src/app/modules/login/pages/login/login.component.scss
index 2784335d7b..9453910744 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.scss
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.scss
@@ -38,6 +38,18 @@
       .tb-action-button{
         padding: 20px 0 16px;
       }
+
+      .login-logo {
+        width: 280px;
+        height: 60px;
+        text-decoration: none;
+        border: none;
+        transform: none;
+
+        &:focus {
+          outline: 0;
+        }
+      }
     }
 
     .oauth-container{
diff --git a/ui-ngx/src/app/shared/components/logo.component.html b/ui-ngx/src/app/shared/components/logo.component.html
index 136896f423..30fae5e46b 100644
--- a/ui-ngx/src/app/shared/components/logo.component.html
+++ b/ui-ngx/src/app/shared/components/logo.component.html
@@ -15,5 +15,6 @@
     limitations under the License.
 
 -->
-<img (click)="gotoThingsboard()" [src]="logo"
-         aria-label="logo" class="tb-logo-title flex-1"/>
+<a [routerLink]="isLogin ? '' : logoLink" (click)="onLogoClick()">
+  <img [src]="logoSrc" aria-label="logo" alt="Logo"/>
+</a>
diff --git a/ui-ngx/src/app/shared/components/logo.component.scss b/ui-ngx/src/app/shared/components/logo.component.scss
index d0e259d6d2..84be9a21df 100644
--- a/ui-ngx/src/app/shared/components/logo.component.scss
+++ b/ui-ngx/src/app/shared/components/logo.component.scss
@@ -13,17 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-:host-context(.login-logo) {
-  img.tb-logo-title {
-    width: 280px;
-    height: 60px;
-    text-decoration: none;
-    cursor: pointer;
-    border: none;
-    transform: none;
-
-    &:focus {
-      outline: 0;
-    }
+:host {
+  pointer-events: auto;
+  img {
+    height: 100%;
   }
 }
diff --git a/ui-ngx/src/app/shared/components/logo.component.ts b/ui-ngx/src/app/shared/components/logo.component.ts
index 7f58d8a4f0..fa8efb8ff8 100644
--- a/ui-ngx/src/app/shared/components/logo.component.ts
+++ b/ui-ngx/src/app/shared/components/logo.component.ts
@@ -14,19 +14,48 @@
 /// limitations under the License.
 ///
 
-import { Component } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { AuthService } from '@core/auth/auth.service';
+import { AppState } from '@core/core.state';
+import { Store } from '@ngrx/store';
+import { UrlTree } from '@angular/router';
+import { getCurrentAuthState } from '@core/auth/auth.selectors';
+import { UrlHolder } from '@shared/pipe/image.pipe';
 
 @Component({
   selector: 'tb-logo',
   templateUrl: './logo.component.html',
   styleUrls: ['./logo.component.scss']
 })
-export class LogoComponent {
+export class LogoComponent implements OnInit {
 
-  logo = 'assets/logo_title_white.svg';
+  @Input()
+  @coerceBoolean()
+  isLogin: boolean = false;
 
-  gotoThingsboard(): void {
-    window.open('https://thingsboard.io', '_blank');
+  @Input()
+  logoSrc: string | UrlHolder = 'assets/logo_title_white.svg';
+
+  logoLink: UrlTree;
+
+  constructor(private authService: AuthService,
+              private store: Store<AppState>) {
+  }
+
+  ngOnInit() {
+    if (!this.isLogin) {
+      this.logoLink = this.authService.defaultUrl(true, getCurrentAuthState(this.store));
+    }
   }
 
+  onLogoClick() {
+    if (this.isLogin) {
+      this.gotoThingsboard();
+    }
+  }
+
+  private gotoThingsboard() {
+    window.open('https://thingsboard.io', '_blank');
+  }
 }

From a80826a0e4ba3585078c506b171c222bf628f92a Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Mon, 29 Sep 2025 10:50:32 +0300
Subject: [PATCH 4/9] Minor fix of tb-logo size.

---
 .../login/pages/login/login.component.html    |  2 +-
 .../login/pages/login/login.component.scss    | 12 -----------
 .../app/shared/components/logo.component.scss | 21 ++++++++++++++++++-
 .../app/shared/components/logo.component.ts   | 10 +++++++--
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.html b/ui-ngx/src/app/modules/login/pages/login/login.component.html
index 25d860256b..5b4ec4b12f 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.html
@@ -21,7 +21,7 @@
       <form class="tb-login-form" [formGroup]="loginFormGroup" (ngSubmit)="login()">
         <fieldset class="flex flex-col">
           <div class="flex flex-col items-center justify-start" style="padding: 15px 0;">
-            <tb-logo isLogin class="login-logo"></tb-logo>
+            <tb-logo isLogin></tb-logo>
           </div>
           <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
           </mat-progress-bar>
diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.scss b/ui-ngx/src/app/modules/login/pages/login/login.component.scss
index 9453910744..2784335d7b 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.scss
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.scss
@@ -38,18 +38,6 @@
       .tb-action-button{
         padding: 20px 0 16px;
       }
-
-      .login-logo {
-        width: 280px;
-        height: 60px;
-        text-decoration: none;
-        border: none;
-        transform: none;
-
-        &:focus {
-          outline: 0;
-        }
-      }
     }
 
     .oauth-container{
diff --git a/ui-ngx/src/app/shared/components/logo.component.scss b/ui-ngx/src/app/shared/components/logo.component.scss
index 84be9a21df..8621cfdbae 100644
--- a/ui-ngx/src/app/shared/components/logo.component.scss
+++ b/ui-ngx/src/app/shared/components/logo.component.scss
@@ -15,7 +15,26 @@
  */
 :host {
   pointer-events: auto;
-  img {
+  a img {
+    display: block;
+    width: 100%;
     height: 100%;
   }
 }
+
+:host.login-logo {
+  display: inline-block;
+  width: 280px;
+  height: 60px;
+  a {
+    display: inline-block;
+    width: 100%;
+    height: 100%;
+    text-decoration: none;
+    border: none;
+    transform: none;
+    &:focus {
+      outline: 0;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/shared/components/logo.component.ts b/ui-ngx/src/app/shared/components/logo.component.ts
index fa8efb8ff8..4d53ec6ced 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, OnInit, HostBinding } from '@angular/core';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { AuthService } from '@core/auth/auth.service';
 import { AppState } from '@core/core.state';
@@ -30,6 +30,11 @@ import { UrlHolder } from '@shared/pipe/image.pipe';
 })
 export class LogoComponent implements OnInit {
 
+  @HostBinding('class.login-logo')
+  get isLoginLogoClass() {
+    return this.isLogin;
+  }
+
   @Input()
   @coerceBoolean()
   isLogin: boolean = false;
@@ -45,7 +50,8 @@ export class LogoComponent implements OnInit {
 
   ngOnInit() {
     if (!this.isLogin) {
-      this.logoLink = this.authService.defaultUrl(true, getCurrentAuthState(this.store));
+      const authState = getCurrentAuthState(this.store);
+      this.logoLink = this.authService.defaultUrl(true, authState);
     }
   }
 

From f28641093ba4dfd6f33b141b94d4c0e73ca4670a Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Mon, 29 Sep 2025 13:22:11 +0300
Subject: [PATCH 5/9] Refactor `tb-logo`, add support in login page to open
 link in a new tab on right-click.

---
 .../login/pages/login/login.component.html      |  2 +-
 .../app/shared/components/logo.component.html   | 15 +++++++++++++--
 .../app/shared/components/logo.component.scss   |  8 ++------
 .../src/app/shared/components/logo.component.ts | 17 +----------------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.html b/ui-ngx/src/app/modules/login/pages/login/login.component.html
index 5b4ec4b12f..25d860256b 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.html
@@ -21,7 +21,7 @@
       <form class="tb-login-form" [formGroup]="loginFormGroup" (ngSubmit)="login()">
         <fieldset class="flex flex-col">
           <div class="flex flex-col items-center justify-start" style="padding: 15px 0;">
-            <tb-logo isLogin></tb-logo>
+            <tb-logo isLogin class="login-logo"></tb-logo>
           </div>
           <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
           </mat-progress-bar>
diff --git a/ui-ngx/src/app/shared/components/logo.component.html b/ui-ngx/src/app/shared/components/logo.component.html
index 30fae5e46b..655da6da40 100644
--- a/ui-ngx/src/app/shared/components/logo.component.html
+++ b/ui-ngx/src/app/shared/components/logo.component.html
@@ -15,6 +15,17 @@
     limitations under the License.
 
 -->
-<a [routerLink]="isLogin ? '' : logoLink" (click)="onLogoClick()">
+@if (isLogin) {
+  <a href="https://thingsboard.io" target="_blank">
+    <ng-container *ngTemplateOutlet="logo"></ng-container>
+  </a>
+} @else {
+  <a [routerLink]="logoLink">
+    <ng-container *ngTemplateOutlet="logo"></ng-container>
+  </a>
+}
+
+<ng-template #logo>
   <img [src]="logoSrc" aria-label="logo" alt="Logo"/>
-</a>
+</ng-template>
+
diff --git a/ui-ngx/src/app/shared/components/logo.component.scss b/ui-ngx/src/app/shared/components/logo.component.scss
index 8621cfdbae..131d257502 100644
--- a/ui-ngx/src/app/shared/components/logo.component.scss
+++ b/ui-ngx/src/app/shared/components/logo.component.scss
@@ -16,23 +16,19 @@
 :host {
   pointer-events: auto;
   a img {
-    display: block;
     width: 100%;
     height: 100%;
   }
 }
 
-:host.login-logo {
-  display: inline-block;
+:host-context(.login-logo) {
   width: 280px;
   height: 60px;
   a {
-    display: inline-block;
-    width: 100%;
-    height: 100%;
     text-decoration: none;
     border: none;
     transform: none;
+
     &:focus {
       outline: 0;
     }
diff --git a/ui-ngx/src/app/shared/components/logo.component.ts b/ui-ngx/src/app/shared/components/logo.component.ts
index 4d53ec6ced..895d6494d4 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, HostBinding } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { AuthService } from '@core/auth/auth.service';
 import { AppState } from '@core/core.state';
@@ -30,11 +30,6 @@ import { UrlHolder } from '@shared/pipe/image.pipe';
 })
 export class LogoComponent implements OnInit {
 
-  @HostBinding('class.login-logo')
-  get isLoginLogoClass() {
-    return this.isLogin;
-  }
-
   @Input()
   @coerceBoolean()
   isLogin: boolean = false;
@@ -54,14 +49,4 @@ export class LogoComponent implements OnInit {
       this.logoLink = this.authService.defaultUrl(true, authState);
     }
   }
-
-  onLogoClick() {
-    if (this.isLogin) {
-      this.gotoThingsboard();
-    }
-  }
-
-  private gotoThingsboard() {
-    window.open('https://thingsboard.io', '_blank');
-  }
 }

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 6/9] 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);
     }
   }
 }

From 3c830a31799dca52b8cffba37b061e38bf29d6a5 Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Thu, 2 Oct 2025 11:38:02 +0300
Subject: [PATCH 7/9] LogoComponent improve init logic.

---
 ui-ngx/src/app/shared/components/logo.component.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/logo.component.ts b/ui-ngx/src/app/shared/components/logo.component.ts
index 1ac07612cb..1d32252069 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, AfterViewInit } from '@angular/core';
+import { Component, Input, OnInit } 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 AfterViewInit {
+export class LogoComponent implements OnInit {
 
   @Input()
   @coerceBoolean()
@@ -44,12 +44,10 @@ export class LogoComponent implements AfterViewInit {
               private store: Store<AppState>) {
   }
 
-  ngAfterViewInit() {
+  ngOnInit() {
     if (!this.isLogin && !this.logoUrl) {
-      setTimeout(() => {
-        const authState = getCurrentAuthState(this.store);
-        this.logoUrl = this.authService.defaultUrl(true, authState);
-      }, 0);
+      const authState = getCurrentAuthState(this.store);
+      this.logoUrl = this.authService.defaultUrl(true, authState);
     }
   }
 }

From f2c5f5aadf340858c3f9bfcf48cfedf18ae07601 Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Fri, 31 Oct 2025 15:30:19 +0200
Subject: [PATCH 8/9] Refactor `tb-logo` inputs for consistency (`logoUrl` to
 `link`, `logoSrc` to `src`).

---
 .../dashboard-page/dashboard-page.component.html          | 2 +-
 .../components/dashboard-page/dashboard-page.component.ts | 4 ++--
 ui-ngx/src/app/modules/home/home.component.html           | 2 +-
 ui-ngx/src/app/shared/components/logo.component.html      | 4 ++--
 ui-ngx/src/app/shared/components/logo.component.ts        | 8 ++++----
 5 files changed, 10 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 55fca1d782..b61f6e10fa 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()" [logoUrl]="dashboardLogoUrl" [logoSrc]="dashboardLogo | image | async" class="dashboard_logo"></tb-logo>
+          <tb-logo *ngIf="showDashboardLogo()" [link]="dashboardLogoLink" [src]="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 6d212cb6dc..b56bf1c0ef 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
@@ -272,7 +272,7 @@ 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();
+  dashboardLogoLink = this.getDashboardLogoLink();
 
   private dashboardLogoCache: SafeUrl;
   private defaultDashboardLogo = 'assets/logo_title_white.svg';
@@ -1829,7 +1829,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     return false;
   }
 
-  private getDashboardLogoUrl(): UrlTree {
+  private getDashboardLogoLink(): UrlTree {
     return this.forceFullscreen ? null : this.router.createUrlTree([], {relativeTo: this.route});
   }
 }
diff --git a/ui-ngx/src/app/modules/home/home.component.html b/ui-ngx/src/app/modules/home/home.component.html
index 8a7838cb0a..ab37fc8e91 100644
--- a/ui-ngx/src/app/modules/home/home.component.html
+++ b/ui-ngx/src/app/modules/home/home.component.html
@@ -24,7 +24,7 @@
     <header class="tb-nav-header">
       <mat-toolbar color="primary" class="tb-nav-header-toolbar">
         <div class="flex flex-auto">
-          <tb-logo [logoSrc]="logo" class="tb-logo-title"></tb-logo>
+          <tb-logo [src]="logo" class="tb-logo-title"></tb-logo>
         </div>
       </mat-toolbar>
     </header>
diff --git a/ui-ngx/src/app/shared/components/logo.component.html b/ui-ngx/src/app/shared/components/logo.component.html
index 52497f2268..9374442a82 100644
--- a/ui-ngx/src/app/shared/components/logo.component.html
+++ b/ui-ngx/src/app/shared/components/logo.component.html
@@ -20,12 +20,12 @@
     <ng-container *ngTemplateOutlet="logo"></ng-container>
   </a>
 } @else {
-  <a [routerLink]="logoUrl">
+  <a [routerLink]="link">
     <ng-container *ngTemplateOutlet="logo"></ng-container>
   </a>
 }
 
 <ng-template #logo>
-  <img [src]="logoSrc" aria-label="logo" alt="Logo"/>
+  <img [src]="src" aria-label="logo" alt="Logo"/>
 </ng-template>
 
diff --git a/ui-ngx/src/app/shared/components/logo.component.ts b/ui-ngx/src/app/shared/components/logo.component.ts
index 1d32252069..763aa63b7c 100644
--- a/ui-ngx/src/app/shared/components/logo.component.ts
+++ b/ui-ngx/src/app/shared/components/logo.component.ts
@@ -35,19 +35,19 @@ export class LogoComponent implements OnInit {
   isLogin: boolean = false;
 
   @Input()
-  logoSrc: string | UrlHolder = 'assets/logo_title_white.svg';
+  src: string | UrlHolder = 'assets/logo_title_white.svg';
 
   @Input()
-  logoUrl: string | UrlTree;
+  link: string | UrlTree;
 
   constructor(private authService: AuthService,
               private store: Store<AppState>) {
   }
 
   ngOnInit() {
-    if (!this.isLogin && !this.logoUrl) {
+    if (!this.isLogin && !this.link) {
       const authState = getCurrentAuthState(this.store);
-      this.logoUrl = this.authService.defaultUrl(true, authState);
+      this.link = this.authService.defaultUrl(true, authState);
     }
   }
 }

From ff7de8cf767b3946013f2b645b96d3e456c9ae6d Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Fri, 21 Nov 2025 12:19:54 +0200
Subject: [PATCH 9/9] UI: Refactor tb-logo

---
 .../login/pages/login/login.component.html        |  2 +-
 .../src/app/shared/components/logo.component.html |  6 +++---
 .../src/app/shared/components/logo.component.scss |  9 ++++++---
 .../src/app/shared/components/logo.component.ts   | 15 +++++++++------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.html b/ui-ngx/src/app/modules/login/pages/login/login.component.html
index 25d860256b..1d52f16b42 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.html
@@ -21,7 +21,7 @@
       <form class="tb-login-form" [formGroup]="loginFormGroup" (ngSubmit)="login()">
         <fieldset class="flex flex-col">
           <div class="flex flex-col items-center justify-start" style="padding: 15px 0;">
-            <tb-logo isLogin class="login-logo"></tb-logo>
+            <tb-logo link="https://thingsboard.io" target="_blank" class="login-logo"></tb-logo>
           </div>
           <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
           </mat-progress-bar>
diff --git a/ui-ngx/src/app/shared/components/logo.component.html b/ui-ngx/src/app/shared/components/logo.component.html
index 9374442a82..778cc2c4d2 100644
--- a/ui-ngx/src/app/shared/components/logo.component.html
+++ b/ui-ngx/src/app/shared/components/logo.component.html
@@ -15,12 +15,12 @@
     limitations under the License.
 
 -->
-@if (isLogin) {
-  <a href="https://thingsboard.io" target="_blank">
+@if (isExternal) {
+  <a [href]="link" [target]="target">
     <ng-container *ngTemplateOutlet="logo"></ng-container>
   </a>
 } @else {
-  <a [routerLink]="link">
+  <a [routerLink]="link" [target]="target">
     <ng-container *ngTemplateOutlet="logo"></ng-container>
   </a>
 }
diff --git a/ui-ngx/src/app/shared/components/logo.component.scss b/ui-ngx/src/app/shared/components/logo.component.scss
index 131d257502..0d5133b03a 100644
--- a/ui-ngx/src/app/shared/components/logo.component.scss
+++ b/ui-ngx/src/app/shared/components/logo.component.scss
@@ -15,9 +15,12 @@
  */
 :host {
   pointer-events: auto;
-  a img {
-    width: 100%;
-    height: 100%;
+  a {
+    border: none;
+    img {
+      width: 100%;
+      height: 100%;
+    }
   }
 }
 
diff --git a/ui-ngx/src/app/shared/components/logo.component.ts b/ui-ngx/src/app/shared/components/logo.component.ts
index 763aa63b7c..70965a4c45 100644
--- a/ui-ngx/src/app/shared/components/logo.component.ts
+++ b/ui-ngx/src/app/shared/components/logo.component.ts
@@ -15,7 +15,6 @@
 ///
 
 import { Component, Input, OnInit } from '@angular/core';
-import { coerceBoolean } from '@shared/decorators/coercion';
 import { AuthService } from '@core/auth/auth.service';
 import { AppState } from '@core/core.state';
 import { Store } from '@ngrx/store';
@@ -30,24 +29,28 @@ import { UrlHolder } from '@shared/pipe/image.pipe';
 })
 export class LogoComponent implements OnInit {
 
-  @Input()
-  @coerceBoolean()
-  isLogin: boolean = false;
-
   @Input()
   src: string | UrlHolder = 'assets/logo_title_white.svg';
 
   @Input()
   link: string | UrlTree;
 
+  @Input()
+  target: string = null;
+
+  isExternal = false;
+
   constructor(private authService: AuthService,
               private store: Store<AppState>) {
   }
 
   ngOnInit() {
-    if (!this.isLogin && !this.link) {
+    if (!this.link) {
       const authState = getCurrentAuthState(this.store);
       this.link = this.authService.defaultUrl(true, authState);
     }
+    if (typeof this.link === 'string' && this.link.startsWith('http')) {
+      this.isExternal = true;
+    }
   }
 }