Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 61 additions & 25 deletions src/components/RequestModal/AdvancedRequester/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ({
Expand All @@ -86,6 +87,7 @@ const AdvancedRequester = ({
requestId,
quota,
onChange,
onBusyChange,
}: AdvancedRequesterProps) => {
const intl = useIntl();
const { addToast } = useToasts();
Expand Down Expand Up @@ -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<ServiceCommonServerWithDetails>(
selectedServer !== null
? `/api/v1/service/${
type === 'movie' ? 'radarr' : 'sonarr'
}/${selectedServer}`
: null,
{
refreshInterval: 0,
refreshWhenHidden: false,
revalidateOnFocus: false,
}
);
const {
data: serverData,
error: serverError,
isValidating,
} = useSWR<ServiceCommonServerWithDetails>(
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<number[] | null>(null);
const [isOverridePending, setIsOverridePending] = useState(false);

const [selectedUser, setSelectedUser] = useState<User | null>(
requestUser ?? null
Expand Down Expand Up @@ -267,10 +279,11 @@ const AdvancedRequester = ({
!isEqual(defaultTags, selectedTags) &&
(!applyOverrides || defaultOverrides.tags === null)
) {
appliedDefaultTagsRef.current = defaultTags;
setSelectedTags(defaultTags);
}
}
}, [serverData]);
}, [serverSettingsKey]);
Comment thread
fallenbagel marked this conversation as resolved.
Resolved

useEffect(() => {
if (defaultOverrides && defaultOverrides.server != null) {
Expand Down Expand Up @@ -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);
Comment thread
fallenbagel marked this conversation as resolved.
Resolved
try {
const { data: override } = await axios.post<OverrideRulesResult>(
'/api/v1/overrideRule/advancedRequest',
Expand All @@ -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,
}
Expand All @@ -368,7 +384,7 @@ const AdvancedRequester = ({
if (
!defaultOverrides?.tags &&
override.tags &&
!isEqual(override.tags, selectedTags)
!isEqual(override.tags, baseTags)
) {
setSelectedTags(override.tags);
}
Expand All @@ -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,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
selectedServer,
selectedUserId,
requestUser?.id,
Expand All @@ -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 (
<div className="mb-2 w-full">
Expand Down Expand Up @@ -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) && (
<option value="">
{intl.formatMessage(globalMessages.loading)}
</option>
)}
{!isValidating &&
!isOverridePending &&
serverData &&
serverData.profiles
.toSorted((a, b) =>
Expand Down Expand Up @@ -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) && (
<option value="">
{intl.formatMessage(globalMessages.loading)}
</option>
)}
{!isValidating &&
!isOverridePending &&
serverData &&
serverData.rootFolders.map((folder) => (
<option
Expand Down Expand Up @@ -583,14 +618,15 @@ const AdvancedRequester = ({
setSelectedLanguage(parseInt(e.target.value))
}
className="border-gray-700 bg-gray-800"
disabled={isValidating || !serverData}
disabled={isValidating || isOverridePending || !serverData}
>
{(isValidating || !serverData) && (
{(isValidating || isOverridePending || !serverData) && (
<option value="">
{intl.formatMessage(globalMessages.loading)}
</option>
)}
{!isValidating &&
!isOverridePending &&
serverData &&
serverData.languageProfiles?.map((language) => (
<option
Expand Down Expand Up @@ -628,9 +664,9 @@ const AdvancedRequester = ({
value: tag.id,
}))}
isMulti
isDisabled={isValidating || !serverData}
isDisabled={isValidating || isOverridePending || !serverData}
placeholder={
isValidating || !serverData
isValidating || isOverridePending || !serverData
? intl.formatMessage(globalMessages.loading)
: intl.formatMessage(messages.selecttags)
}
Expand Down
6 changes: 5 additions & 1 deletion src/components/RequestModal/MovieRequestModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const MovieRequestModal = ({
const [isUpdating, setIsUpdating] = useState(false);
const [requestOverrides, setRequestOverrides] =
useState<RequestOverrides | null>(null);
const [isAdvancedBusy, setIsAdvancedBusy] = useState(false);
const { addToast } = useToasts();
const { data, error } = useSWR<MovieDetails>(`/api/v1/movie/${tmdbId}`, {
revalidateOnMount: true,
Expand Down Expand Up @@ -242,7 +243,7 @@ const MovieRequestModal = ({
? updateRequest()
: cancelRequest()
}
okDisabled={isUpdating}
okDisabled={isUpdating || isAdvancedBusy}
okText={
hasPermission(Permission.MANAGE_REQUESTS)
? intl.formatMessage(messages.approve)
Expand Down Expand Up @@ -304,6 +305,7 @@ const MovieRequestModal = ({
onChange={(overrides) => {
setRequestOverrides(overrides);
}}
onBusyChange={setIsAdvancedBusy}
/>
)}
</Modal>
Expand All @@ -327,6 +329,7 @@ const MovieRequestModal = ({
onOk={sendRequest}
okDisabled={
isUpdating ||
isAdvancedBusy ||
(quota?.movie.restricted && !requestOverrides?.ignoreQuota)
}
title={intl.formatMessage(
Expand Down Expand Up @@ -374,6 +377,7 @@ const MovieRequestModal = ({
onChange={(overrides) => {
setRequestOverrides(overrides);
}}
onBusyChange={setIsAdvancedBusy}
/>
)}
</Modal>
Expand Down
7 changes: 5 additions & 2 deletions src/components/RequestModal/TvRequestModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const TvRequestModal = ({
const { data, error } = useSWR<TvDetails>(`/api/v1/tv/${tmdbId}`);
const [requestOverrides, setRequestOverrides] =
useState<RequestOverrides | null>(null);
const [isAdvancedBusy, setIsAdvancedBusy] = useState(false);
const [selectedSeasons, setSelectedSeasons] = useState<number[]>(
editRequest ? editingSeasons : []
);
Expand Down Expand Up @@ -454,7 +455,8 @@ const TvRequestModal = ({
)
}
okDisabled={
editRequest
isAdvancedBusy ||
(editRequest
? false
: !settings.currentSettings.partialRequestsEnabled &&
quota?.tv.limit &&
Expand All @@ -463,7 +465,7 @@ const TvRequestModal = ({
? true
: unrequestedSeasons.length === 0 ||
(settings.currentSettings.partialRequestsEnabled &&
selectedSeasons.length === 0)
selectedSeasons.length === 0))
}
okButtonType={
editRequest
Expand Down Expand Up @@ -747,6 +749,7 @@ const TvRequestModal = ({
)}
quota={quota}
onChange={(overrides) => setRequestOverrides(overrides)}
onBusyChange={setIsAdvancedBusy}
requestUser={editRequest?.requestedBy}
requestId={editRequest?.id}
defaultOverrides={
Expand Down
Loading