You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2025/12/01 12:41:33 UTC

(streampipes) branch 4005-projectsshared-ui updated: refactor: Migrate shared-ui to control flow syntax

This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch 4005-projectsshared-ui
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/4005-projectsshared-ui by this push:
     new 45082558a9 refactor: Migrate shared-ui to control flow syntax
45082558a9 is described below

commit 45082558a9c0cc2e31388a114265f5ef705dbd1f
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Mon Dec 1 13:41:25 2025 +0100

    refactor: Migrate shared-ui to control flow syntax
---
 .../asset-browser-hierarchy.component.html         | 132 ++++++-------
 .../asset-browser-node-info.component.html         |  64 ++++---
 .../asset-browser-node.component.html              |  90 ++++-----
 ...asset-browser-filter-asset-model.component.html |  49 ++---
 .../asset-browser-filter-labels.component.html     |  55 +++---
 .../asset-browser-filter-outer.component.html      |  44 ++---
 .../asset-browser-filter-sites.component.html      |  49 ++---
 .../asset-browser-filter-type.component.html       |  49 ++---
 .../asset-browser-filter.component.html            | 110 ++++++-----
 .../asset-browser/asset-browser.component.html     |  47 ++---
 .../asset-link-configuration.component.html        |  48 ++---
 .../basic-inner-panel.component.html               |  92 ++++-----
 .../basic-nav-tabs/basic-nav-tabs.component.html   |  86 +++++----
 .../basic-view/basic-view.component.html           |  77 ++++----
 .../pipeline-element-documentation.component.html  |  53 ++---
 .../live-preview-table.component.html              |  48 ++---
 .../pipeline-element-runtime-info.component.html   |  51 ++---
 .../pipeline-element.component.html                |  56 +++---
 .../sidebar-resize/sidebar-resize.component.html   |  40 ++--
 .../exception-details.component.html               |  69 +++----
 .../sp-exception-message.component.html            |  64 ++++---
 .../split-section/split-section.component.html     |  44 +++--
 .../refresh-interval-settings.component.html       |  44 ++---
 .../time-range-selector.component.html             | 183 ++++++++++--------
 .../custom-time-range-selection.component.html     | 171 +++++++++--------
 .../time-selector-menu.component.html              | 136 +++++++------
 .../confirm-dialog/confirm-dialog.component.html   |  45 ++---
 .../components/download/download.component.html    |  76 ++++----
 .../select-data-range.component.html               |  82 ++++----
 .../select-format/select-format.component.html     | 213 +++++++++++----------
 .../data-download-dialog.component.html            |  95 ++++-----
 .../object-permission-dialog.component.html        | 154 ++++++++-------
 .../pipeline-element-help.component.html           |  58 +++---
 33 files changed, 1385 insertions(+), 1289 deletions(-)

diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html
index 030a81adb0..1d4d18e8e4 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-hierarchy.component.html
@@ -1,66 +1,70 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
-<div fxLayout="column" *ngIf="selectedAsset">
-    <mat-tree
-        [dataSource]="dataSource"
-        [treeControl]="treeControl"
-        class="sp-tree"
-        #tree
-    >
-        <mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
-            <div class="mat-tree-node">
-                <button
-                    mat-icon-button
-                    matTreeNodeToggle
-                    *ngIf="hasChild(0, node) && !hideAssetChildren"
-                    [attr.data-cy]="'button-' + node.nodeName"
-                    [attr.aria-label]="'Toggle ' + node.nodeName"
-                >
-                    <mat-icon class="mat-icon-rtl-mirror">
-                        {{
-                            treeControl.isExpanded(node)
-                                ? 'expand_more'
-                                : 'chevron_right'
-                        }}
-                    </mat-icon>
-                </button>
-                <span
-                    *ngIf="!hasChild(0, node)"
-                    class="mat-icon-button placeholder-icon"
-                >
-                    <mat-icon class="invisible">chevron_right</mat-icon>
-                </span>
-                <sp-asset-browser-node
-                    fxFlex="100"
-                    [node]="node"
-                    [assetBrowserData]="assetBrowserData"
-                    [assetSelectionMode]="assetSelectionMode"
-                    [filteredAssetLinkType]="filteredAssetLinkType"
-                    [resourceCount]="resourceCount"
-                    [selectedAsset]="selectedAsset"
-                    (selectedNodeEmitter)="selectNode($event)"
-                >
-                </sp-asset-browser-node>
-            </div>
-            <div *ngIf="treeControl.isExpanded(node)" role="group">
-                <ng-container matTreeNodeOutlet></ng-container>
-            </div>
-        </mat-nested-tree-node>
-    </mat-tree>
-</div>
+@if (selectedAsset) {
+    <div fxLayout="column">
+        <mat-tree
+            [dataSource]="dataSource"
+            [treeControl]="treeControl"
+            class="sp-tree"
+            #tree
+        >
+            <mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
+                <div class="mat-tree-node">
+                    @if (hasChild(0, node) && !hideAssetChildren) {
+                        <button
+                            mat-icon-button
+                            matTreeNodeToggle
+                            [attr.data-cy]="'button-' + node.nodeName"
+                            [attr.aria-label]="'Toggle ' + node.nodeName"
+                        >
+                            <mat-icon class="mat-icon-rtl-mirror">
+                                {{
+                                    treeControl.isExpanded(node)
+                                        ? 'expand_more'
+                                        : 'chevron_right'
+                                }}
+                            </mat-icon>
+                        </button>
+                    }
+                    @if (!hasChild(0, node)) {
+                        <span class="mat-icon-button placeholder-icon">
+                            <mat-icon class="invisible">chevron_right</mat-icon>
+                        </span>
+                    }
+                    <sp-asset-browser-node
+                        fxFlex="100"
+                        [node]="node"
+                        [assetBrowserData]="assetBrowserData"
+                        [assetSelectionMode]="assetSelectionMode"
+                        [filteredAssetLinkType]="filteredAssetLinkType"
+                        [resourceCount]="resourceCount"
+                        [selectedAsset]="selectedAsset"
+                        (selectedNodeEmitter)="selectNode($event)"
+                    >
+                    </sp-asset-browser-node>
+                </div>
+                @if (treeControl.isExpanded(node)) {
+                    <div role="group">
+                        <ng-container matTreeNodeOutlet></ng-container>
+                    </div>
+                }
+            </mat-nested-tree-node>
+        </mat-tree>
+    </div>
+}
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.html
index e3b399472b..d8477ad760 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node-info/asset-browser-node-info.component.html
@@ -1,33 +1,39 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxLayout="column" class="node-info-outer" fxLayoutGap="10px">
-    <div *ngIf="assetType">
-        <sp-label size="small" [labelText]="assetType"> </sp-label>
-    </div>
-    <div *ngIf="assetSite">
-        <sp-label size="small" [labelText]="assetSite"> </sp-label>
-    </div>
-    <div *ngFor="let label of labels" fxLayout="row wrap">
-        <sp-label
-            size="small"
-            [labelBackground]="label.color"
-            [labelText]="label.label"
-        ></sp-label>
-    </div>
+    @if (assetType) {
+        <div>
+            <sp-label size="small" [labelText]="assetType"> </sp-label>
+        </div>
+    }
+    @if (assetSite) {
+        <div>
+            <sp-label size="small" [labelText]="assetSite"> </sp-label>
+        </div>
+    }
+    @for (label of labels; track label) {
+        <div fxLayout="row wrap">
+            <sp-label
+                size="small"
+                [labelBackground]="label.color"
+                [labelText]="label.label"
+            ></sp-label>
+        </div>
+    }
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html
index 87549779ef..483021fe4a 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-hierarchy/asset-browser-node/asset-browser-node.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div
     [ngClass]="
@@ -39,34 +39,38 @@
     </div>
     <div fxLayoutAlign="end center">
         <div fxLayoutAlign="center center" fxLayout="column">
-            <mat-icon
-                *ngIf="hasContextInfo"
-                (mouseover)="infoOpen = true"
-                (mouseout)="infoOpen = false"
-                cdkOverlayOrigin
-                #trigger="cdkOverlayOrigin"
-                color="primary"
-                class="mr-5 info-icon"
-                fxLayoutAlign="center center"
-            >
-                info
-                <ng-template
-                    cdkConnectedOverlay
-                    [cdkConnectedOverlayOrigin]="trigger"
-                    [cdkConnectedOverlayOpen]="infoOpen"
+            @if (hasContextInfo) {
+                <mat-icon
+                    (mouseover)="infoOpen = true"
+                    (mouseout)="infoOpen = false"
+                    cdkOverlayOrigin
+                    #trigger="cdkOverlayOrigin"
+                    color="primary"
+                    class="mr-5 info-icon"
+                    fxLayoutAlign="center center"
                 >
-                    <sp-asset-browser-node-info
-                        [asset]="node"
-                        [assetBrowserData]="assetBrowserData"
-                    ></sp-asset-browser-node-info>
-                </ng-template>
-            </mat-icon>
+                    info
+                    <ng-template
+                        cdkConnectedOverlay
+                        [cdkConnectedOverlayOrigin]="trigger"
+                        [cdkConnectedOverlayOpen]="infoOpen"
+                    >
+                        <sp-asset-browser-node-info
+                            [asset]="node"
+                            [assetBrowserData]="assetBrowserData"
+                        ></sp-asset-browser-node-info>
+                    </ng-template>
+                </mat-icon>
+            }
         </div>
-        <span
-            *ngIf="!assetSelectionMode"
-            class="resource-count"
-            [ngClass]="nodeResourceCount > 0 ? '' : 'resource-count-disabled'"
-            >{{ nodeResourceCount }}</span
-        >
+        @if (!assetSelectionMode) {
+            <span
+                class="resource-count"
+                [ngClass]="
+                    nodeResourceCount > 0 ? '' : 'resource-count-disabled'
+                "
+                >{{ nodeResourceCount }}</span
+            >
+        }
     </div>
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-asset-model/asset-browser-filter-asset-model.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-asset-model/asset-browser-filter-asset-model.component.html
index bbc517c4fa..98dde8908e 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-asset-model/asset-browser-filter-asset-model.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-asset-model/asset-browser-filter-asset-model.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <sp-asset-browser-filter-outer
     [selectedItems]="activeFilters.selectedAssetModels"
@@ -34,14 +34,15 @@
             [(ngModel)]="activeFilters.selectedAssetModels"
             data-cy="filters-asset-select"
         >
-            <mat-option
-                *ngFor="let asset of assets; let i = index"
-                [value]="asset"
-                [attr.data-cy]="'asset-option-' + asset.assetName"
-                class="smaller-font-size"
-            >
-                {{ asset.assetName }}
-            </mat-option>
+            @for (asset of assets; track asset; let i = $index) {
+                <mat-option
+                    [value]="asset"
+                    [attr.data-cy]="'asset-option-' + asset.assetName"
+                    class="smaller-font-size"
+                >
+                    {{ asset.assetName }}
+                </mat-option>
+            }
         </mat-select>
     </mat-form-field>
 </sp-asset-browser-filter-outer>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html
index 28b51b95be..2a966ca21c 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-labels/asset-browser-filter-labels.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <sp-asset-browser-filter-outer
     [selectedItems]="activeFilters.selectedLabels"
@@ -34,18 +34,19 @@
             [(ngModel)]="activeFilters.selectedLabels"
             data-cy="filters-labels-select"
         >
-            <mat-option
-                *ngFor="let label of labels; let i = index"
-                [value]="label"
-                [attr.data-cy]="'label-option-' + label.label"
-            >
-                <sp-label
-                    [labelText]="label.label"
-                    size="small"
-                    [labelBackground]="label.color"
+            @for (label of labels; track label; let i = $index) {
+                <mat-option
+                    [value]="label"
+                    [attr.data-cy]="'label-option-' + label.label"
                 >
-                </sp-label>
-            </mat-option>
+                    <sp-label
+                        [labelText]="label.label"
+                        size="small"
+                        [labelBackground]="label.color"
+                    >
+                    </sp-label>
+                </mat-option>
+            }
         </mat-select>
     </mat-form-field>
 </sp-asset-browser-filter-outer>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html
index 458d2f75f4..9b96a9f049 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-outer/asset-browser-filter-outer.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div
     fxLayout="row"
@@ -34,13 +34,11 @@
             fxLayoutAlign="start center"
             fxFlex="100"
         >
-            <div
-                fxLayoutAlign="center center"
-                class="active-filters mr-5"
-                *ngIf="selectedItems.length !== allItems.length"
-            >
-                <i class="material-icons fs-icon">filter_alt</i>
-            </div>
+            @if (selectedItems.length !== allItems.length) {
+                <div fxLayoutAlign="center center" class="active-filters mr-5">
+                    <i class="material-icons fs-icon">filter_alt</i>
+                </div>
+            }
             <span>{{ title }}</span>
             <div
                 fxLayout="row"
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html
index 9ab27ed6ed..ee32f1db48 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-sites/asset-browser-filter-sites.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <sp-asset-browser-filter-outer
     [selectedItems]="activeFilters.selectedSites"
@@ -34,14 +34,15 @@
             [(ngModel)]="activeFilters.selectedSites"
             data-cy="filters-sites-select"
         >
-            <mat-option
-                *ngFor="let site of sites; let i = index"
-                [value]="site"
-                [attr.data-cy]="'site-option-' + site.label"
-                class="smaller-font-size"
-            >
-                {{ site.label }}
-            </mat-option>
+            @for (site of sites; track site; let i = $index) {
+                <mat-option
+                    [value]="site"
+                    [attr.data-cy]="'site-option-' + site.label"
+                    class="smaller-font-size"
+                >
+                    {{ site.label }}
+                </mat-option>
+            }
         </mat-select>
     </mat-form-field>
 </sp-asset-browser-filter-outer>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html
index aef8367c07..3101486283 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter-type/asset-browser-filter-type.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <sp-asset-browser-filter-outer
     [selectedItems]="activeFilters.selectedTypes"
@@ -34,14 +34,15 @@
             [(ngModel)]="activeFilters.selectedTypes"
             data-cy="filters-types-select"
         >
-            <mat-option
-                *ngFor="let assetType of allAssetTypes; let i = index"
-                [value]="assetType"
-                class="smaller-font-size"
-                [attr.data-cy]="'type-option-' + assetType.type"
-            >
-                {{ assetType.label }}
-            </mat-option>
+            @for (assetType of allAssetTypes; track assetType; let i = $index) {
+                <mat-option
+                    [value]="assetType"
+                    class="smaller-font-size"
+                    [attr.data-cy]="'type-option-' + assetType.type"
+                >
+                    {{ assetType.label }}
+                </mat-option>
+            }
         </mat-select>
     </mat-form-field>
 </sp-asset-browser-filter-outer>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html
index 9f88d64e4e..8cc110884d 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser-toolbar/asset-browser-filter/asset-browser-filter.component.html
@@ -1,62 +1,60 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
-<div
-    class="menu-content"
-    (click)="$event.stopPropagation()"
-    *ngIf="activeFilters"
->
-    <div fxLayout="column" fxLayoutGap="10px">
-        <sp-asset-browser-filter-asset-model
-            [assets]="assetBrowserData.assets"
-            [activeFilters]="activeFilters"
-        >
-        </sp-asset-browser-filter-asset-model>
-        <sp-asset-browser-filter-type [activeFilters]="activeFilters">
-        </sp-asset-browser-filter-type>
-        <sp-asset-browser-filter-sites
-            [sites]="assetBrowserData.sites"
-            [activeFilters]="activeFilters"
-        >
-        </sp-asset-browser-filter-sites>
-        <sp-asset-browser-filter-labels
-            [labels]="assetBrowserData.labels"
-            [activeFilters]="activeFilters"
-        >
-        </sp-asset-browser-filter-labels>
-        <mat-divider></mat-divider>
-        <div fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="10px">
-            <button
-                data-cy="reset-filters-btn"
-                mat-flat-button
-                class="mat-basic"
-                (click)="resetFilters()"
+@if (activeFilters) {
+    <div class="menu-content" (click)="$event.stopPropagation()">
+        <div fxLayout="column" fxLayoutGap="10px">
+            <sp-asset-browser-filter-asset-model
+                [assets]="assetBrowserData.assets"
+                [activeFilters]="activeFilters"
             >
-                {{ 'Reset filters' | translate }}
-            </button>
-            <button
-                data-cy="apply-filters-btn"
-                mat-flat-button
-                color="accent"
-                (click)="applyFilters()"
+            </sp-asset-browser-filter-asset-model>
+            <sp-asset-browser-filter-type [activeFilters]="activeFilters">
+            </sp-asset-browser-filter-type>
+            <sp-asset-browser-filter-sites
+                [sites]="assetBrowserData.sites"
+                [activeFilters]="activeFilters"
             >
-                {{ 'Apply' | translate }}
-            </button>
+            </sp-asset-browser-filter-sites>
+            <sp-asset-browser-filter-labels
+                [labels]="assetBrowserData.labels"
+                [activeFilters]="activeFilters"
+            >
+            </sp-asset-browser-filter-labels>
+            <mat-divider></mat-divider>
+            <div fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="10px">
+                <button
+                    data-cy="reset-filters-btn"
+                    mat-flat-button
+                    class="mat-basic"
+                    (click)="resetFilters()"
+                >
+                    {{ 'Reset filters' | translate }}
+                </button>
+                <button
+                    data-cy="apply-filters-btn"
+                    mat-flat-button
+                    color="accent"
+                    (click)="applyFilters()"
+                >
+                    {{ 'Apply' | translate }}
+                </button>
+            </div>
         </div>
     </div>
-</div>
+}
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html
index e6de46c57a..78fc665a86 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-browser/asset-browser.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxLayout="row" fxFlex="100">
     @if (showAssetBrowser) {
@@ -66,13 +66,14 @@
                     </div>
                 }
                 @if (!expanded) {
-                    <div
-                        *ngIf="!expanded"
-                        class="asset-hierarchy asset-browser-text"
-                        fxLayoutAlign="center center"
-                    >
-                        {{ 'Asset Browser' | translate }}
-                    </div>
+                    @if (!expanded) {
+                        <div
+                            class="asset-hierarchy asset-browser-text"
+                            fxLayoutAlign="center center"
+                        >
+                            {{ 'Asset Browser' | translate }}
+                        </div>
+                    }
                 }
             </sp-basic-view>
         </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/asset-link-configuration/asset-link-configuration.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/asset-link-configuration/asset-link-configuration.component.html
index 3bd81f6d4f..25bfcf49e0 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/asset-link-configuration/asset-link-configuration.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/asset-link-configuration/asset-link-configuration.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 @if (assetsData?.length) {
     <div class="mt-10">
@@ -52,9 +52,11 @@
                             }
                         </span>
                     </div>
-                    <div *ngIf="treeControl.isExpanded(node)" role="group">
-                        <ng-container matTreeNodeOutlet></ng-container>
-                    </div>
+                    @if (treeControl.isExpanded(node)) {
+                        <div role="group">
+                            <ng-container matTreeNodeOutlet></ng-container>
+                        </div>
+                    }
                 </mat-nested-tree-node>
 
                 <!-- Leaf Node Definition (no children) -->
@@ -78,7 +80,9 @@
     </div>
 } @else {
     <!-- If no assets available -->
-    <div *ngIf="!assetsData?.length">
-        <p>No assets available</p>
-    </div>
+    @if (!assetsData?.length) {
+        <div>
+            <p>No assets available</p>
+        </div>
+    }
 }
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html
index 838e1c1d99..75a59f2e76 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/basic-inner-panel/basic-inner-panel.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div
     fxLayout="column"
@@ -22,36 +22,42 @@
     class="panel-outer"
     [ngStyle]="{ margin: outerMargin }"
 >
-    <div
-        class="general-panel-header"
-        [class.header-collapsed]="collapsed"
-        [ngClass]="headerBackground ? 'bg-highlight' : 'bg-no-highlight'"
-        [style.height]="headerHeight"
-        fxLayout="row"
-        fxLayoutAlign="start center"
-        *ngIf="!hideToolbar"
-    >
-        <div fxLayout="fill" fxFlex="100">
-            <div fxLayoutAlign="start center" fxLayout="row">
-                <div class="content-box-title" *ngIf="showTitle">
-                    {{ panelTitle }}
+    @if (!hideToolbar) {
+        <div
+            class="general-panel-header"
+            [class.header-collapsed]="collapsed"
+            [ngClass]="headerBackground ? 'bg-highlight' : 'bg-no-highlight'"
+            [style.height]="headerHeight"
+            fxLayout="row"
+            fxLayoutAlign="start center"
+        >
+            <div fxLayout="fill" fxFlex="100">
+                <div fxLayoutAlign="start center" fxLayout="row">
+                    @if (showTitle) {
+                        <div class="content-box-title">
+                            {{ panelTitle }}
+                        </div>
+                    }
                 </div>
+                <ng-content select="[header]" class="pr-5"></ng-content>
+                <div fxFlex></div>
+                @if (collapsible) {
+                    <button
+                        type="button"
+                        class="collapse-btn"
+                        (click)="toggleCollapse(); $event.stopPropagation()"
+                    >
+                        <mat-icon
+                            class="chevron-icon"
+                            [class.collapsed]="collapsed"
+                        >
+                            expand_less
+                        </mat-icon>
+                    </button>
+                }
             </div>
-            <ng-content select="[header]" class="pr-5"></ng-content>
-            <div fxFlex></div>
-
-            <button
-                *ngIf="collapsible"
-                type="button"
-                class="collapse-btn"
-                (click)="toggleCollapse(); $event.stopPropagation()"
-            >
-                <mat-icon class="chevron-icon" [class.collapsed]="collapsed">
-                    expand_less
-                </mat-icon>
-            </button>
         </div>
-    </div>
+    }
 
     <div
         class="general-panel-wrapper"
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/basic-nav-tabs/basic-nav-tabs.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/basic-nav-tabs/basic-nav-tabs.component.html
index 4dd8291b91..6eb35811ec 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/basic-nav-tabs/basic-nav-tabs.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/basic-nav-tabs/basic-nav-tabs.component.html
@@ -1,42 +1,43 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxLayout="column" class="page-container">
     <div fxLayout="row" class="p-0 sp-bg-lightgray page-container-nav">
         <div fxFlex="100" class="page-container-nav pr-5" fxLayout="row">
-            <div
-                fxLayout="row"
-                fxLayoutAlign="start center"
-                style="border-right: 2px solid var(--color-bg-2)"
-                class="pl-5 pr-5"
-                *ngIf="showBackLink"
-            >
-                <button
-                    mat-icon-button
-                    color="accent"
-                    [matTooltip]="'Back' | translate"
-                    (click)="navigateBack()"
-                    class="edit-menu-btn"
-                    data-cy="save-data-explorer-go-back-to-overview"
+            @if (showBackLink) {
+                <div
+                    fxLayout="row"
+                    fxLayoutAlign="start center"
+                    style="border-right: 2px solid var(--color-bg-2)"
+                    class="pl-5 pr-5"
                 >
-                    <mat-icon>arrow_back</mat-icon>
-                </button>
-            </div>
+                    <button
+                        mat-icon-button
+                        color="accent"
+                        [matTooltip]="'Back' | translate"
+                        (click)="navigateBack()"
+                        class="edit-menu-btn"
+                        data-cy="save-data-explorer-go-back-to-overview"
+                    >
+                        <mat-icon>arrow_back</mat-icon>
+                    </button>
+                </div>
+            }
             <nav
                 mat-tab-nav-bar
                 [mat-stretch-tabs]="true"
@@ -44,15 +45,16 @@
                 [tabPanel]="tabPanel"
                 class="w-100"
             >
-                <a
-                    mat-tab-link
-                    *ngFor="let item of spNavigationItems"
-                    (click)="navigateTo(item)"
-                    [active]="activeLink === item.itemId"
-                    [attr.data-cy]="'tab-' + item.itemTitle"
-                >
-                    <span>{{ item.itemTitle }}</span>
-                </a>
+                @for (item of spNavigationItems; track item) {
+                    <a
+                        mat-tab-link
+                        (click)="navigateTo(item)"
+                        [active]="activeLink === item.itemId"
+                        [attr.data-cy]="'tab-' + item.itemTitle"
+                    >
+                        <span>{{ item.itemTitle }}</span>
+                    </a>
+                }
             </nav>
             <span fxFlex></span>
             <mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/basic-view/basic-view.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/basic-view/basic-view.component.html
index ae4739788b..01633a2204 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/basic-view/basic-view.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/basic-view/basic-view.component.html
@@ -1,45 +1,48 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxLayout="column" class="page-container">
-    <div fxLayout="row" class="p-0 page-container-nav" *ngIf="!hideNavbar">
-        <div fxLayout="fill" fxFlex="100" class="pl-5 pr-5">
-            <div
-                fxLayout="row"
-                fxLayoutAlign="start center"
-                style="border-right: 2px solid var(--color-bg-2)"
-                *ngIf="showBackLink"
-            >
-                <button
-                    mat-icon-button
-                    color="accent"
-                    [matTooltip]="'Back' | translate"
-                    (click)="navigateBack()"
-                    class="edit-menu-btn"
-                    class="mr-5"
-                    data-cy="save-data-explorer-go-back-to-overview"
-                >
-                    <mat-icon>arrow_back</mat-icon>
-                </button>
+    @if (!hideNavbar) {
+        <div fxLayout="row" class="p-0 page-container-nav">
+            <div fxLayout="fill" fxFlex="100" class="pl-5 pr-5">
+                @if (showBackLink) {
+                    <div
+                        fxLayout="row"
+                        fxLayoutAlign="start center"
+                        style="border-right: 2px solid var(--color-bg-2)"
+                    >
+                        <button
+                            mat-icon-button
+                            color="accent"
+                            [matTooltip]="'Back' | translate"
+                            (click)="navigateBack()"
+                            class="edit-menu-btn"
+                            class="mr-5"
+                            data-cy="save-data-explorer-go-back-to-overview"
+                        >
+                            <mat-icon>arrow_back</mat-icon>
+                        </button>
+                    </div>
+                }
+                <ng-content select="[nav]" fxFlex="100"></ng-content>
             </div>
-            <ng-content select="[nav]" fxFlex="100"></ng-content>
         </div>
-    </div>
+    }
 
     <div
         [ngClass]="padding ? 'page-container-padding-inner' : ''"
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-documentation/pipeline-element-documentation.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-documentation/pipeline-element-documentation.component.html
index ceee5313d8..d778f202b9 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-documentation/pipeline-element-documentation.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-documentation/pipeline-element-documentation.component.html
@@ -1,27 +1,30 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
-<markdown
-    [data]="documentationMarkdown"
-    *ngIf="documentationMarkdown && !error"
-    [ngClass]="useStyling ? 'note' : ''"
-    data-cy="pipeline-element-documentation-markdown"
-></markdown>
-<p *ngIf="error" [ngClass]="useStyling ? 'note' : ''">
-    {{ '(no documentation available)' | translate }}
-</p>
+@if (documentationMarkdown && !error) {
+    <markdown
+        [data]="documentationMarkdown"
+        [ngClass]="useStyling ? 'note' : ''"
+        data-cy="pipeline-element-documentation-markdown"
+    ></markdown>
+}
+@if (error) {
+    <p [ngClass]="useStyling ? 'note' : ''">
+        {{ '(no documentation available)' | translate }}
+    </p>
+}
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/live-preview-table/live-preview-table.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/live-preview-table/live-preview-table.component.html
index 836f044115..8c119527db 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/live-preview-table/live-preview-table.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/live-preview-table/live-preview-table.component.html
@@ -1,23 +1,25 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div data-cy="sp-connect-adapter-success-live-preview">
-    <p *ngIf="showTitle">{{ 'Here is a preview of your data:' | translate }}</p>
+    @if (showTitle) {
+        <p>{{ 'Here is a preview of your data:' | translate }}</p>
+    }
     <table mat-table [dataSource]="runtimeInfo">
         <ng-container matColumnDef="runtimeName">
             <th mat-header-cell *matHeaderCellDef>
@@ -68,21 +70,21 @@
                         {{ 'no data' | translate }}
                     </div>
                 } @else {
-                    <ng-container *ngIf="element.isImage">
+                    @if (element.isImage) {
                         <img
                             src="data:image/png;base64,{{ element.value }}"
                             style="max-width: 150px"
                         />
-                    </ng-container>
-                    <ng-container *ngIf="element.isTimestamp">
+                    }
+                    @if (element.isTimestamp) {
                         <div
                             class="value"
                             [class.value-changed]="element.valueChanged"
                         >
                             {{ element.value | date: 'yyyy-MM-dd HH:mm:ss ' }}
                         </div>
-                    </ng-container>
-                    <ng-container *ngIf="element.hasNoDomainProperty">
+                    }
+                    @if (element.hasNoDomainProperty) {
                         <div
                             [attr.data-cy]="
                                 'live-preview-value-' + element.runtimeName
@@ -92,7 +94,7 @@
                         >
                             {{ element.value }}
                         </div>
-                    </ng-container>
+                    }
                 }
             </td>
         </ng-container>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/pipeline-element-runtime-info.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/pipeline-element-runtime-info.component.html
index a73a4a0fc7..8432e1835c 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/pipeline-element-runtime-info.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element-runtime-info/pipeline-element-runtime-info.component.html
@@ -1,27 +1,30 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
-<sp-live-preview-table
-    *ngIf="runtimeInfo"
-    [showTitle]="showTitle"
-    [eventSchema]="streamDescription.eventSchema"
-    [runtimeInfo]="runtimeInfo"
->
-</sp-live-preview-table>
+@if (runtimeInfo) {
+    <sp-live-preview-table
+        [showTitle]="showTitle"
+        [eventSchema]="streamDescription.eventSchema"
+        [runtimeInfo]="runtimeInfo"
+    >
+    </sp-live-preview-table>
+}
 
-<sp-live-preview-error *ngIf="runtimeDataError"> </sp-live-preview-error>
+@if (runtimeDataError) {
+    <sp-live-preview-error> </sp-live-preview-error>
+}
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element/pipeline-element.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element/pipeline-element.component.html
index 832451e485..df810c7aae 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element/pipeline-element.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/pipeline-element/pipeline-element.component.html
@@ -1,30 +1,30 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
-<img
-    [src]="image"
-    *ngIf="showImage"
-    style="{{ iconSizeCss() }}"
-    class="pipeline-element-image"
-/>
-<span
-    *ngIf="!showImage"
-    [ngClass]="iconStandSize ? 'text-small' : 'element-text-icon'"
->
-    {{ iconText }}
-</span>
+@if (showImage) {
+    <img
+        [src]="image"
+        style="{{ iconSizeCss() }}"
+        class="pipeline-element-image"
+    />
+}
+@if (!showImage) {
+    <span [ngClass]="iconStandSize ? 'text-small' : 'element-text-icon'">
+        {{ iconText }}
+    </span>
+}
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/sidebar-resize/sidebar-resize.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/sidebar-resize/sidebar-resize.component.html
index 56f62f8e08..ff06de3555 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/sidebar-resize/sidebar-resize.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/sidebar-resize/sidebar-resize.component.html
@@ -1,26 +1,24 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 <div class="outer-container">
-    <div
-        *ngIf="isDragging"
-        class="ghost-bar"
-        [style.right.px]="ghostLeft"
-    ></div>
+    @if (isDragging) {
+        <div class="ghost-bar" [style.right.px]="ghostLeft"></div>
+    }
     <div class="resize-container" [style.width.px]="currentWidth">
         <div
             class="resizer"
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/exception-details/exception-details.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/exception-details/exception-details.component.html
index 8dfae6d560..5d0edfc687 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/exception-details/exception-details.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/exception-details/exception-details.component.html
@@ -1,37 +1,38 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 <div
     data-cy="sp-exception-details"
     fxFlex="100"
     fxLayout="column"
     class="mt-10"
 >
-    <div
-        *ngIf="title"
-        fxLayoutAlign="start center"
-        fxFlex="100"
-        class="title-message color-warn"
-    >
-        <i class="material-icons color-warn" style="margin-right: 15px"
-            >warning</i
+    @if (title) {
+        <div
+            fxLayoutAlign="start center"
+            fxFlex="100"
+            class="title-message color-warn"
         >
-        <span class="color-warn">{{ title }}</span>
-    </div>
+            <i class="material-icons color-warn" style="margin-right: 15px"
+                >warning</i
+            >
+            <span class="color-warn">{{ title }}</span>
+        </div>
+    }
     <div class="error-details-title">{{ 'Probable cause' | translate }}</div>
     <div
         class="log-message"
@@ -49,12 +50,14 @@
             {{ 'Full details' | translate }}
         </button>
     </div>
-    <div fxFlex="100" fxLayout="column" *ngIf="showDetails" class="mt-10">
-        <div class="error-details-title">
-            {{ 'Full stack trace' | translate }}
+    @if (showDetails) {
+        <div fxFlex="100" fxLayout="column" class="mt-10">
+            <div class="error-details-title">
+                {{ 'Full stack trace' | translate }}
+            </div>
+            <div class="log-message">
+                <div [innerText]="message.fullStackTrace"></div>
+            </div>
         </div>
-        <div class="log-message">
-            <div [innerText]="message.fullStackTrace"></div>
-        </div>
-    </div>
+    }
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/sp-exception-message.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/sp-exception-message.component.html
index 9332b7c7c4..75a75d094f 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/sp-exception-message.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/sp-exception-message/sp-exception-message.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div
     fxLayout="column"
@@ -32,9 +32,11 @@
             >
                 <div fxLayoutAlign="start center">
                     <i class="material-icons color-warn mr-15">warning</i>
-                    <h5 *ngIf="messageTimestamp" class="mr-15">
-                        {{ messageTimestamp | date: 'short' }}
-                    </h5>
+                    @if (messageTimestamp) {
+                        <h5 class="mr-15">
+                            {{ messageTimestamp | date: 'short' }}
+                        </h5>
+                    }
                     <h5 data-cy="exception-message-title" kfxFlex>
                         {{
                             message.title
@@ -44,17 +46,19 @@
                     </h5>
                 </div>
                 <span fxFlex></span>
-                <div fxLayoutAlign="end center" *ngIf="showDetails">
-                    <button
-                        mat-button
-                        color="accent"
-                        (click)="openDetailsDialog()"
-                    >
-                        <i class="material-icons">visibility</i>&nbsp;{{
-                            'Details' | translate
-                        }}
-                    </button>
-                </div>
+                @if (showDetails) {
+                    <div fxLayoutAlign="end center">
+                        <button
+                            mat-button
+                            color="accent"
+                            (click)="openDetailsDialog()"
+                        >
+                            <i class="material-icons">visibility</i>&nbsp;{{
+                                'Details' | translate
+                            }}
+                        </button>
+                    </div>
+                }
             </div>
         </div>
     </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/split-section/split-section.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/split-section/split-section.component.html
index faab80916a..17352af9ee 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/split-section/split-section.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/split-section/split-section.component.html
@@ -1,24 +1,26 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <section class="section" [class.compact]="compact">
     <header class="section-header">
-        <div class="eyebrow" *ngIf="eyebrow">{{ eyebrow }}</div>
+        @if (eyebrow) {
+            <div class="eyebrow">{{ eyebrow }}</div>
+        }
 
         <h2 class="title">{{ title }}</h2>
 
@@ -26,9 +28,11 @@
             <ng-content select="[section-actions]"></ng-content>
         </div>
 
-        <p class="description" *ngIf="subtitle">
-            {{ subtitle }}
-        </p>
+        @if (subtitle) {
+            <p class="description">
+                {{ subtitle }}
+            </p>
+        }
     </header>
 
     <div class="section-body" role="group" fxLayout="column">
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/refresh-interval-settings/refresh-interval-settings.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/refresh-interval-settings/refresh-interval-settings.component.html
index f6fd561558..f29cf61f28 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/refresh-interval-settings/refresh-interval-settings.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/refresh-interval-settings/refresh-interval-settings.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxLayout="row">
     <button
@@ -29,12 +29,10 @@
         {{ liveSettings.label }}
     </button>
     <mat-menu #menu="matMenu">
-        <button
-            mat-menu-item
-            (click)="modifyRefreshInterval(option)"
-            *ngFor="let option of availableOptions"
-        >
-            <span>{{ option.label }}</span>
-        </button>
+        @for (option of availableOptions; track option) {
+            <button mat-menu-item (click)="modifyRefreshInterval(option)">
+                <span>{{ option.label }}</span>
+            </button>
+        }
     </mat-menu>
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-range-selector.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-range-selector.component.html
index 8fe2a3e558..812077d1dc 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-range-selector.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-range-selector.component.html
@@ -1,81 +1,99 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxLayout="row">
-    <div fxFlex fxLayoutAlign="center center" *ngIf="showTimeSelector">
-        <button
-            mat-icon-button
-            color="accent"
-            (click)="applyPreviousInterval()"
-        >
-            <i class="material-icons">navigate_before</i>
-        </button>
-        <button
-            mat-button
-            color="accent"
-            [matMenuTriggerFor]="menu"
-            #menuTrigger="matMenuTrigger"
-            [matTooltip]="labels.timeRangeSelectorTooltip"
-            data-cy="time-selector-menu"
-            (menuClosed)="menuTrigger.closeMenu()"
-        >
-            <div
-                *ngIf="timeStringMode === 'advanced'"
-                class="formatted-datetime"
+    @if (showTimeSelector) {
+        <div fxFlex fxLayoutAlign="center center">
+            <button
+                mat-icon-button
+                color="accent"
+                (click)="applyPreviousInterval()"
             >
-                <span class="formatted-date">{{ timeString.startDate }}</span>
-                <span *ngIf="enableTimePicker">
-                    &nbsp;<span class="formatted-time">{{
-                        timeString.startTime
-                    }}</span>
-                </span>
-                <div *ngIf="enableTimePicker || !timeString.sameDay">
-                    <span class="formatted-date">&nbsp;-&nbsp;</span>
-                    <span class="formatted-date">{{ timeString.endDate }}</span>
-                    <span *ngIf="enableTimePicker">
-                        &nbsp;<span class="formatted-time">{{
-                            timeString.endTime
+                <i class="material-icons">navigate_before</i>
+            </button>
+            <button
+                mat-button
+                color="accent"
+                [matMenuTriggerFor]="menu"
+                #menuTrigger="matMenuTrigger"
+                [matTooltip]="labels.timeRangeSelectorTooltip"
+                data-cy="time-selector-menu"
+                (menuClosed)="menuTrigger.closeMenu()"
+            >
+                @if (timeStringMode === 'advanced') {
+                    <div class="formatted-datetime">
+                        <span class="formatted-date">{{
+                            timeString.startDate
                         }}</span>
-                    </span>
-                </div>
-            </div>
-            <div class="formatted-datetime" *ngIf="timeStringMode === 'simple'">
-                {{ simpleTimeString }}
-            </div>
-        </button>
-        <button mat-icon-button color="accent" (click)="applyNextInterval()">
-            <i class="material-icons">navigate_next</i>
-        </button>
-
-        <mat-menu #menu="matMenu" fxFlex="100" class="large-menu">
-            <sp-time-selector-menu
-                #timeSelectorMenu
-                [timeSettings]="timeSettings"
-                [labels]="labels"
-                (timeSettingsEmitter)="applyCurrentDateRange($event)"
-                [quickSelections]="quickSelections"
-                [enableTimePicker]="enableTimePicker"
-                [maxDayRange]="maxDayRange"
-                class="w-100"
+                        @if (enableTimePicker) {
+                            <span>
+                                &nbsp;<span class="formatted-time">{{
+                                    timeString.startTime
+                                }}</span>
+                            </span>
+                        }
+                        @if (enableTimePicker || !timeString.sameDay) {
+                            <div>
+                                <span class="formatted-date"
+                                    >&nbsp;-&nbsp;</span
+                                >
+                                <span class="formatted-date">{{
+                                    timeString.endDate
+                                }}</span>
+                                @if (enableTimePicker) {
+                                    <span>
+                                        &nbsp;<span class="formatted-time">{{
+                                            timeString.endTime
+                                        }}</span>
+                                    </span>
+                                }
+                            </div>
+                        }
+                    </div>
+                }
+                @if (timeStringMode === 'simple') {
+                    <div class="formatted-datetime">
+                        {{ simpleTimeString }}
+                    </div>
+                }
+            </button>
+            <button
+                mat-icon-button
+                color="accent"
+                (click)="applyNextInterval()"
             >
-            </sp-time-selector-menu>
-        </mat-menu>
-    </div>
+                <i class="material-icons">navigate_next</i>
+            </button>
+            <mat-menu #menu="matMenu" fxFlex="100" class="large-menu">
+                <sp-time-selector-menu
+                    #timeSelectorMenu
+                    [timeSettings]="timeSettings"
+                    [labels]="labels"
+                    (timeSettingsEmitter)="applyCurrentDateRange($event)"
+                    [quickSelections]="quickSelections"
+                    [enableTimePicker]="enableTimePicker"
+                    [maxDayRange]="maxDayRange"
+                    class="w-100"
+                >
+                </sp-time-selector-menu>
+            </mat-menu>
+        </div>
+    }
     <div fxLayoutAlign="end center">
         <button
             mat-icon-button
@@ -87,15 +105,16 @@
         </button>
     </div>
     <div fxLayoutAlign="end center">
-        <sp-data-explorer-refresh-interval-settings-component
-            #refreshIntervalSettings
-            *ngIf="liveSettings && showIntervalSettings"
-            [liveSettings]="liveSettings"
-            (intervalSettingsChangedEmitter)="
-                intervalSettingsChangedEmitter.emit($event)
-            "
-            [availableOptions]="availableOptions"
-        >
-        </sp-data-explorer-refresh-interval-settings-component>
+        @if (liveSettings && showIntervalSettings) {
+            <sp-data-explorer-refresh-interval-settings-component
+                #refreshIntervalSettings
+                [liveSettings]="liveSettings"
+                (intervalSettingsChangedEmitter)="
+                    intervalSettingsChangedEmitter.emit($event)
+                "
+                [availableOptions]="availableOptions"
+            >
+            </sp-data-explorer-refresh-interval-settings-component>
+        }
     </div>
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/custom-time-range-selection/custom-time-range-selection.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/custom-time-range-selection/custom-time-range-selection.component.html
index 374a662c9f..3435bc2114 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/custom-time-range-selection/custom-time-range-selection.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/custom-time-range-selection/custom-time-range-selection.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxLayout="column" fxFlex="100" class="w-100">
     <div fxLayout="column" fxFlex="100" class="mt-10">
@@ -26,79 +26,82 @@
             </mat-calendar>
         </mat-card>
 
-        <div *ngIf="enableTimePicker" fxLayout="column" class="mt-10 mr-5">
-            <div fxLayout="row" fxLayoutGap="10px">
-                <div fxFlex="30">
-                    <span
-                        class="time-selector"
-                        data-cy="time-selector-start-date"
-                        >{{ currentStartDate }}</span
-                    >
+        @if (enableTimePicker) {
+            <div fxLayout="column" class="mt-10 mr-5">
+                <div fxLayout="row" fxLayoutGap="10px">
+                    <div fxFlex="30">
+                        <span
+                            class="time-selector"
+                            data-cy="time-selector-start-date"
+                            >{{ currentStartDate }}</span
+                        >
+                    </div>
+                    <div fxFlex>
+                        <input
+                            matNativeControl
+                            data-cy="time-selector-start-time"
+                            class="w-100 time-selector"
+                            type="time"
+                            step="1"
+                            [(ngModel)]="currentStartTime"
+                            (ngModelChange)="
+                                updateDateTime(currentDateRange.start, $event)
+                            "
+                        />
+                    </div>
                 </div>
-                <div fxFlex>
-                    <input
-                        matNativeControl
-                        data-cy="time-selector-start-time"
-                        class="w-100 time-selector"
-                        type="time"
-                        step="1"
-                        [(ngModel)]="currentStartTime"
-                        (ngModelChange)="
-                            updateDateTime(currentDateRange.start, $event)
-                        "
-                    />
+                <div fxLayout="row" fxLayoutGap="10px" class="mt-10">
+                    <div fxFlex="30">
+                        <span
+                            class="time-selector"
+                            data-cy="time-selector-end-date"
+                            >{{ currentEndDate }}</span
+                        >
+                    </div>
+                    <div fxFlex>
+                        <input
+                            matNativeControl
+                            data-cy="time-selector-end-time"
+                            class="w-100 time-selector"
+                            type="time"
+                            step="1"
+                            [(ngModel)]="currentEndTime"
+                            (ngModelChange)="
+                                updateDateTime(currentDateRange.end, $event)
+                            "
+                        />
+                    </div>
                 </div>
             </div>
-            <div fxLayout="row" fxLayoutGap="10px" class="mt-10">
-                <div fxFlex="30">
-                    <span
-                        class="time-selector"
-                        data-cy="time-selector-end-date"
-                        >{{ currentEndDate }}</span
-                    >
-                </div>
-                <div fxFlex>
-                    <input
-                        matNativeControl
-                        data-cy="time-selector-end-time"
-                        class="w-100 time-selector"
-                        type="time"
-                        step="1"
-                        [(ngModel)]="currentEndTime"
-                        (ngModelChange)="
-                            updateDateTime(currentDateRange.end, $event)
-                        "
-                    />
-                </div>
-            </div>
-        </div>
-    </div>
-    <div *ngIf="!enableTimePicker" fxLayout="row" class="mt-10 date-preview">
-        {{ dateRangeString }}
-    </div>
-    <div
-        fxLayout="row"
-        class="mt-5 max-date-range-error"
-        *ngIf="maxDateRangeError"
-    >
-        {{
-            labels.maxDayRangeErrorLabel.replace(
-                '${this.maxDayRange}',
-                maxDayRange.toString()
-            )
-        }}
+        }
     </div>
+    @if (!enableTimePicker) {
+        <div fxLayout="row" class="mt-10 date-preview">
+            {{ dateRangeString }}
+        </div>
+    }
+    @if (maxDateRangeError) {
+        <div fxLayout="row" class="mt-5 max-date-range-error">
+            {{
+                labels.maxDayRangeErrorLabel.replace(
+                    '${this.maxDayRange}',
+                    maxDayRange.toString()
+                )
+            }}
+        </div>
+    }
     <div fxLayout="row" fxLayoutAlign="end center" class="mt-10">
         <ng-content> </ng-content>
-        <button
-            mat-flat-button
-            color="accent"
-            data-cy="apply-custom-time"
-            (click)="saveSelection()"
-            [disabled]="!dateSelectionComplete"
-            *ngIf="enableTimePicker"
-        >
-            {{ 'Apply' | translate }}
-        </button>
+        @if (enableTimePicker) {
+            <button
+                mat-flat-button
+                color="accent"
+                data-cy="apply-custom-time"
+                (click)="saveSelection()"
+                [disabled]="!dateSelectionComplete"
+            >
+                {{ 'Apply' | translate }}
+            </button>
+        }
     </div>
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/time-selector-menu.component.html b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/time-selector-menu.component.html
index ae4d68ad55..476c204f29 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/time-selector-menu.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/components/time-selector/time-selector-menu/time-selector-menu.component.html
@@ -1,70 +1,80 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
-<div class="menu-content" (click)="$event.stopPropagation()" *ngIf="labels">
-    <div fxLayout="column" fxLayoutGap="10px">
-        <div fxLayout="row" fxFlex="100" fxLayoutGap="10px">
-            <div fxLayout="column" fxFlex="50" fxLayoutGap="10px">
-                <div class="filter-header">
-                    {{ labels.quickSelectionLabel }}
-                </div>
-                <div fxLayout="column" fxLayoutGap="10px" fxFlex="100">
-                    <div *ngFor="let quickSelection of quickSelections">
-                        <span
-                            class="quick-link"
-                            [ngClass]="{
-                                selected:
-                                    quickSelection.timeSelectionId ===
-                                        timeSettings?.timeSelectionId &&
-                                    timeSettings?.timeSelectionId !== 'custom'
-                            }"
-                            [attr.data-cy]="
-                                'time-selector-quick-' +
-                                quickSelection.timeSelectionId
-                            "
-                            (click)="applyQuickSelection(quickSelection)"
-                            >{{ quickSelection.label }}</span
-                        >
-                        <mat-divider
-                            *ngIf="quickSelection.addDividerAfter"
-                        ></mat-divider>
+@if (labels) {
+    <div class="menu-content" (click)="$event.stopPropagation()">
+        <div fxLayout="column" fxLayoutGap="10px">
+            <div fxLayout="row" fxFlex="100" fxLayoutGap="10px">
+                <div fxLayout="column" fxFlex="50" fxLayoutGap="10px">
+                    <div class="filter-header">
+                        {{ labels.quickSelectionLabel }}
+                    </div>
+                    <div fxLayout="column" fxLayoutGap="10px" fxFlex="100">
+                        @for (
+                            quickSelection of quickSelections;
+                            track quickSelection
+                        ) {
+                            <div>
+                                <span
+                                    class="quick-link"
+                                    [ngClass]="{
+                                        selected:
+                                            quickSelection.timeSelectionId ===
+                                                timeSettings?.timeSelectionId &&
+                                            timeSettings?.timeSelectionId !==
+                                                'custom'
+                                    }"
+                                    [attr.data-cy]="
+                                        'time-selector-quick-' +
+                                        quickSelection.timeSelectionId
+                                    "
+                                    (click)="
+                                        applyQuickSelection(quickSelection)
+                                    "
+                                    >{{ quickSelection.label }}</span
+                                >
+                                @if (quickSelection.addDividerAfter) {
+                                    <mat-divider></mat-divider>
+                                }
+                            </div>
+                        }
                     </div>
                 </div>
-            </div>
-            <div fxLayout="column" fxFlex="50">
-                <div class="filter-header">{{ labels.customLabel }}</div>
-                <sp-custom-time-range-selection
-                    #timeRangeSelection
-                    [timeSettings]="timeSettings"
-                    [labels]="labels"
-                    (timeSettingsEmitter)="
-                        timeSettingsEmitter.emit({
-                            supportsLiveRefresh: false,
-                            timeSettings: $event
-                        })
-                    "
-                    [enableTimePicker]="enableTimePicker"
-                    [maxDayRange]="maxDayRange"
-                    class="w-100"
-                >
-                    <ng-content> </ng-content>
-                </sp-custom-time-range-selection>
+                <div fxLayout="column" fxFlex="50">
+                    <div class="filter-header">{{ labels.customLabel }}</div>
+                    <sp-custom-time-range-selection
+                        #timeRangeSelection
+                        [timeSettings]="timeSettings"
+                        [labels]="labels"
+                        (timeSettingsEmitter)="
+                            timeSettingsEmitter.emit({
+                                supportsLiveRefresh: false,
+                                timeSettings: $event
+                            })
+                        "
+                        [enableTimePicker]="enableTimePicker"
+                        [maxDayRange]="maxDayRange"
+                        class="w-100"
+                    >
+                        <ng-content> </ng-content>
+                    </sp-custom-time-range-selection>
+                </div>
             </div>
         </div>
     </div>
-</div>
+}
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/confirm-dialog/confirm-dialog.component.html b/ui/projects/streampipes/shared-ui/src/lib/dialog/confirm-dialog/confirm-dialog.component.html
index dd9a130083..922c4b6ea5 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/confirm-dialog/confirm-dialog.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/confirm-dialog/confirm-dialog.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div fxFlex="100" fxLayout="column">
     <mat-dialog-content>
@@ -25,14 +25,11 @@
     </mat-dialog-content>
     <mat-dialog-actions>
         <div fxFlex="100" fxLayoutAlign="end center" class="footer">
-            <button
-                mat-button
-                (click)="onCancel()"
-                *ngIf="data.confirmAndCancel"
-                data-cy="cancel-delete"
-            >
-                {{ data.cancelTitle }}
-            </button>
+            @if (data.confirmAndCancel) {
+                <button mat-button (click)="onCancel()" data-cy="cancel-delete">
+                    {{ data.cancelTitle }}
+                </button>
+            }
             <button
                 mat-flat-button
                 color="accent"
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/download/download.component.html b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/download/download.component.html
index afbaabeae2..58af736f75 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/download/download.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/download/download.component.html
@@ -1,42 +1,42 @@
 <!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one or more
-  ~  contributor license agreements.  See the NOTICE file distributed with
-  ~  this work for additional information regarding copyright ownership.
-  ~  The ASF licenses this file to You under the Apache License, Version 2.0
-  ~  (the "License"); you may not use this file except in compliance with
-  ~  the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  -->
+~  Licensed to the Apache Software Foundation (ASF) under one or more
+~  contributor license agreements.  See the NOTICE file distributed with
+~  this work for additional information regarding copyright ownership.
+~  The ASF licenses this file to You under the Apache License, Version 2.0
+~  (the "License"); you may not use this file except in compliance with
+~  the License.  You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~  Unless required by applicable law or agreed to in writing, software
+~  distributed under the License is distributed on an "AS IS" BASIS,
+~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~  See the License for the specific language governing permissions and
+~  limitations under the License.
+~
+-->
 <div fxFlex="100">
     <ng-template matStepLabel>{{ 'Download' | translate }}</ng-template>
-    <div
-        fxLayout="column"
-        fxLayoutAlign="center center"
-        *ngIf="!downloadProgress.finished"
-        class="mt-35"
-    >
-        <mat-spinner [diameter]="30" color="accent"></mat-spinner>
-        <label *ngIf="downloadProgress.downloadedMBs !== undefined"
-            >{{ downloadProgress.downloadedMBs | number: '1.0-2' }} Mb</label
-        >
-        <button mat-button class="btn-warn" (click)="cancelDownload()">
-            {{ 'Cancel' | translate }}
-        </button>
-    </div>
-    <div
-        fxLayout="column"
-        fxLayoutAlign="center center"
-        *ngIf="downloadProgress.finished"
-    >
-        <mat-icon class="icon-check">check</mat-icon>
-        <h5>{{ 'Download successful' | translate }}</h5>
-    </div>
+    @if (!downloadProgress.finished) {
+        <div fxLayout="column" fxLayoutAlign="center center" class="mt-35">
+            <mat-spinner [diameter]="30" color="accent"></mat-spinner>
+            @if (downloadProgress.downloadedMBs !== undefined) {
+                <label
+                    >{{
+                        downloadProgress.downloadedMBs | number: '1.0-2'
+                    }}
+                    Mb</label
+                >
+            }
+            <button mat-button class="btn-warn" (click)="cancelDownload()">
+                {{ 'Cancel' | translate }}
+            </button>
+        </div>
+    }
+    @if (downloadProgress.finished) {
+        <div fxLayout="column" fxLayoutAlign="center center">
+            <mat-icon class="icon-check">check</mat-icon>
+            <h5>{{ 'Download successful' | translate }}</h5>
+        </div>
+    }
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-data/select-data-range/select-data-range.component.html b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-data/select-data-range/select-data-range.component.html
index 908be2ae17..3b1b96b26d 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-data/select-data-range/select-data-range.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-data/select-data-range/select-data-range.component.html
@@ -1,34 +1,35 @@
 <!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one or more
-  ~  contributor license agreements.  See the NOTICE file distributed with
-  ~  this work for additional information regarding copyright ownership.
-  ~  The ASF licenses this file to You under the Apache License, Version 2.0
-  ~  (the "License"); you may not use this file except in compliance with
-  ~  the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  -->
+~  Licensed to the Apache Software Foundation (ASF) under one or more
+~  contributor license agreements.  See the NOTICE file distributed with
+~  this work for additional information regarding copyright ownership.
+~  The ASF licenses this file to You under the Apache License, Version 2.0
+~  (the "License"); you may not use this file except in compliance with
+~  the License.  You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~  Unless required by applicable law or agreed to in writing, software
+~  distributed under the License is distributed on an "AS IS" BASIS,
+~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~  See the License for the specific language governing permissions and
+~  limitations under the License.
+~
+-->
 
 <sp-configuration-box [title]="'Data Range' | translate">
     <mat-radio-group
         class="sp-radio-group"
         [(ngModel)]="dataExportConfig.dataRangeConfiguration"
     >
-        <mat-radio-button
-            value="visible"
-            class="sp-radio-button"
-            data-cy="download-configuration-visible"
-            *ngIf="dataExplorerDataConfig"
-        >
-            {{ 'Currently configured query' | translate }}
-        </mat-radio-button>
+        @if (dataExplorerDataConfig) {
+            <mat-radio-button
+                value="visible"
+                class="sp-radio-button"
+                data-cy="download-configuration-visible"
+            >
+                {{ 'Currently configured query' | translate }}
+            </mat-radio-button>
+        }
         <mat-radio-button
             value="all"
             class="sp-radio-button"
@@ -44,22 +45,23 @@
             {{ 'All data in custom time interval' | translate }}
         </mat-radio-button>
 
-        <div
-            fxLayout="row"
-            fxLayoutGap="10px"
-            class="ml-35"
-            *ngIf="dataExportConfig.dataRangeConfiguration === 'customInterval'"
-        >
-            <div>
-                <h5>{{ 'From' | translate }}&nbsp;</h5>
-                <sp-date-input [(date)]="dataExportConfig.dateRange.startDate">
-                </sp-date-input>
-            </div>
-            <div>
-                <h5>{{ 'To' | translate }}</h5>
-                <sp-date-input [(date)]="dataExportConfig.dateRange.endDate">
-                </sp-date-input>
+        @if (dataExportConfig.dataRangeConfiguration === 'customInterval') {
+            <div fxLayout="row" fxLayoutGap="10px" class="ml-35">
+                <div>
+                    <h5>{{ 'From' | translate }}&nbsp;</h5>
+                    <sp-date-input
+                        [(date)]="dataExportConfig.dateRange.startDate"
+                    >
+                    </sp-date-input>
+                </div>
+                <div>
+                    <h5>{{ 'To' | translate }}</h5>
+                    <sp-date-input
+                        [(date)]="dataExportConfig.dateRange.endDate"
+                    >
+                    </sp-date-input>
+                </div>
             </div>
-        </div>
+        }
     </mat-radio-group>
 </sp-configuration-box>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-format/select-format.component.html b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-format/select-format.component.html
index b9d4f4d2dc..ece417fcd2 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-format/select-format.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/components/select-format/select-format.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one or more
-  ~  contributor license agreements.  See the NOTICE file distributed with
-  ~  this work for additional information regarding copyright ownership.
-  ~  The ASF licenses this file to You under the Apache License, Version 2.0
-  ~  (the "License"); you may not use this file except in compliance with
-  ~  the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  -->
+~  Licensed to the Apache Software Foundation (ASF) under one or more
+~  contributor license agreements.  See the NOTICE file distributed with
+~  this work for additional information regarding copyright ownership.
+~  The ASF licenses this file to You under the Apache License, Version 2.0
+~  (the "License"); you may not use this file except in compliance with
+~  the License.  You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~  Unless required by applicable law or agreed to in writing, software
+~  distributed under the License is distributed on an "AS IS" BASIS,
+~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~  See the License for the specific language governing permissions and
+~  limitations under the License.
+~
+-->
 
 <ng-template matStepLabel>{{ 'Select Format' | translate }}</ng-template>
 <div>
@@ -47,94 +47,97 @@
         </mat-radio-group>
     </sp-configuration-box>
 </div>
-<div *ngIf="formatExportConfig.format === 'csv'" class="mt-10">
-    <sp-configuration-box [title]="'Delimiter' | translate">
-        <mat-radio-group
-            [(ngModel)]="formatExportConfig.delimiter"
-            class="sp-radio-group"
-        >
-            <mat-radio-button
-                value="comma"
-                class="sp-radio-button"
-                data-cy="download-configuration-delimiter-comma"
-                >&nbsp;,
-            </mat-radio-button>
-            <mat-radio-button
-                value="semicolon"
-                class="sp-radio-button"
-                data-cy="download-configuration-delimiter-semicolon"
-                >&nbsp;;
-            </mat-radio-button>
-        </mat-radio-group>
-    </sp-configuration-box>
-</div>
-<div
-    *ngIf="formatExportConfig.format === 'xlsx' && hasReadFilePrivilege"
-    fxLayout="column"
->
-    <sp-configuration-box [title]="'Excel template' | translate">
-        <div fxLayout="column">
-            <mat-checkbox
-                [(ngModel)]="formatExportConfig.useTemplate"
-                [disabled]="excelTemplates.length === 0"
+@if (formatExportConfig.format === 'csv') {
+    <div class="mt-10">
+        <sp-configuration-box [title]="'Delimiter' | translate">
+            <mat-radio-group
+                [(ngModel)]="formatExportConfig.delimiter"
+                class="sp-radio-group"
             >
-                {{ 'Use uploaded file template' | translate }}
-            </mat-checkbox>
-            @if (formatExportConfig.useTemplate && excelTemplates.length > 0) {
-                <mat-form-field class="mt-10" color="accent">
-                    <mat-select
-                        [(ngModel)]="formatExportConfig.templateId"
-                        [placeholder]="'Choose template' | translate"
-                    >
-                        <mat-option
-                            *ngFor="let template of excelTemplates"
-                            [value]="template.fileId"
+                <mat-radio-button
+                    value="comma"
+                    class="sp-radio-button"
+                    data-cy="download-configuration-delimiter-comma"
+                    >&nbsp;,
+                </mat-radio-button>
+                <mat-radio-button
+                    value="semicolon"
+                    class="sp-radio-button"
+                    data-cy="download-configuration-delimiter-semicolon"
+                    >&nbsp;;
+                </mat-radio-button>
+            </mat-radio-group>
+        </sp-configuration-box>
+    </div>
+}
+@if (formatExportConfig.format === 'xlsx' && hasReadFilePrivilege) {
+    <div fxLayout="column">
+        <sp-configuration-box [title]="'Excel template' | translate">
+            <div fxLayout="column">
+                <mat-checkbox
+                    [(ngModel)]="formatExportConfig.useTemplate"
+                    [disabled]="excelTemplates.length === 0"
+                >
+                    {{ 'Use uploaded file template' | translate }}
+                </mat-checkbox>
+                @if (
+                    formatExportConfig.useTemplate && excelTemplates.length > 0
+                ) {
+                    <mat-form-field class="mt-10" color="accent">
+                        <mat-select
+                            [(ngModel)]="formatExportConfig.templateId"
+                            [placeholder]="'Choose template' | translate"
                         >
-                            {{ template.filename }}
-                        </mat-option>
-                    </mat-select>
-                </mat-form-field>
-                <mat-form-field color="accent">
-                    <mat-label>{{
-                        'First row index to append data' | translate
-                    }}</mat-label>
-                    <input
-                        matInput
-                        [(ngModel)]="formatExportConfig.startRow"
-                        type="number"
-                    />
-                </mat-form-field>
-            }
-        </div>
-    </sp-configuration-box>
-</div>
-<div
-    *ngIf="
-        formatExportConfig.format === 'xlsx' ||
-        formatExportConfig.format === 'csv'
-    "
->
-    <sp-configuration-box [title]="'Header column name' | translate">
-        <mat-radio-group
-            [(ngModel)]="formatExportConfig.headerColumnName"
-            class="sp-radio-group"
-        >
-            <mat-radio-button
-                value="key"
-                class="sp-radio-button"
-                data-cy="download-configuration-column-name-key"
-                >{{
-                    'Use field key (runtime name) as header column' | translate
-                }}
-            </mat-radio-button>
-            <mat-radio-button
-                value="label"
-                class="sp-radio-button"
-                data-cy="download-configuration-column-name-label"
-                >{{
-                    'Use field label as header column if available' | translate
-                }}
-            </mat-radio-button>
-        </mat-radio-group>
-    </sp-configuration-box>
-</div>
+                            @for (template of excelTemplates; track template) {
+                                <mat-option [value]="template.fileId">
+                                    {{ template.filename }}
+                                </mat-option>
+                            }
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field color="accent">
+                        <mat-label>{{
+                            'First row index to append data' | translate
+                        }}</mat-label>
+                        <input
+                            matInput
+                            [(ngModel)]="formatExportConfig.startRow"
+                            type="number"
+                        />
+                    </mat-form-field>
+                }
+            </div>
+        </sp-configuration-box>
+    </div>
+}
+@if (
+    formatExportConfig.format === 'xlsx' || formatExportConfig.format === 'csv'
+) {
+    <div>
+        <sp-configuration-box [title]="'Header column name' | translate">
+            <mat-radio-group
+                [(ngModel)]="formatExportConfig.headerColumnName"
+                class="sp-radio-group"
+            >
+                <mat-radio-button
+                    value="key"
+                    class="sp-radio-button"
+                    data-cy="download-configuration-column-name-key"
+                    >{{
+                        'Use field key (runtime name) as header column'
+                            | translate
+                    }}
+                </mat-radio-button>
+                <mat-radio-button
+                    value="label"
+                    class="sp-radio-button"
+                    data-cy="download-configuration-column-name-label"
+                    >{{
+                        'Use field label as header column if available'
+                            | translate
+                    }}
+                </mat-radio-button>
+            </mat-radio-group>
+        </sp-configuration-box>
+    </div>
+}
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/data-download-dialog.component.html b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/data-download-dialog.component.html
index 684c45ddad..7baf2666d3 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/data-download-dialog.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/data-download-dialog.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div class="sp-dialog-container">
     <div class="sp-dialog-content p-15">
@@ -57,35 +57,38 @@
         >
             {{ 'Close' | translate }}
         </button>
-        <button
-            mat-button
-            mat-flat-button
-            class="mat-basic"
-            style="margin-right: 10px"
-            *ngIf="downloadDialogStepper.selectedIndex === 1"
-            (click)="previousStep()"
-        >
-            {{ 'Previous' | translate }}
-        </button>
-        <button
-            mat-button
-            mat-flat-button
-            *ngIf="downloadDialogStepper.selectedIndex < 1"
-            color="accent"
-            (click)="nextStep()"
-            data-cy="download-configuration-next-btn"
-        >
-            {{ 'Next' | translate }}
-        </button>
-        <button
-            mat-button
-            mat-flat-button
-            *ngIf="downloadDialogStepper.selectedIndex === 1"
-            color="accent"
-            (click)="downloadData()"
-            data-cy="download-configuration-download-btn"
-        >
-            {{ 'Download' | translate }}
-        </button>
+        @if (downloadDialogStepper.selectedIndex === 1) {
+            <button
+                mat-button
+                mat-flat-button
+                class="mat-basic"
+                style="margin-right: 10px"
+                (click)="previousStep()"
+            >
+                {{ 'Previous' | translate }}
+            </button>
+        }
+        @if (downloadDialogStepper.selectedIndex < 1) {
+            <button
+                mat-button
+                mat-flat-button
+                color="accent"
+                (click)="nextStep()"
+                data-cy="download-configuration-next-btn"
+            >
+                {{ 'Next' | translate }}
+            </button>
+        }
+        @if (downloadDialogStepper.selectedIndex === 1) {
+            <button
+                mat-button
+                mat-flat-button
+                color="accent"
+                (click)="downloadData()"
+                data-cy="download-configuration-download-btn"
+            >
+                {{ 'Download' | translate }}
+            </button>
+        }
     </div>
 </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/object-permission-dialog/object-permission-dialog.component.html b/ui/projects/streampipes/shared-ui/src/lib/dialog/object-permission-dialog/object-permission-dialog.component.html
index 069e4044a4..de51dbe138 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/object-permission-dialog/object-permission-dialog.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/object-permission-dialog/object-permission-dialog.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div class="sp-dialog-container">
     @if (loading) {
@@ -41,14 +41,15 @@
                                 fxFlex
                                 required
                             >
-                                <mat-option
-                                    *ngFor="let user of allUsers"
-                                    [value]="user.principalId"
-                                    [attr.data-cy]="
-                                        'owner-option-' + user.email
-                                    "
-                                    >{{ user.email }}
-                                </mat-option>
+                                @for (user of allUsers; track user) {
+                                    <mat-option
+                                        [value]="user.principalId"
+                                        [attr.data-cy]="
+                                            'owner-option-' + user.email
+                                        "
+                                        >{{ user.email }}
+                                    </mat-option>
+                                }
                             </mat-select>
                         </mat-form-field>
                         <mat-checkbox
@@ -75,19 +76,21 @@
                                         'User selection' | translate
                                     "
                                 >
-                                    <mat-chip-row
-                                        *ngFor="
-                                            let user of grantedUserAuthorities
-                                        "
-                                        selectable="true"
-                                        removable="true"
-                                        (removed)="removeUser(user)"
-                                    >
-                                        {{ user.email }}
-                                        <button matChipRemove>
-                                            <mat-icon>cancel</mat-icon>
-                                        </button>
-                                    </mat-chip-row>
+                                    @for (
+                                        user of grantedUserAuthorities;
+                                        track user
+                                    ) {
+                                        <mat-chip-row
+                                            selectable="true"
+                                            removable="true"
+                                            (removed)="removeUser(user)"
+                                        >
+                                            {{ user.email }}
+                                            <button matChipRemove>
+                                                <mat-icon>cancel</mat-icon>
+                                            </button>
+                                        </mat-chip-row>
+                                    }
                                     <input
                                         matInput
                                         [placeholder]="'Add' | translate"
@@ -106,17 +109,19 @@
                                     #userAuto="matAutocomplete"
                                     (optionSelected)="userSelected($event)"
                                 >
-                                    <mat-option
-                                        *ngFor="
-                                            let user of filteredUsers$ | async
-                                        "
-                                        [value]="user"
-                                        [attr.data-cy]="
-                                            'user-option-' + user.email
-                                        "
-                                    >
-                                        {{ user.email }}
-                                    </mat-option>
+                                    @for (
+                                        user of filteredUsers$ | async;
+                                        track user
+                                    ) {
+                                        <mat-option
+                                            [value]="user"
+                                            [attr.data-cy]="
+                                                'user-option-' + user.email
+                                            "
+                                        >
+                                            {{ user.email }}
+                                        </mat-option>
+                                    }
                                 </mat-autocomplete>
                             </mat-form-field>
                         </div>
@@ -136,19 +141,21 @@
                                         'Group selection' | translate
                                     "
                                 >
-                                    <mat-chip-row
-                                        *ngFor="
-                                            let group of grantedGroupAuthorities
-                                        "
-                                        selectable="true"
-                                        removable="true"
-                                        (removed)="removeGroup(group)"
-                                    >
-                                        {{ group.groupName }}
-                                        <button matChipRemove>
-                                            <mat-icon>cancel</mat-icon>
-                                        </button>
-                                    </mat-chip-row>
+                                    @for (
+                                        group of grantedGroupAuthorities;
+                                        track group
+                                    ) {
+                                        <mat-chip-row
+                                            selectable="true"
+                                            removable="true"
+                                            (removed)="removeGroup(group)"
+                                        >
+                                            {{ group.groupName }}
+                                            <button matChipRemove>
+                                                <mat-icon>cancel</mat-icon>
+                                            </button>
+                                        </mat-chip-row>
+                                    }
                                     <input
                                         matInput
                                         [placeholder]="'Add' | translate"
@@ -169,17 +176,20 @@
                                     #groupAuto="matAutocomplete"
                                     (optionSelected)="groupSelected($event)"
                                 >
-                                    <mat-option
-                                        [attr.data-cy]="
-                                            'group-option-' + group.groupName
-                                        "
-                                        *ngFor="
-                                            let group of filteredGroups$ | async
-                                        "
-                                        [value]="group"
-                                    >
-                                        {{ group.groupName }}
-                                    </mat-option>
+                                    @for (
+                                        group of filteredGroups$ | async;
+                                        track group
+                                    ) {
+                                        <mat-option
+                                            [attr.data-cy]="
+                                                'group-option-' +
+                                                group.groupName
+                                            "
+                                            [value]="group"
+                                        >
+                                            {{ group.groupName }}
+                                        </mat-option>
+                                    }
                                 </mat-autocomplete>
                             </mat-form-field>
                         </div>
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/pipeline-element-help/pipeline-element-help.component.html b/ui/projects/streampipes/shared-ui/src/lib/dialog/pipeline-element-help/pipeline-element-help.component.html
index f1fdf1bb72..0c3c665695 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/pipeline-element-help/pipeline-element-help.component.html
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/pipeline-element-help/pipeline-element-help.component.html
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
 
 <div class="sp-dialog-container">
     <div class="sp-dialog-content p-15" fxLayout="column">
@@ -38,19 +38,23 @@
             [selectedIndex]="selectedTabIndex"
             (selectedIndexChange)="selectedTabIndex = $event"
         >
-            <mat-tab *ngFor="let tab of tabs" label="{{ tab }}"></mat-tab>
+            @for (tab of tabs; track tab) {
+                <mat-tab label="{{ tab }}"></mat-tab>
+            }
         </mat-tab-group>
 
-        <sp-pipeline-element-runtime-info
-            *ngIf="selectedTabIndex === 0"
-            [showTitle]="false"
-            [streamDescription]="pipelineElement"
-        ></sp-pipeline-element-runtime-info>
-        <sp-pipeline-element-documentation
-            *ngIf="selectedTabIndex === 1"
-            [useStyling]="false"
-            [appId]="pipelineElement.appId"
-        ></sp-pipeline-element-documentation>
+        @if (selectedTabIndex === 0) {
+            <sp-pipeline-element-runtime-info
+                [showTitle]="false"
+                [streamDescription]="pipelineElement"
+            ></sp-pipeline-element-runtime-info>
+        }
+        @if (selectedTabIndex === 1) {
+            <sp-pipeline-element-documentation
+                [useStyling]="false"
+                [appId]="pipelineElement.appId"
+            ></sp-pipeline-element-documentation>
+        }
     </div>
 
     <mat-divider></mat-divider>