IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CloudWatch: Remove core imports from app/features/variables/types (#79361)

Browse Source 
* CloudWatch: Remove core imports from app/features/variables/types

* fix import

* lint
This commit is contained in:
Kevin Yu 2023-12-13 06:46:33 -08:00 committed by GitHub
parent 147c1b8d8f
commit 9501d06edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts
View File

@ -10,8 +10,8 @@ import {
} from '@grafana/data'; } from '@grafana/data';
import { getBackendSrv, setBackendSrv, DataSourceWithBackend } from '@grafana/runtime'; import { getBackendSrv, setBackendSrv, DataSourceWithBackend } from '@grafana/runtime';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
import { initialCustomVariableModelState } from 'app/features/variables/custom/reducer';
import { initialCustomVariableModelState } from '../__mocks__/variables';
import { CloudWatchDatasource } from '../datasource'; import { CloudWatchDatasource } from '../datasource';
import { CloudWatchJsonData } from '../types'; import { CloudWatchJsonData } from '../types';

2
public/app/plugins/datasource/cloudwatch/__mocks__/ResourcesAPI.ts
View File

@ -1,6 +1,6 @@
import { CustomVariableModel } from '@grafana/data';
import { getBackendSrv, setBackendSrv } from '@grafana/runtime'; import { getBackendSrv, setBackendSrv } from '@grafana/runtime';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
import { CustomVariableModel } from 'app/features/variables/types';
import { ResourcesAPI } from '../resources/ResourcesAPI'; import { ResourcesAPI } from '../resources/ResourcesAPI';

26
public/app/plugins/datasource/cloudwatch/__mocks__/variables.ts Normal file
View File

@ -0,0 +1,26 @@
import { BaseVariableModel, CustomVariableModel, LoadingState, VariableHide, VariableOption } from '@grafana/data';
export const initialVariableModelState: BaseVariableModel = {
id: '00000000-0000-0000-0000-000000000000',
rootStateKey: null,
name: '',
type: 'query',
global: false,
index: -1,
hide: VariableHide.dontHide,
skipUrlSync: false,
state: LoadingState.NotStarted,
error: null,
description: null,
};
export const initialCustomVariableModelState: CustomVariableModel = {
...initialVariableModelState,
type: 'custom',
multi: false,
includeAll: false,
allValue: null,
query: '',
options: [],
current: {} as VariableOption,
};

4
public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx
View File

@ -2,11 +2,11 @@ import { render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import selectEvent from 'react-select-event'; import selectEvent from 'react-select-event';
import { DataSourceInstanceSettings } from '@grafana/data'; import { CustomVariableModel, DataSourceInstanceSettings } from '@grafana/data';
import * as ui from '@grafana/ui'; import * as ui from '@grafana/ui';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
import { CustomVariableModel, initialVariableModelState } from '../../../../../../features/variables/types'; import { initialVariableModelState } from '../../../__mocks__/variables';
import { CloudWatchDatasource } from '../../../datasource'; import { CloudWatchDatasource } from '../../../datasource';
import { CloudWatchJsonData, MetricEditorMode, MetricQueryType } from '../../../types'; import { CloudWatchJsonData, MetricEditorMode, MetricQueryType } from '../../../types';

2
public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
View File

@ -3,7 +3,6 @@ import { of } from 'rxjs';
import { CustomVariableModel, getFrameDisplayName, VariableHide } from '@grafana/data'; import { CustomVariableModel, getFrameDisplayName, VariableHide } from '@grafana/data';
import { dateTime } from '@grafana/data/src/datetime/moment_wrapper'; import { dateTime } from '@grafana/data/src/datetime/moment_wrapper';
import { BackendDataSourceResponse } from '@grafana/runtime'; import { BackendDataSourceResponse } from '@grafana/runtime';
import { initialVariableModelState } from 'app/features/variables/types';
import * as redux from 'app/store/store'; import * as redux from 'app/store/store';
import { import {
@ -17,6 +16,7 @@ import {
} from '../__mocks__/CloudWatchDataSource'; } from '../__mocks__/CloudWatchDataSource';
import { setupMockedMetricsQueryRunner } from '../__mocks__/MetricsQueryRunner'; import { setupMockedMetricsQueryRunner } from '../__mocks__/MetricsQueryRunner';
import { validMetricSearchBuilderQuery, validMetricSearchCodeQuery } from '../__mocks__/queries'; import { validMetricSearchBuilderQuery, validMetricSearchCodeQuery } from '../__mocks__/queries';
import { initialVariableModelState } from '../__mocks__/variables';
import { MetricQueryType, MetricEditorMode, CloudWatchMetricsQuery, DataQueryError } from '../types'; import { MetricQueryType, MetricEditorMode, CloudWatchMetricsQuery, DataQueryError } from '../types';
describe('CloudWatchMetricsQueryRunner', () => { describe('CloudWatchMetricsQueryRunner', () => {