From 77e3b5cd8d4906f9f6eefa75231a611ed9d5214f Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Fri, 3 Apr 2026 16:10:45 +0200
Subject: [PATCH 1/2] Add condition to not display "Add Telemetry" button for
 Entity view type

---
 .../home/components/attribute/attribute-table.component.html | 2 +-
 .../home/components/attribute/attribute-table.component.ts   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 6d758b8c7b..c7d204884b 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -34,7 +34,7 @@
         </div>
         <span class="flex-1"></span>
         <button mat-icon-button
-                *ngIf="attributeScope !== attributeScopeTypes.CLIENT_SCOPE"
+                *ngIf="attributeScope !== attributeScopeTypes.CLIENT_SCOPE && !disableAddTelemetry"
                 [disabled]="isLoading$ | async"
                 (click)="addAttribute($event)"
                 matTooltip="{{ 'action.add' | translate }}"
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index 2962307e4c..c3bac7cec5 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -121,6 +121,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
   activeValue = false;
   dirtyValue = false;
   entityIdValue: EntityId;
+  entityType = EntityType;
 
   attributeScopeSelectionReadonly = false;
 
@@ -143,6 +144,10 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     return this.disableAttributeScopeSelectionValue;
   }
 
+  get disableAddTelemetry(): boolean {
+    return this.defaultAttributeScope === this.latestTelemetryTypes.LATEST_TELEMETRY && this.entityType.ENTITY_VIEW === this.entityIdValue.entityType;
+  }
+
   @Input()
   set disableAttributeScopeSelection(value: boolean) {
     this.disableAttributeScopeSelectionValue = coerceBooleanProperty(value);

From 3d97078ae2582eade96b97b3578579f160b26aa9 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Mon, 6 Apr 2026 11:07:31 +0200
Subject: [PATCH 2/2] Changed approach

---
 .../components/attribute/attribute-table.component.ts     | 8 ++++----
 .../pages/entity-view/entity-view-tabs.component.html     | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index c3bac7cec5..fe53f4d988 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -90,6 +90,7 @@ import { Filters } from '@shared/models/query/query.models';
 import { hidePageSizePixelValue } from '@shared/models/constants';
 import { DeleteTimeseriesPanelComponent } from '@home/components/attribute/delete-timeseries-panel.component';
 import { FormBuilder } from '@angular/forms';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
     selector: 'tb-attribute-table',
@@ -121,7 +122,6 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
   activeValue = false;
   dirtyValue = false;
   entityIdValue: EntityId;
-  entityType = EntityType;
 
   attributeScopeSelectionReadonly = false;
 
@@ -144,9 +144,9 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     return this.disableAttributeScopeSelectionValue;
   }
 
-  get disableAddTelemetry(): boolean {
-    return this.defaultAttributeScope === this.latestTelemetryTypes.LATEST_TELEMETRY && this.entityType.ENTITY_VIEW === this.entityIdValue.entityType;
-  }
+  @Input()
+  @coerceBoolean()
+  disableAddTelemetry: boolean;
 
   @Input()
   set disableAttributeScopeSelection(value: boolean) {
diff --git a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html
index b3e1ee2883..3853a0f7e9 100644
--- a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html
+++ b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html
@@ -27,6 +27,7 @@
          label="{{ 'attribute.latest-telemetry' | translate }}" #telemetryTab="matTab">
   <tb-attribute-table [defaultAttributeScope]="latestTelemetryTypes.LATEST_TELEMETRY"
                       disableAttributeScopeSelection
+                      disableAddTelemetry
                       [active]="telemetryTab.isActive"
                       [entityId]="entity.id"
                       [entityName]="entity.name">