Tweak after rebase

grafana · Mar 6, 2023 · 158e721 · 158e721
1 parent 491bd33
commit 158e721
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...ting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx b/...ting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
@@ -254,8 +254,6 @@ export const QueryAndExpressionsStep: FC<Props> = ({ editingExistingRule, onData
                   {...field}
                   dataSourceName={dataSourceName}
                   showPreviewAlertsButton={!isRecordingRuleType}
-                  asyncDefaultQuery={asyncDefaultQueries?.[0]}
-                  preservePreviousValue={!updateWithDefault}
                 />
               );
             }}

diff --git a/public/app/features/alerting/unified/utils/rule-form.ts b/public/app/features/alerting/unified/utils/rule-form.ts
@@ -11,6 +11,7 @@ import {
 } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
+import { DataSourceJsonData } from '@grafana/schema';
 import { getNextRefIdChar } from 'app/core/utils/query';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 import { ExpressionDatasourceUID } from 'app/features/expressions/ExpressionDatasource';