diff --git a/.betterer.eslint.config.js b/.betterer.eslint.config.js index 3030dd53c3e..d07e461ea2a 100644 --- a/.betterer.eslint.config.js +++ b/.betterer.eslint.config.js @@ -96,8 +96,14 @@ module.exports = [ }, }, { - files: ['**/*.{ts,tsx}'], - ignores: ['**/*.{test,spec}.{ts,tsx}', '**/__mocks__/**', '**/public/test/**', '**/mocks.{ts,tsx}'], + files: ['**/*.{js,jsx,ts,tsx}'], + ignores: [ + '**/*.{test,spec}.{ts,tsx}', + '**/__mocks__/**', + '**/public/test/**', + '**/mocks.{ts,tsx}', + '**/spec/**/*.{ts,tsx}', + ], rules: { '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'never' }], }, diff --git a/.betterer.results b/.betterer.results index 8effcfa4d09..f84c6215f19 100644 --- a/.betterer.results +++ b/.betterer.results @@ -1723,8 +1723,7 @@ exports[`better eslint`] = { [0, 0, 0, "Do not re-export imported variable (\`./external.utils\`)", "0"] ], "public/app/features/explore/spec/helper/setup.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"] + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "public/app/features/explore/state/time.test.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] diff --git a/eslint.config.js b/eslint.config.js index 5a314282773..e4bd3d8e406 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -284,6 +284,7 @@ module.exports = [ '**/*.{test,spec}.{ts,tsx}', '**/__mocks__/', 'public/test', + '**/spec/**/*.{ts,tsx}', ], rules: { '@grafana/no-untranslated-strings': 'error', diff --git a/public/app/features/explore/spec/helper/setup.tsx b/public/app/features/explore/spec/helper/setup.tsx index 3573e7adb34..9b5870691e3 100644 --- a/public/app/features/explore/spec/helper/setup.tsx +++ b/public/app/features/explore/spec/helper/setup.tsx @@ -34,7 +34,6 @@ import { import { DataSourceRef } from '@grafana/schema'; import { AppChrome } from 'app/core/components/AppChrome/AppChrome'; import { GrafanaContext } from 'app/core/context/GrafanaContext'; -import { t } from 'app/core/internationalization'; import { GrafanaRoute } from 'app/core/navigation/GrafanaRoute'; import { Echo } from 'app/core/services/echo/Echo'; import { setLastUsedDatasourceUID } from 'app/core/utils/explore'; @@ -291,11 +290,9 @@ export function makeDatasourceSetup({ components: { QueryEditor(props: QueryEditorProps) { return ( - // don't need translations, this is a test helper - // eslint-disable-next-line @grafana/no-untranslated-strings
{ props.onChange({ ...props.query, expr: event.target.value }); diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index f56e7ceb411..8ec3abefc96 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -4739,9 +4739,6 @@ "logs-volumne-panel-list": { "body-no-logs-volume-available": "No volume information available for the current queries and time range." }, - "make-datasource-setup": { - "aria-label-query": "query" - }, "next": "Next", "next-prev-result": { "aria-label-next": "Next result button",