From 659efc12f3faa90548ba7cc15a239d5413a53fd3 Mon Sep 17 00:00:00 2001 From: Remi Date: Sun, 7 Feb 2021 20:13:47 +0100 Subject: [PATCH] fix(splunk-on-call-plugin): lint + typos --- plugins/splunk-on-call/src/api/client.ts | 4 +- plugins/splunk-on-call/src/api/types.ts | 4 +- .../Escalation/EscalationPolicy.tsx | 4 +- .../src/components/Incident/Incidents.tsx | 6 ++- .../src/components/SplunkOnCallCard.tsx | 2 +- .../TriggerDialog/TriggerDialog.tsx | 40 +++++++++---------- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/plugins/splunk-on-call/src/api/client.ts b/plugins/splunk-on-call/src/api/client.ts index 955192e241..77fd921722 100644 --- a/plugins/splunk-on-call/src/api/client.ts +++ b/plugins/splunk-on-call/src/api/client.ts @@ -38,7 +38,7 @@ export class UnauthorizedError extends Error {} export const splunkOnCallApiRef = createApiRef({ id: 'plugin.splunk-on-call.api', - description: 'Used to fetch data from SplunkOnCall API', + description: 'Used to fetch data from Splunk On-Call API', }); export class SplunkOnCallClient implements SplunkOnCallApi { @@ -190,7 +190,7 @@ export class SplunkOnCallClient implements SplunkOnCallApi { options: RequestOptions, ): Promise { const response = await fetch(url, options); - if (response.status === 401) { + if (response.status === 403) { throw new UnauthorizedError(); } if (!response.ok) { diff --git a/plugins/splunk-on-call/src/api/types.ts b/plugins/splunk-on-call/src/api/types.ts index bce42d35d2..86c7a9b4bf 100644 --- a/plugins/splunk-on-call/src/api/types.ts +++ b/plugins/splunk-on-call/src/api/types.ts @@ -24,8 +24,8 @@ import { import { DiscoveryApi } from '@backstage/core'; export enum TargetType { - User = 'User', - EscalationPolicy = 'EscalationPolicy', + UserValue = 'User', + EscalationPolicyValue = 'EscalationPolicy', } export type IncidentTarget = { diff --git a/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx b/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx index 25ab3156d0..9538a0e73b 100644 --- a/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx +++ b/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx @@ -34,7 +34,7 @@ export const EscalationPolicy = ({ users, team }: Props) => { const { value: userNames, loading, error } = useAsync(async () => { const oncalls = await api.getOnCallUsers(); - const users = oncalls + const teamUsernames = oncalls .filter(oncall => oncall.team?.name === team) .flatMap(oncall => { return oncall.oncallNow?.flatMap(oncallNow => { @@ -43,7 +43,7 @@ export const EscalationPolicy = ({ users, team }: Props) => { }); }); }); - return users; + return teamUsernames; }); if (error) { diff --git a/plugins/splunk-on-call/src/components/Incident/Incidents.tsx b/plugins/splunk-on-call/src/components/Incident/Incidents.tsx index fad8a6030b..e1a79314b9 100644 --- a/plugins/splunk-on-call/src/components/Incident/Incidents.tsx +++ b/plugins/splunk-on-call/src/components/Incident/Incidents.tsx @@ -33,11 +33,13 @@ export const Incidents = ({ refreshIncidents, team }: Props) => { const [{ value: incidents, loading, error }, getIncidents] = useAsyncFn( async () => { - const incidents = await api.getIncidents(); + const allIncidents = await api.getIncidents(); const teams = await api.getTeams(); const teamSlug = teams.find(teamValue => teamValue.name === team)?.slug; const filteredIncidents = teamSlug - ? incidents.filter(incident => incident.pagedTeams?.includes(teamSlug)) + ? allIncidents.filter(incident => + incident.pagedTeams?.includes(teamSlug), + ) : []; return filteredIncidents; }, diff --git a/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx b/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx index 41430e310b..54dbebbf9d 100644 --- a/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx +++ b/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx @@ -69,7 +69,7 @@ export const MissingUsername = () => ( ); diff --git a/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx b/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx index 74606626ca..abc5f4fd22 100644 --- a/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx +++ b/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx @@ -91,9 +91,9 @@ export const TriggerDialog = ({ const [userTargets, setUserTargets] = useState([]); const [policyTargets, setPolicyTargets] = useState([]); - const [details, setDetails] = useState(''); - const [summary, setSummary] = useState(''); - const [isMultiResponder, setIsMultiResponder] = useState('1'); + const [detailsValue, setDetails] = useState(''); + const [summaryValue, setSummary] = useState(''); + const [isMultiResponderValue, setIsMultiResponder] = useState('1'); const [ { value, loading: triggerLoading, error: triggerError }, @@ -120,8 +120,8 @@ export const TriggerDialog = ({ loading: policiesLoaading, error: policiesError, } = useAsync(async () => { - const policies = await api.getEscalationPolicies(); - return policies; + const allPolicies = await api.getEscalationPolicies(); + return allPolicies; }); const handleUserTargets = (event: React.ChangeEvent<{ value: unknown }>) => { @@ -149,10 +149,10 @@ export const TriggerDialog = ({ }; const targets = (): IncidentTarget[] => [ - ...userTargets.map(user => ({ slug: user, type: TargetType.User })), + ...userTargets.map(user => ({ slug: user, type: TargetType.UserValue })), ...policyTargets.map(user => ({ slug: user, - type: TargetType.EscalationPolicy, + type: TargetType.EscalationPolicyValue, })), ]; @@ -175,7 +175,7 @@ export const TriggerDialog = ({ return ( - This action will trigger an incident. + This action will trigger an incident Created by:{' '} @@ -218,13 +218,13 @@ export const TriggerDialog = ({ input={} renderValue={selected => (
- {(selected as string[]).map(value => { + {(selected as string[]).map(selectedUser => { const element = users.find( - user => user.username === value, + user => user.username === selectedUser, ); return ( @@ -251,13 +251,13 @@ export const TriggerDialog = ({ input={} renderValue={selected => (
- {(selected as string[]).map(value => { + {(selected as string[]).map(selectedPolicy => { const element = policies?.find( - policy => policy.policy.slug === value, + policy => policy.policy.slug === selectedPolicy, ); return ( @@ -292,7 +292,7 @@ export const TriggerDialog = ({