Change to @typescript-eslint rule and additional fixes

pull/93271/head
Tom Ratcliffe 7 months ago
parent 5f516d547e
commit 8d2a35b876
  1. 3
      eslint.config.js
  2. 2
      public/app/features/alerting/unified/components/ConditionalWrap.tsx
  3. 2
      public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
  4. 2
      public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
  5. 4
      public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx
  6. 2
      public/app/features/alerting/unified/insights/InsightsMenuButton.tsx
  7. 2
      public/app/features/alerting/unified/mocks/server/handlers/datasources.ts
  8. 35
      public/app/features/alerting/unified/state/actions.ts

@ -257,11 +257,12 @@ module.exports = [
'prefer-const': 'error',
'react/no-unused-prop-types': 'error',
'unicorn/no-unused-properties': 'error',
'no-unused-vars': [
'@typescript-eslint/no-unused-vars': [
'error',
{
destructuredArrayIgnorePattern: '^_',
ignoreRestSiblings: true,
caughtErrors: 'none',
},
],
},

@ -1,4 +1,4 @@
import { cloneElement, forwardRef, Ref } from 'react';
import { Ref, cloneElement, forwardRef } from 'react';
interface ConditionalWrapProps {
shouldWrap: boolean;

@ -6,7 +6,7 @@ import { render } from 'test/test-utils';
import { config } from '@grafana/runtime';
import { contextSrv } from 'app/core/core';
import { AlertmanagerGroup, MatcherOperator, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
import { MatcherOperator, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
import { ReceiversState } from 'app/types/alerting';
import { useAlertmanagerAbilities } from '../../hooks/useAbilities';

@ -142,7 +142,7 @@ export const QueryWrapper = ({
function HeaderExtras({
query,
// TODO: Use and display the error, as this is otherwise unused
// eslint-disable-next-line no-unused-vars
// eslint-disable-next-line @typescript-eslint/no-unused-vars
error,
index,
isAdvancedMode = true,

@ -28,7 +28,7 @@ type RulesFilterProps = {
type ActiveTab = 'custom' | 'saved';
// eslint-disable-next-line no-unused-vars
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export default function RulesFilter({ onClear = () => {} }: RulesFilterProps) {
const styles = useStyles2(getStyles);
const [activeTab, setActiveTab] = useState<ActiveTab>('custom');
@ -156,7 +156,7 @@ type TableColumns = {
};
const SavedSearches = () => {
// eslint-disable-next-line no-unused-vars
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const applySearch = useCallback((name: string) => {}, []);
return (

@ -39,7 +39,7 @@ const getPrometheusExploreUrl = ({
const urlState: ExploreUrlState = {
datasource: (queries?.length && queries[0].datasource?.uid) || null,
queries:
queries?.map(({ expr, refId }, i) => {
queries?.map(({ expr, refId }) => {
return { expr, refId };
}) || [],
range: toURLRange(range ? { from: range.from, to: range.to } : { from: 'now-1h', to: 'now' }),

@ -30,7 +30,7 @@ export const datasourceBuildInfoHandler = () =>
// TODO: Add more accurate endpoint responses as tests require
const labelValuesHandler = () =>
http.get('/api/datasources/uid/:datasourceUid/resources/api/v1/label/__name__/values', ({ params }) => {
http.get('/api/datasources/uid/:datasourceUid/resources/api/v1/label/__name__/values', () => {
return HttpResponse.json({ status: 'sucess', data: [] });
});

@ -36,24 +36,21 @@ import { safeParsePrometheusDuration } from '../utils/time';
export const fetchPromRulesAction = createAsyncThunk(
'unifiedalerting/fetchPromRules',
async (
{
rulesSourceName,
filter,
limitAlerts,
matcher,
state,
identifier,
}: {
rulesSourceName: string;
filter?: FetchPromRulesFilter;
limitAlerts?: number;
matcher?: Matcher[];
state?: string[];
identifier?: RuleIdentifier;
},
thunkAPI
): Promise<RuleNamespace[]> => {
async ({
rulesSourceName,
filter,
limitAlerts,
matcher,
state,
identifier,
}: {
rulesSourceName: string;
filter?: FetchPromRulesFilter;
limitAlerts?: number;
matcher?: Matcher[];
state?: string[];
identifier?: RuleIdentifier;
}): Promise<RuleNamespace[]> => {
const fetchRulesWithLogging = withPromRulesMetadataLogging('unifiedalerting/fetchPromRules', fetchRules, {
dataSourceName: rulesSourceName,
thunk: 'unifiedalerting/fetchPromRules',
@ -75,7 +72,7 @@ export const fetchRulerRulesAction = createAsyncThunk(
rulesSourceName: string;
filter?: FetchRulerRulesFilter;
},
{ dispatch, getState }
{ dispatch }
): Promise<RulerRulesConfigDTO | null> => {
const { data: dsFeatures } = await dispatch(
featureDiscoveryApi.endpoints.discoverDsFeatures.initiate({ rulesSourceName })

Loading…
Cancel
Save