more fixes

Author: itsmylife

src/datasource.test.ts

@@ -15,7 +15,7 @@ import {
   toDataFrame,
   VariableHide,
 } from '@grafana/data';
-import { TemplateSrv } from 'app/features/templating/template_srv';
+import { TemplateSrv } from '@grafana/runtime';
 import { cloneDeep } from 'lodash';
 import { lastValueFrom, of, throwError } from 'rxjs';
 

src/gcopypaste/app/core/utils/query.ts

@@ -0,0 +1,20 @@
+import { DataQuery } from '@grafana/data';
+
+export const getNextRefIdChar = (queries: DataQuery[]): string => {
+  for (let num = 0; ; num++) {
+    const refId = getRefId(num);
+    if (!queries.some((query) => query.refId === refId)) {
+      return refId;
+    }
+  }
+};
+
+function getRefId(num: number): string {
+  const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+  if (num < letters.length) {
+    return letters[num];
+  } else {
+    return getRefId(Math.floor(num / letters.length) - 1) + letters[num % letters.length];
+  }
+}

src/querybuilder/QueryPattern.tsx

@@ -1,12 +1,12 @@
 import { css } from '@emotion/css';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Button, Card, useStyles2 } from '@grafana/ui';
-import { RawQuery } from 'app/plugins/datasource/prometheus/querybuilder/shared/RawQuery';
 import React from 'react';
 
 import promqlGrammar from '../promql';
 
 import { promQueryModeller } from './PromQueryModeller';
+import { RawQuery } from './shared/RawQuery';
 import { PromQueryPattern } from './types';
 
 type Props = {

src/querybuilder/QueryPatternsModal.tsx

@@ -2,10 +2,10 @@ import { css } from '@emotion/css';
 import { CoreApp, DataQuery, GrafanaTheme2 } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime';
 import { Button, Collapse, Modal, useStyles2 } from '@grafana/ui';
-import { getNextRefIdChar } from 'app/core/utils/query';
 import { capitalize } from 'lodash';
 import React, { useMemo, useState } from 'react';
 
+import { getNextRefIdChar } from '../gcopypaste/app/core/utils/query';
 import { PromQuery } from '../types';
 
 import { promQueryModeller } from './PromQueryModeller';

src/querybuilder/components/PromQueryBuilder.test.tsx

@@ -11,7 +11,6 @@ import { getByText, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-
 import { PrometheusDatasource } from '../../datasource';
 import PromQlLanguageProvider from '../../language_provider';
 import { EmptyLanguageProviderMock } from '../../language_provider.mock';
@@ -318,7 +317,6 @@ function createDatasource(options?: Partial<DataSourceInstanceSettings<PromOptio
       ...options,
     } as DataSourceInstanceSettings<PromOptions>,
     undefined,
-    undefined,
     languageProvider
   );
   return { datasource, languageProvider };

src/querybuilder/components/PromQueryBuilderOptions.test.tsx

@@ -2,8 +2,8 @@ import { CoreApp } from '@grafana/data';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
 
+import { selectOptionInTest } from '../../gcopypaste/test/helpers/selectOptionInTest';
 import { PromQuery } from '../../types';
 import { getQueryWithDefaults } from '../state';
 

src/querybuilder/shared/hooks/useFlag.ts

@@ -1,6 +1,6 @@
 import { useCallback, useState } from 'react';
 
-import store from '../../../../../../core/store';
+import store from '../../../gcopypaste/app/core/store';
 
 export const promQueryEditorExplainKey = 'PrometheusQueryEditorExplainDefault';
 export const promQueryEditorRawQueryKey = 'PrometheusQueryEditorRawQueryDefault';