Skip to content

Fix issues in previous PR #1416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshithmohan merged 1 commit into from
Jul 29, 2026
Merged

Fix issues in previous PR #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 6 additions & 22 deletions src/components/Utilities/ReleaseManagement/ReleaseManagementSeriesDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,12 @@ const ReleaseManagementSeriesDetail = () => {
// Candidates tab passes through the list page's includeVariations toggle, same as the batch
// preview. Mix & Match always wants every file - variations included - as a pickable option
// regardless of that toggle, so it fetches independently with includeVariations forced true.
const seriesQuery = useReleaseManagementSeriesDetailQuery(seriesId, includeVariations, seriesId > 0);
const series = seriesQuery.data;

const mixMatchSeriesQuery = useReleaseManagementSeriesDetailQuery(
const seriesQuery = useReleaseManagementSeriesDetailQuery(
seriesId,
true,
seriesId > 0 && activeTab === 'mixmatch',
activeTab === 'mixmatch' ? true : includeVariations,
seriesId > 0,
);
const series = seriesQuery.data;

useEffect(() => {
if (seriesQuery.isError) {
Expand Down Expand Up @@ -228,24 +226,10 @@ const ReleaseManagementSeriesDetail = () => {
/>
)}

{activeTab === 'mixmatch' && mixMatchSeriesQuery.isPending && (
<div className="flex h-32 items-center justify-center text-panel-text-primary">
<Icon path={mdiLoading} size={2} spin />
</div>
)}

{activeTab === 'mixmatch' && mixMatchSeriesQuery.isError && (
<div className="flex h-32 items-center justify-center">
<span className="text-panel-text-danger">
Failed to load Mix &amp; Match options.
</span>
</div>
)}

{activeTab === 'mixmatch' && mixMatchSeriesQuery.data && (
{series && activeTab === 'mixmatch' && (
<MixAndMatchTab
selection={mixMatchSelection}
series={mixMatchSeriesQuery.data}
series={series}
setSelection={setMixMatchSelection}
setUnassignedCount={setMixMatchUnassignedCount}
/>
Expand Down
6 changes: 4 additions & 2 deletions src/components/Utilities/ReleaseManagement/SeriesDetail/MixAndMatchEpisode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ export const MixAndMatchEpisode = ({
)}
{selectedOption && (
<>
<span className="font-semibold">{selectedOption.groupLabel}</span>{' '}
{selectedOption.isVariation && <Badge className="bg-panel-input">Variation</Badge>}{' '}
<span className="font-semibold">{selectedOption.groupLabel}</span>
&nbsp;
{selectedOption.isVariation && <Badge className="bg-panel-input">Variation</Badge>}
&nbsp;
<span className="opacity-65">
- {getOptionSummary(selectedOption)}, {prettyBytes(selectedOption.fileSize, { binary: true })}
</span>
Expand Down