mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Angular: Isolate angular more (#41440)
* Getting close * Restore angular app boot at startup * Moving angular annotations dependencies to app/angular or old graph * Remove redundant setLinkSrv call * Fixing graph test * Minor refactor based on review feedback * Create in get function
This commit is contained in:
@@ -4,7 +4,7 @@ import { AnnotationsQueryRunner } from './AnnotationsQueryRunner';
|
||||
import { AnnotationQueryRunnerOptions } from './types';
|
||||
import { silenceConsoleOutput } from '../../../../../test/core/utils/silenceConsoleOutput';
|
||||
import * as store from '../../../../store/store';
|
||||
import * as annotationsSrv from '../../../annotations/annotations_srv';
|
||||
import * as annotationsSrv from '../../../annotations/executeAnnotationQuery';
|
||||
import { Observable, of, throwError } from 'rxjs';
|
||||
import { toAsyncOfResult } from './testHelpers';
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import { AnnotationEvent, DataSourceApi } from '@grafana/data';
|
||||
|
||||
import { AnnotationQueryRunner, AnnotationQueryRunnerOptions } from './types';
|
||||
import { PanelModel } from '../../../dashboard/state';
|
||||
import { executeAnnotationQuery } from '../../../annotations/annotations_srv';
|
||||
import { executeAnnotationQuery } from '../../../annotations/executeAnnotationQuery';
|
||||
import { handleAnnotationQueryRunnerError } from './utils';
|
||||
|
||||
export class AnnotationsQueryRunner implements AnnotationQueryRunner {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Subject, throwError } from 'rxjs';
|
||||
import { setDataSourceSrv } from '@grafana/runtime';
|
||||
|
||||
import { AnnotationsWorker } from './AnnotationsWorker';
|
||||
import * as annotationsSrv from '../../../annotations/annotations_srv';
|
||||
import * as annotationsSrv from '../../../annotations/executeAnnotationQuery';
|
||||
import { getDefaultOptions, LEGACY_DS_NAME, NEXT_GEN_DS_NAME, toAsyncOfResult } from './testHelpers';
|
||||
import { silenceConsoleOutput } from '../../../../../test/core/utils/silenceConsoleOutput';
|
||||
import { createDashboardQueryRunner, setDashboardQueryRunnerFactory } from './DashboardQueryRunner';
|
||||
|
||||
@@ -3,7 +3,7 @@ import { delay } from 'rxjs/operators';
|
||||
import { setDataSourceSrv } from '@grafana/runtime';
|
||||
import { AlertState, AlertStateInfo } from '@grafana/data';
|
||||
|
||||
import * as annotationsSrv from '../../../annotations/annotations_srv';
|
||||
import * as annotationsSrv from '../../../annotations/executeAnnotationQuery';
|
||||
import { getDefaultOptions, LEGACY_DS_NAME, NEXT_GEN_DS_NAME, toAsyncOfResult } from './testHelpers';
|
||||
import { backendSrv } from '../../../../core/services/backend_srv';
|
||||
import { DashboardQueryRunner, DashboardQueryRunnerResult } from './types';
|
||||
|
||||
Reference in New Issue
Block a user