diff --git a/.github/workflows/frontend-lint.yml b/.github/workflows/frontend-lint.yml index bccd6f1fb44..2d71e8c024e 100644 --- a/.github/workflows/frontend-lint.yml +++ b/.github/workflows/frontend-lint.yml @@ -30,7 +30,7 @@ jobs: exit 1 fi lint-frontend-prettier: - name: Prettier + name: Lint runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -41,6 +41,7 @@ jobs: cache-dependency-path: 'yarn.lock' - run: yarn install --immutable --check-cache - run: yarn run prettier:check + - run: yarn run lint lint-fronetnd-typecheck: name: Typecheck runs-on: ubuntu-latest diff --git a/public/app/features/dashboard-scene/settings/VersionsEditView.test.tsx b/public/app/features/dashboard-scene/settings/VersionsEditView.test.tsx index dc0c3619940..c2d238354c0 100644 --- a/public/app/features/dashboard-scene/settings/VersionsEditView.test.tsx +++ b/public/app/features/dashboard-scene/settings/VersionsEditView.test.tsx @@ -1,5 +1,5 @@ -import { SceneTimeRange } from '@grafana/scenes'; import { config } from '@grafana/runtime'; +import { SceneTimeRange } from '@grafana/scenes'; import { DashboardScene } from '../scene/DashboardScene'; import { activateFullSceneTree } from '../utils/test-utils'; diff --git a/public/app/features/provisioning/Job/JobStatus.tsx b/public/app/features/provisioning/Job/JobStatus.tsx index dc7cef3f127..ee064c10dc1 100644 --- a/public/app/features/provisioning/Job/JobStatus.tsx +++ b/public/app/features/provisioning/Job/JobStatus.tsx @@ -5,10 +5,10 @@ import { Alert, ControlledCollapse, LinkButton, Spinner, Stack, Text } from '@gr import { useGetRepositoryQuery } from 'app/api/clients/provisioning'; import ProgressBar from '../Shared/ProgressBar'; +import { useRepositoryAllJobs } from '../hooks/useRepositoryAllJobs'; import { getRepoHref } from '../utils/git'; import { JobSummary } from './JobSummary'; -import { useRepositoryAllJobs } from '../hooks/useRepositoryAllJobs'; export interface JobStatusProps { name: string; diff --git a/public/app/features/provisioning/hooks/useRepositoryAllJobs.ts b/public/app/features/provisioning/hooks/useRepositoryAllJobs.ts index ee9faed621f..3801761b379 100644 --- a/public/app/features/provisioning/hooks/useRepositoryAllJobs.ts +++ b/public/app/features/provisioning/hooks/useRepositoryAllJobs.ts @@ -38,7 +38,7 @@ export function useRepositoryAllJobs({ watch = true, sort = 'created-first', }: RepositoryHistoricalJobsArgs = {}): [ - (Job | HistoricJob)[] | undefined, + Array | undefined, ReturnType, ReturnType, ] {