From ed5b2e5210bf66e4174a0f6356739f6a39f7c308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Feb 2022 14:20:50 +0100 Subject: [PATCH] Move QueryPartDef out from angular app (#45386) --- public/app/features/alerting/AlertTabCtrl.ts | 2 +- public/app/features/alerting/state/alertDef.ts | 2 +- .../components => features/alerting/state}/query_part.ts | 0 .../influxdb/components/VisualInfluxQLEditor/partListUtils.tsx | 2 +- public/app/plugins/datasource/influxdb/query_part.ts | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename public/app/{angular/components => features/alerting/state}/query_part.ts (100%) diff --git a/public/app/features/alerting/AlertTabCtrl.ts b/public/app/features/alerting/AlertTabCtrl.ts index e883925b740..db3081bf74e 100644 --- a/public/app/features/alerting/AlertTabCtrl.ts +++ b/public/app/features/alerting/AlertTabCtrl.ts @@ -1,7 +1,7 @@ import { find, map, reduce, remove } from 'lodash'; import coreModule from 'app/angular/core_module'; import { ThresholdMapper } from './state/ThresholdMapper'; -import { QueryPart } from 'app/angular/components/query_part'; +import { QueryPart } from 'app/features/alerting/state/query_part'; import alertDef from './state/alertDef'; import config from 'app/core/config'; import appEvents from 'app/core/app_events'; diff --git a/public/app/features/alerting/state/alertDef.ts b/public/app/features/alerting/state/alertDef.ts index 1e482568f43..4851974b39e 100644 --- a/public/app/features/alerting/state/alertDef.ts +++ b/public/app/features/alerting/state/alertDef.ts @@ -1,5 +1,5 @@ import { isArray, reduce } from 'lodash'; -import { QueryPartDef, QueryPart } from 'app/angular/components/query_part'; +import { QueryPartDef, QueryPart } from 'app/features/alerting/state/query_part'; const alertQueryDef = new QueryPartDef({ type: 'query', diff --git a/public/app/angular/components/query_part.ts b/public/app/features/alerting/state/query_part.ts similarity index 100% rename from public/app/angular/components/query_part.ts rename to public/app/features/alerting/state/query_part.ts diff --git a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/partListUtils.tsx b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/partListUtils.tsx index 5a3720a8cd5..bd5eb0663bc 100644 --- a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/partListUtils.tsx +++ b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/partListUtils.tsx @@ -5,7 +5,7 @@ import InfluxQueryModel from '../../influx_query_model'; import { unwrap } from './unwrap'; import queryPart from '../../query_part'; import { toSelectableValue } from './toSelectableValue'; -import { QueryPartDef } from 'app/angular/components/query_part'; +import { QueryPartDef } from 'app/features/alerting/state/query_part'; type Categories = Record; diff --git a/public/app/plugins/datasource/influxdb/query_part.ts b/public/app/plugins/datasource/influxdb/query_part.ts index e144f844ec8..98d7cdc55f9 100644 --- a/public/app/plugins/datasource/influxdb/query_part.ts +++ b/public/app/plugins/datasource/influxdb/query_part.ts @@ -1,5 +1,5 @@ import { map, clone } from 'lodash'; -import { QueryPartDef, QueryPart, functionRenderer, suffixRenderer } from 'app/angular/components/query_part'; +import { QueryPartDef, QueryPart, functionRenderer, suffixRenderer } from 'app/features/alerting/state/query_part'; const index: any[] = []; const categories: any = {