From d409917bbc6e7b52a82fc7203343ba7a290477a5 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Thu, 2 Jul 2026 18:43:48 +0200
Subject: [PATCH] Fixed missing fors

---
 .../home/components/entity/entities-table.component.html      | 2 +-
 .../widget/lib/alarm/alarms-table-widget.component.html       | 2 +-
 .../widget/lib/timeseries-table-widget.component.html         | 4 ++--
 ui-ngx/src/app/modules/home/menu/menu-toggle.component.html   | 2 +-
 ui-ngx/src/app/modules/home/menu/side-menu.component.html     | 2 +-
 .../home/pages/widget/widgets-bundle-widgets.component.html   | 2 +-
 ui-ngx/src/app/shared/components/toggle-header.component.html | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
index 52906f6386..84544a6611 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
@@ -293,7 +293,7 @@
                 </mat-cell>
               </ng-container>
             }
-            @for (column of actionColumns; track column) {
+            @for (column of actionColumns; track column.key) {
               <ng-container [matColumnDef]="column.key">
                 <mat-header-cell *matHeaderCellDef [style]="headerCellStyle(column)" mat-sort-header [disabled]="!column.sortable"> {{ column.title | translate }} </mat-header-cell>
                 <mat-cell *matCellDef="let entity; let row = index"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html
index 0ac56423a9..9760016def 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html
@@ -81,7 +81,7 @@
             </mat-checkbox>
           </mat-cell>
         </ng-container>
-        @for (column of columns; track column) {
+        @for (column of columns; track column.def) {
           <ng-container [matColumnDef]="column.def">
             <mat-header-cell [style]="headerStyle(column)" *matHeaderCellDef mat-sort-header [disabled]="!column.sortable">
               {{ column.title }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html
index f6eb022e6b..1354886c3b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html
@@ -41,7 +41,7 @@
                    class="flex-1"
                    mat-stretch-tabs="false"
                    [(selectedIndex)]="sourceIndex" (selectedIndexChange)="onSourceIndexChanged()">
-      @for (source of sources; track source; let index = $index) {
+      @for (source of sources; track source.datasource.entityId; let index = $index) {
         <mat-tab [label]="source.displayName">
           @if (isActiveTab(index)) {
             <div class="table-container flex-1">
@@ -56,7 +56,7 @@
                     </mat-cell>
                   </ng-container>
                 }
-                @for (h of source.header; track h) {
+                @for (h of source.header; track h.index) {
                   <ng-container [matColumnDef]="h.index + ''">
                     <mat-header-cell *matHeaderCellDef mat-sort-header [disabled]="!h.sortable"> {{ h.dataKey.label }} </mat-header-cell>
                     <mat-cell *matCellDef="let row; let rowIndex = index"
diff --git a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html
index 1c470983b7..850409b964 100644
--- a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html
+++ b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html
@@ -37,7 +37,7 @@
   [class.tb-toggled]="section.opened"></span>
 </a>
 <ul id="docs-menu-{{section.name | nospace}}" class="tb-menu-toggle-list" [style.height]="sectionHeight()">
-  @for (page of section.pages; track page) {
+  @for (page of section.pages; track page.id) {
     <li>
       <tb-menu-link [section]="page"></tb-menu-link>
     </li>
diff --git a/ui-ngx/src/app/modules/home/menu/side-menu.component.html b/ui-ngx/src/app/modules/home/menu/side-menu.component.html
index cd8a3749dd..949467b6cc 100644
--- a/ui-ngx/src/app/modules/home/menu/side-menu.component.html
+++ b/ui-ngx/src/app/modules/home/menu/side-menu.component.html
@@ -16,7 +16,7 @@
 
 -->
 <ul class="tb-side-menu flex flex-col items-stretch justify-start" [class.tb-collapsed]="collapsed">
-  @for (section of menuSections$ | async; track section) {
+  @for (section of menuSections$ | async; track section.id) {
     <li>
       @switch (section.type) {
         @case ('link') {
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html
index 627b5667c8..713d56d5e1 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html
@@ -64,7 +64,7 @@
   <mat-card-content>
     <div class="tb-drop-list tb-bundle-widgets-container" cdkDropList cdkDropListOrientation="vertical"
          (cdkDropListDropped)="widgetDrop($event)" [cdkDropListDisabled]="!editMode || widgets?.length < 2">
-      @for (widget of widgets; track widget; let isLast = $last) {
+      @for (widget of widgets; track widget.id.id; let isLast = $last) {
         <div cdkDrag class="tb-draggable tb-bundle-widget-row">
           <div class="tb-bundle-widget-row-details">
             <img class="tb-bundle-widget-image-preview" [src]="widget.image | image: {preview: true, emptyUrl: '/assets/widget-preview-empty.svg'} | async" alt="{{ widget.name }}">
diff --git a/ui-ngx/src/app/shared/components/toggle-header.component.html b/ui-ngx/src/app/shared/components/toggle-header.component.html
index 28fc2b692f..73d643fd40 100644
--- a/ui-ngx/src/app/shared/components/toggle-header.component.html
+++ b/ui-ngx/src/app/shared/components/toggle-header.component.html
@@ -42,7 +42,7 @@
                              [name]="name"
                              [(ngModel)]="value"
                              (ngModelChange)="valueChange.emit(value)">
-      @for (option of options; track option) {
+      @for (option of options; track option.value) {
         <mat-button-toggle [value]="option.value" [disabled]="disabled" [class.tb-toggle-button-error]="(option.error$ | async) && value !== option.value">
           @if (option.template) {
             <ng-container *ngTemplateOutlet="option.template"></ng-container>