Merge pull request #9372 from ArtemDzhereleiko/AD/imp/alarm-table/set…

…tings-order Alarm table settings replace alarm source
thingsboard · Oct 13, 2023 · fed9bb3 · fed9bb3
2 parents eeb5ce9 + c7851c5
commit fed9bb3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...odules/home/components/widget/config/basic/alarm/alarms-table-basic-config.component.html b/...odules/home/components/widget/config/basic/alarm/alarms-table-basic-config.component.html
@@ -18,6 +18,11 @@
 <ng-container [formGroup]="alarmsTableWidgetConfigForm">
   <tb-timewindow-config-panel formControlName="timewindowConfig">
   </tb-timewindow-config-panel>
+  <tb-datasources
+    [configMode]="basicMode"
+    hideDataKeys
+    formControlName="datasources">
+  </tb-datasources>
   <div class="tb-form-panel">
     <div fxLayout="row" fxLayoutAlign="space-between center">
       <div class="tb-form-panel-title" translate>alarm.filter</div>
@@ -29,11 +34,6 @@
     <tb-alarm-filter-config #alarmFilterConfig buttonMode="false" formControlName="alarmFilterConfig"
                             [initialAlarmFilterConfig]="{}"></tb-alarm-filter-config>
   </div>
-  <tb-datasources
-    [configMode]="basicMode"
-    hideDataKeys
-    formControlName="datasources">
-  </tb-datasources>
   <tb-data-keys-panel
     panelTitle="{{ 'widgets.table.columns' | translate }}"
     addKeyTitle="{{ 'widgets.table.add-column' | translate }}"