From 248a8db656fa9c8000529e42731b1d9f57dba8e6 Mon Sep 17 00:00:00 2001 From: fallenbagel <98979876+Fallenbagel@users.noreply.github.com> Date: Thu, 19 Nov 2026 05:05:37 +0800 Subject: [PATCH 1/2] fix(request-modal): keep override rule folder and tags on refetch The advanced requester reapplied the server defaults whenever the server data changed, so a background refetch with new root folder free space overwrote the folder and tags the override rule had just set. The defaults and override rules are now keyed on the server's settings, so they are reapplied only when the server or its settings change. fixes #3736 --- src/components/RequestModal/AdvancedRequester/index.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/RequestModal/AdvancedRequester/index.tsx b/src/components/RequestModal/AdvancedRequester/index.tsx index 8dd6f08d78..f28e04a9cd 100644 --- a/src/components/RequestModal/AdvancedRequester/index.tsx +++ b/src/components/RequestModal/AdvancedRequester/index.tsx @@ -139,6 +139,10 @@ const AdvancedRequester = ({ revalidateOnFocus: false, } ); + // rootFolders' freeSpace changes between fetches, so key on the settings alone + const serverSettingsKey = serverData + ? JSON.stringify(serverData.server) + : undefined; const [selectedUser, setSelectedUser] = useState( requestUser ?? null @@ -270,7 +274,7 @@ const AdvancedRequester = ({ setSelectedTags(defaultTags); } } - }, [serverData]); + }, [serverSettingsKey]); useEffect(() => { if (defaultOverrides && defaultOverrides.server != null) { @@ -390,7 +394,7 @@ const AdvancedRequester = ({ tmdbId, type, is4k, - serverData?.server.id, + serverSettingsKey, selectedServer, selectedUserId, requestUser?.id, From d6007f2c15f9a60f666a2d1375728b4a5c315d46 Mon Sep 17 00:00:00 2001 From: fallenbagel <98979876+Fallenbagel@users.noreply.github.com> Date: Thu, 19 Nov 2026 05:57:45 +0800 Subject: [PATCH 2/2] fix(request-modal): merge rule tags onto current defaults The override request sent the tags selected before the server defaults were applied, so after a server switch or settings change the rule's tags were merged onto the previous tags or dropped. It now sends the defaults that were just applied. The advanced inputs and the request button also wait for the rule lookup, and the button waits for the server data too, so a submit can't skip the rule's values or carry the previous server's folder, profile and tags. --- .../RequestModal/AdvancedRequester/index.tsx | 78 +++++++++++++------ .../RequestModal/MovieRequestModal.tsx | 6 +- .../RequestModal/TvRequestModal.tsx | 7 +- 3 files changed, 65 insertions(+), 26 deletions(-) diff --git a/src/components/RequestModal/AdvancedRequester/index.tsx b/src/components/RequestModal/AdvancedRequester/index.tsx index f28e04a9cd..834e5d783e 100644 --- a/src/components/RequestModal/AdvancedRequester/index.tsx +++ b/src/components/RequestModal/AdvancedRequester/index.tsx @@ -74,6 +74,7 @@ interface AdvancedRequesterProps { requestId?: number; quota?: { movie: { limit?: number }; tv: { limit?: number } }; onChange: (overrides: RequestOverrides) => void; + onBusyChange?: (busy: boolean) => void; } const AdvancedRequester = ({ @@ -86,6 +87,7 @@ const AdvancedRequester = ({ requestId, quota, onChange, + onBusyChange, }: AdvancedRequesterProps) => { const intl = useIntl(); const { addToast } = useToasts(); @@ -126,23 +128,29 @@ const AdvancedRequester = ({ currentHasPermission([Permission.MANAGE_REQUESTS]) && ((type === 'movie' ? quota?.movie.limit : quota?.tv.limit) ?? 0) > 0; - const { data: serverData, isValidating } = - useSWR( - selectedServer !== null - ? `/api/v1/service/${ - type === 'movie' ? 'radarr' : 'sonarr' - }/${selectedServer}` - : null, - { - refreshInterval: 0, - refreshWhenHidden: false, - revalidateOnFocus: false, - } - ); + const { + data: serverData, + error: serverError, + isValidating, + } = useSWR( + selectedServer !== null + ? `/api/v1/service/${ + type === 'movie' ? 'radarr' : 'sonarr' + }/${selectedServer}` + : null, + { + refreshInterval: 0, + refreshWhenHidden: false, + revalidateOnFocus: false, + } + ); // rootFolders' freeSpace changes between fetches, so key on the settings alone const serverSettingsKey = serverData ? JSON.stringify(serverData.server) : undefined; + // selectedTags doesn't hold these yet when the override effect runs + const appliedDefaultTagsRef = useRef(null); + const [isOverridePending, setIsOverridePending] = useState(false); const [selectedUser, setSelectedUser] = useState( requestUser ?? null @@ -271,6 +279,7 @@ const AdvancedRequester = ({ !isEqual(defaultTags, selectedTags) && (!applyOverrides || defaultOverrides.tags === null) ) { + appliedDefaultTagsRef.current = defaultTags; setSelectedTags(defaultTags); } } @@ -344,8 +353,11 @@ const AdvancedRequester = ({ useEffect(() => { let cancelled = false; + const baseTags = appliedDefaultTagsRef.current ?? selectedTags; + appliedDefaultTagsRef.current = null; (async () => { if (tmdbId && serverData?.server.id === selectedServer) { + setIsOverridePending(true); try { const { data: override } = await axios.post( '/api/v1/overrideRule/advancedRequest', @@ -355,7 +367,7 @@ const AdvancedRequester = ({ requestUser: selectedUser?.id ?? requestUser?.id ?? currentUser?.id, tmdbId, - tags: selectedTags.length > 0 ? selectedTags : undefined, + tags: baseTags.length > 0 ? baseTags : undefined, serviceId: selectedServer ?? undefined, requestId: requestId ?? undefined, } @@ -372,7 +384,7 @@ const AdvancedRequester = ({ if ( !defaultOverrides?.tags && override.tags && - !isEqual(override.tags, selectedTags) + !isEqual(override.tags, baseTags) ) { setSelectedTags(override.tags); } @@ -384,11 +396,16 @@ const AdvancedRequester = ({ appearance: 'error', autoDismiss: true, }); + } finally { + if (!cancelled) { + setIsOverridePending(false); + } } } })(); return () => { cancelled = true; + setIsOverridePending(false); }; }, [ tmdbId, @@ -404,6 +421,18 @@ const AdvancedRequester = ({ defaultOverrides?.tags, ]); + const isBusy = + isOverridePending || + (!data && !error) || + (selectedServer !== null && + serverData?.server.id !== selectedServer && + !serverError); + + useEffect(() => { + onBusyChange?.(isBusy); + return () => onBusyChange?.(false); + }, [isBusy]); + if (!data && !error) { return (
@@ -478,14 +507,15 @@ const AdvancedRequester = ({ onChange={(e) => setSelectedProfile(Number(e.target.value))} onBlur={(e) => setSelectedProfile(Number(e.target.value))} className="border-gray-700 bg-gray-800" - disabled={isValidating || !serverData} + disabled={isValidating || isOverridePending || !serverData} > - {(isValidating || !serverData) && ( + {(isValidating || isOverridePending || !serverData) && ( )} {!isValidating && + !isOverridePending && serverData && serverData.profiles .toSorted((a, b) => @@ -529,14 +559,15 @@ const AdvancedRequester = ({ onChange={(e) => setSelectedFolder(e.target.value)} onBlur={(e) => setSelectedFolder(e.target.value)} className="border-gray-700 bg-gray-800" - disabled={isValidating || !serverData} + disabled={isValidating || isOverridePending || !serverData} > - {(isValidating || !serverData) && ( + {(isValidating || isOverridePending || !serverData) && ( )} {!isValidating && + !isOverridePending && serverData && serverData.rootFolders.map((folder) => ( )} {!isValidating && + !isOverridePending && serverData && serverData.languageProfiles?.map((language) => (