chore(alarms): Standardize import quotes and reorganize AlarmsDataSourceCore

src/datasources/alarms/components/editors/alarms-count/AlarmsCountQueryEditor.tsx

@@ -1,11 +1,11 @@
-import { AlarmsCountQuery } from "datasources/alarms/types/AlarmsCount.types";
-import React, { useEffect, useState } from "react";
-import { InlineField } from "core/components/InlineField";
-import { AlarmsQueryBuilder } from "../../query-builder/AlarmsQueryBuilder";
-import { ERROR_SEVERITY_WARNING, LABEL_WIDTH, labels, tooltips } from "datasources/alarms/constants/AlarmsQueryEditor.constants";
-import { AlarmsCountDataSource } from "datasources/alarms/query-type-handlers/alarms-count/AlarmsCountDataSource";
-import { Workspace } from "core/types";
-import { FloatingError } from "core/errors";
+import { AlarmsCountQuery } from 'datasources/alarms/types/AlarmsCount.types';
+import React, { useEffect, useState } from 'react';
+import { InlineField } from 'core/components/InlineField';
+import { AlarmsQueryBuilder } from '../../query-builder/AlarmsQueryBuilder';
+import { ERROR_SEVERITY_WARNING, LABEL_WIDTH, labels, tooltips } from 'datasources/alarms/constants/AlarmsQueryEditor.constants';
+import { AlarmsCountDataSource } from 'datasources/alarms/query-type-handlers/alarms-count/AlarmsCountDataSource';
+import { Workspace } from 'core/types';
+import { FloatingError } from 'core/errors';
 
 type Props = {
   query: AlarmsCountQuery;

src/datasources/alarms/constants/AlarmsQueryEditor.constants.ts

@@ -1,4 +1,4 @@
-import { AlertVariant } from "@grafana/ui";
+import { AlertVariant } from '@grafana/ui';
 
 export const LABEL_WIDTH = 26;
 export const ERROR_SEVERITY_WARNING: AlertVariant = 'warning';

src/datasources/alarms/constants/defaultQueries.ts → src/datasources/alarms/constants/DefaultQueries.constants.ts

@@ -1,5 +1,5 @@
-import { AlarmsCountQuery } from "../types/AlarmsCount.types";
-import { QueryType } from "../types/types";
+import { AlarmsCountQuery } from '../types/AlarmsCount.types';
+import { QueryType } from '../types/types';
 
 export const defaultAlarmsCountQuery: Omit<AlarmsCountQuery, 'refId'> = {
     queryType: QueryType.AlarmsCount,

src/datasources/alarms/AlarmsDataSourceCore.test.ts → src/datasources/alarms/query-type-handlers/AlarmsQueryHandlersCore.test.ts

@@ -1,11 +1,12 @@
-import { AlarmsDataSourceCore } from './AlarmsDataSourceCore';
+import { AlarmsQueryHandlersCore } from './AlarmsQueryHandlersCore';
 import { DataFrameDTO, DataQueryRequest, ScopedVars } from '@grafana/data';
-import { AlarmsQuery, QueryAlarmsRequest, QueryType } from './types/types';
+import { AlarmsQuery, QueryAlarmsRequest, QueryType } from '../types/types';
 import { MockProxy } from 'jest-mock-extended';
 import { BackendSrv } from '@grafana/runtime';
 import { createFetchError, createFetchResponse, requestMatching, setupDataSource } from 'test/fixtures';
-import { QUERY_ALARMS_RELATIVE_PATH } from './constants/QueryAlarms.constants';
+import { QUERY_ALARMS_RELATIVE_PATH } from '../constants/QueryAlarms.constants';
 import { Workspace } from 'core/types';
+import { getVariableOptions } from 'core/utils';
 
 jest.mock('core/utils', () => ({
   getVariableOptions: jest.fn(),
@@ -23,13 +24,8 @@ jest.mock('shared/workspace.utils', () => {
     }))
   };
 });
-import { getVariableOptions } from 'core/utils';
-
-jest.mock('core/utils', () => ({
-  getVariableOptions: jest.fn(),
-}));
 
-class TestAlarmsDataSource extends AlarmsDataSourceCore {
+class TestAlarmsDataSource extends AlarmsQueryHandlersCore {
   async runQuery(query: AlarmsQuery, _: DataQueryRequest): Promise<DataFrameDTO> {
 
     return {
@@ -51,7 +47,7 @@ class TestAlarmsDataSource extends AlarmsDataSourceCore {
   };
 }
 
-describe('AlarmsDataSourceCore', () => {
+describe('AlarmsQueryHandlersCore', () => {
   let datastore: TestAlarmsDataSource, backendServer: MockProxy<BackendSrv>;
 
   beforeEach(() => {

src/datasources/alarms/AlarmsDataSourceCore.ts → src/datasources/alarms/query-type-handlers/AlarmsQueryHandlersCore.ts

@@ -1,17 +1,17 @@
-import { DataSourceBase } from "core/DataSourceBase";
-import { DataQueryRequest, DataFrameDTO, TestDataSourceResponse, AppEvents, ScopedVars, DataSourceInstanceSettings } from "@grafana/data";
-import { AlarmsQuery, QueryAlarmsRequest, QueryAlarmsResponse } from "./types/types";
-import { extractErrorInfo } from "core/errors";
-import { QUERY_ALARMS_RELATIVE_PATH } from "./constants/QueryAlarms.constants";
-import { ExpressionTransformFunction, getConcatOperatorForMultiExpression, multipleValuesQuery, timeFieldsQuery, transformComputedFieldsQuery } from "core/query-builder.utils";
-import { ALARMS_TIME_FIELDS, AlarmsQueryBuilderFields } from "./constants/AlarmsQueryBuilder.constants";
-import { QueryBuilderOption, Workspace } from "core/types";
-import { WorkspaceUtils } from "shared/workspace.utils";
-import { getVariableOptions } from "core/utils";
-import { BackendSrv, getBackendSrv, getTemplateSrv, TemplateSrv } from "@grafana/runtime";
-import { MINION_ID_CUSTOM_PROPERTY, SYSTEM_CUSTOM_PROPERTY } from "./constants/SourceProperties.constants";
-
-export abstract class AlarmsDataSourceCore extends DataSourceBase<AlarmsQuery> {
+import { DataSourceBase } from 'core/DataSourceBase';
+import { DataQueryRequest, DataFrameDTO, TestDataSourceResponse, AppEvents, ScopedVars, DataSourceInstanceSettings } from '@grafana/data';
+import { AlarmsQuery, QueryAlarmsRequest, QueryAlarmsResponse } from '../types/types';
+import { extractErrorInfo } from 'core/errors';
+import { QUERY_ALARMS_RELATIVE_PATH } from '../constants/QueryAlarms.constants';
+import { ExpressionTransformFunction, getConcatOperatorForMultiExpression, multipleValuesQuery, timeFieldsQuery, transformComputedFieldsQuery } from 'core/query-builder.utils';
+import { ALARMS_TIME_FIELDS, AlarmsQueryBuilderFields } from '../constants/AlarmsQueryBuilder.constants';
+import { QueryBuilderOption, Workspace } from 'core/types';
+import { WorkspaceUtils } from 'shared/workspace.utils';
+import { getVariableOptions } from 'core/utils';
+import { BackendSrv, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
+import { MINION_ID_CUSTOM_PROPERTY, SYSTEM_CUSTOM_PROPERTY } from '../constants/SourceProperties.constants';
+
+export abstract class AlarmsQueryHandlersCore extends DataSourceBase<AlarmsQuery> {
   public errorTitle?: string;
   public errorDescription?: string;
 
@@ -147,6 +147,6 @@ export abstract class AlarmsDataSourceCore extends DataSourceBase<AlarmsQuery> {
   }
 
   public testDatasource(): Promise<TestDataSourceResponse> {
-    throw new Error("Method not implemented.");
+    throw new Error('Method not implemented.');
   }
 }

src/datasources/alarms/query-type-handlers/alarms-count/AlarmsCountDataSource.ts

@@ -1,10 +1,10 @@
 import { DataFrameDTO, DataQueryRequest, FieldType } from '@grafana/data';
-import { AlarmsDataSourceCore } from 'datasources/alarms/AlarmsDataSourceCore';
-import { defaultAlarmsCountQuery } from 'datasources/alarms/constants/defaultQueries';
+import { AlarmsQueryHandlersCore } from 'datasources/alarms/query-type-handlers/AlarmsQueryHandlersCore';
 import { MINIMUM_TAKE } from 'datasources/alarms/constants/QueryAlarms.constants';
 import { AlarmsCountQuery } from 'datasources/alarms/types/AlarmsCount.types';
+import { defaultAlarmsCountQuery } from 'datasources/alarms/constants/DefaultQueries.constants';
 
-export class AlarmsCountDataSource extends AlarmsDataSourceCore {
+export class AlarmsCountDataSource extends AlarmsQueryHandlersCore {
   public readonly defaultQuery = defaultAlarmsCountQuery;
 
   public async runQuery(query: AlarmsCountQuery, options: DataQueryRequest): Promise<DataFrameDTO> {

src/datasources/alarms/types/AlarmsCount.types.ts

@@ -1,4 +1,4 @@
-import { AlarmsQuery } from "./types";
+import { AlarmsQuery } from './types';
 
 export interface AlarmsCountQuery extends AlarmsQuery {
   filter?: string;