chrisryn/requestarr
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(overriderules): test service using the right endpoint (#2399)

Browse Source
This commit is contained in:
Gauthier
2026-02-10 13:18:56 +01:00
committed by GitHub
parent e3dc1c302d
commit 028c7c2434
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/components/Settings/OverrideRule/OverrideRuleModal.tsx
View File

@@ -11,11 +11,7 @@ import globalMessages from '@app/i18n/globalMessages';
import defineMessages from '@app/utils/defineMessages'; import defineMessages from '@app/utils/defineMessages';
import { Transition } from '@headlessui/react'; import { Transition } from '@headlessui/react';
import type OverrideRule from '@server/entity/OverrideRule'; import type OverrideRule from '@server/entity/OverrideRule';
import type { import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
DVRSettings,
RadarrSettings,
SonarrSettings,
} from '@server/lib/settings';
import axios from 'axios'; import axios from 'axios';
import { Field, Formik } from 'formik'; import { Field, Formik } from 'formik';
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState } from 'react';
@@ -81,23 +77,26 @@ const OverrideRuleModal = ({
}); });
const getServiceInfos = useCallback( const getServiceInfos = useCallback(
async ({ async (
hostname, {
port, hostname,
apiKey, port,
baseUrl, apiKey,
useSsl = false, baseUrl,
}: { useSsl = false,
hostname: string; }: {
port: number; hostname: string;
apiKey: string; port: number;
baseUrl?: string; apiKey: string;
useSsl?: boolean; baseUrl?: string;
}) => { useSsl?: boolean;
},
type: 'radarr' | 'sonarr'
) => {
setIsTesting(true); setIsTesting(true);
try { try {
const response = await axios.post<DVRTestResponse>( const response = await axios.post<DVRTestResponse>(
'/api/v1/settings/sonarr/test', `/api/v1/settings/${type}/test`,
{ {
hostname, hostname,
apiKey, apiKey,
@@ -119,15 +118,19 @@ const OverrideRuleModal = ({
); );
useEffect(() => { useEffect(() => {
let service: DVRSettings | null = null; if (
if (rule?.radarrServiceId !== null && rule?.radarrServiceId !== undefined) { rule?.radarrServiceId !== null &&
service = radarrServices[rule?.radarrServiceId] || null; rule?.radarrServiceId !== undefined &&
radarrServices[rule?.radarrServiceId]
) {
getServiceInfos(radarrServices[rule?.radarrServiceId], 'radarr');
} }
if (rule?.sonarrServiceId !== null && rule?.sonarrServiceId !== undefined) { if (
service = sonarrServices[rule?.sonarrServiceId] || null; rule?.sonarrServiceId !== null &&
} rule?.sonarrServiceId !== undefined &&
if (service) { sonarrServices[rule?.sonarrServiceId]
getServiceInfos(service); ) {
getServiceInfos(sonarrServices[rule?.sonarrServiceId], 'sonarr');
} }
}, [ }, [
getServiceInfos, getServiceInfos,
@@ -256,13 +259,13 @@ const OverrideRuleModal = ({
setFieldValue('radarrServiceId', id); setFieldValue('radarrServiceId', id);
setFieldValue('sonarrServiceId', null); setFieldValue('sonarrServiceId', null);
if (radarrServices[id]) { if (radarrServices[id]) {
getServiceInfos(radarrServices[id]); getServiceInfos(radarrServices[id], 'radarr');
} }
} else if (e.target.value.startsWith('sonarr-')) { } else if (e.target.value.startsWith('sonarr-')) {
setFieldValue('radarrServiceId', null); setFieldValue('radarrServiceId', null);
setFieldValue('sonarrServiceId', id); setFieldValue('sonarrServiceId', id);
if (sonarrServices[id]) { if (sonarrServices[id]) {
getServiceInfos(sonarrServices[id]); getServiceInfos(sonarrServices[id], 'sonarr');
} }
} else { } else {
setFieldValue('radarrServiceId', null); setFieldValue('radarrServiceId', null);