Merge pull request #4221 from vvlladd28/improvement/alarm-widget/default-datasource

UI: Change default datasource type in alarm widget to created widget

ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts

@@ -47,7 +47,7 @@ import {
 } from '@app/shared/models/dashboard.models';
 import { WINDOW } from '@core/services/window.service';
 import { WindowMessage } from '@shared/models/window-message.model';
-import { deepClone, isDefined } from '@app/core/utils';
+import { deepClone, isDefined, isDefinedAndNotNull } from '@app/core/utils';
 import {
   DashboardContext,
   DashboardPageLayout,
@@ -62,6 +62,7 @@ import { MediaBreakpoints } from '@shared/models/constants';
 import { AuthUser } from '@shared/models/user.model';
 import { getCurrentAuthState } from '@core/auth/auth.selectors';
 import {
+  DatasourceType,
   Widget,
   WidgetConfig,
   WidgetInfo,
@@ -891,6 +892,12 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
         const config: WidgetConfig = JSON.parse(widgetTypeInfo.defaultConfig);
         config.title = 'New ' + widgetTypeInfo.widgetName;
         config.datasources = [];
+        if (isDefinedAndNotNull(config.alarmSource)) {
+          config.alarmSource = {
+            type: DatasourceType.entity,
+            dataKeys: config.alarmSource.dataKeys || []
+          };
+        }
         const newWidget: Widget = {
           isSystemType: widget.isSystemType,
           bundleAlias: widget.bundleAlias,

ui-ngx/src/app/modules/home/components/widget/widget-config.component.html

@@ -263,15 +263,6 @@
               </mat-select>
             </mat-form-field>
             <section class="tb-datasource" [ngSwitch]="alarmSourceSettings.get('type').value">
-              <ng-template [ngSwitchCase]="datasourceType.function">
-                <mat-form-field floatLabel="always" [fxShow]="widgetType !== widgetTypes.alarm"
-                                class="tb-datasource-name" style="min-width: 200px;">
-                  <mat-label></mat-label>
-                  <input matInput
-                         placeholder="{{ 'datasource.name' | translate }}"
-                         formControlName="name">
-                </mat-form-field>
-              </ng-template>
               <ng-template [ngSwitchCase]="datasourceType.entity">
                 <tb-entity-alias-select
                   [showLabel]="true"