jazzymc/homarr
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(media-request): inconsistent sorting and reordering (#2464)

Browse Source
This commit is contained in:
Meier Lukas
2025-03-01 22:44:26 +01:00
committed by GitHub
parent 6fad48f65a
commit 43619e0cc0
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/api/src/router/widgets/media-requests.ts
View File

@@ -2,7 +2,7 @@ import { observable } from "@trpc/server/observable";
import { z } from "zod"; import { z } from "zod";
import { getIntegrationKindsByCategory } from "@homarr/definitions"; import { getIntegrationKindsByCategory } from "@homarr/definitions";
import { integrationCreator, MediaRequestStatus } from "@homarr/integrations"; import { integrationCreator } from "@homarr/integrations";
import type { MediaRequest } from "@homarr/integrations/types"; import type { MediaRequest } from "@homarr/integrations/types";
import { mediaRequestListRequestHandler } from "@homarr/request-handler/media-request-list"; import { mediaRequestListRequestHandler } from "@homarr/request-handler/media-request-list";
import { mediaRequestStatsRequestHandler } from "@homarr/request-handler/media-request-stats"; import { mediaRequestStatsRequestHandler } from "@homarr/request-handler/media-request-stats";
@@ -30,14 +30,12 @@ export const mediaRequestsRouter = createTRPCRouter({
); );
return results return results
.flatMap(({ data, integration }) => data.map((request) => ({ ...request, integrationId: integration.id }))) .flatMap(({ data, integration }) => data.map((request) => ({ ...request, integrationId: integration.id })))
.sort(({ status: statusA }, { status: statusB }) => { .sort((dataA, dataB) => {
if (statusA === MediaRequestStatus.PendingApproval) { if (dataA.status === dataB.status) {
return -1; return dataB.createdAt.getTime() - dataA.createdAt.getTime();
} }
if (statusB === MediaRequestStatus.PendingApproval) {
return 1; return dataA.status - dataB.status;
}
return 0;
}); });
}), }),
subscribeToLatestRequests: publicProcedure subscribeToLatestRequests: publicProcedure

14
packages/widgets/src/media-requests/list/component.tsx
View File

@@ -41,14 +41,12 @@ export default function MediaServerWidget({
const newData = filteredData.concat( const newData = filteredData.concat(
data.requests.map((request) => ({ ...request, integrationId: data.integrationId })), data.requests.map((request) => ({ ...request, integrationId: data.integrationId })),
); );
return newData.sort(({ status: statusA }, { status: statusB }) => { return newData.sort((dataA, dataB) => {
if (statusA === MediaRequestStatus.PendingApproval) { if (dataA.status === dataB.status) {
return -1; return dataB.createdAt.getTime() - dataA.createdAt.getTime();
} }
if (statusB === MediaRequestStatus.PendingApproval) {
return 1; return dataA.status - dataB.status;
}
return 0;
}); });
}); });
}, },
@@ -69,7 +67,7 @@ export default function MediaServerWidget({
{mediaRequests.map((mediaRequest) => ( {mediaRequests.map((mediaRequest) => (
<Card <Card
className={`mediaRequests-list-item-wrapper mediaRequests-list-item-${mediaRequest.type} mediaRequests-list-item-${mediaRequest.status}`} className={`mediaRequests-list-item-wrapper mediaRequests-list-item-${mediaRequest.type} mediaRequests-list-item-${mediaRequest.status}`}
key={mediaRequest.id} key={`${mediaRequest.integrationId}-${mediaRequest.id}`}
h="20cqmin" h="20cqmin"
radius="2cqmin" radius="2cqmin"
p="2cqmin" p="2cqmin"