diff --git a/src/components/RequestModal/AdvancedRequester/index.tsx b/src/components/RequestModal/AdvancedRequester/index.tsx index 8dd6f08d78..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,19 +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 @@ -267,10 +279,11 @@ const AdvancedRequester = ({ !isEqual(defaultTags, selectedTags) && (!applyOverrides || defaultOverrides.tags === null) ) { + appliedDefaultTagsRef.current = defaultTags; setSelectedTags(defaultTags); } } - }, [serverData]); + }, [serverSettingsKey]); useEffect(() => { if (defaultOverrides && defaultOverrides.server != null) { @@ -340,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', @@ -351,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, } @@ -368,7 +384,7 @@ const AdvancedRequester = ({ if ( !defaultOverrides?.tags && override.tags && - !isEqual(override.tags, selectedTags) + !isEqual(override.tags, baseTags) ) { setSelectedTags(override.tags); } @@ -380,17 +396,22 @@ const AdvancedRequester = ({ appearance: 'error', autoDismiss: true, }); + } finally { + if (!cancelled) { + setIsOverridePending(false); + } } } })(); return () => { cancelled = true; + setIsOverridePending(false); }; }, [ tmdbId, type, is4k, - serverData?.server.id, + serverSettingsKey, selectedServer, selectedUserId, requestUser?.id, @@ -400,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 (
@@ -474,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) => @@ -525,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) => (