fix: address final widget review

This commit is contained in:
Thomas Camlong committed 2026-08-02 17:25:02 +02:00
1 parent ed8ef15f12
commit f0d8e97f8d
3 files changed
+40 -20

No files matched your search

+18 -16
View File
@@ -8,9 +8,9 @@ import { formatBytes, formatDuration } from "@homarr/common";
import type { AudiobookshelfDashboardData } from "@homarr/integrations/types"; import type { AudiobookshelfDashboardData } from "@homarr/integrations/types";
import { WidgetEmptyState } from "../common/empty-state"; import { WidgetEmptyState } from "../common/empty-state";
import { IntegrationErrorIndicator } from "../common/integration-error-indicator";
import type { WidgetComponentProps } from "../definition"; import type { WidgetComponentProps } from "../definition";
import { setWidgetRuntimeQueries } from "../definition"; import { setWidgetRuntimeQueries } from "../definition";
import { NoIntegrationDataError } from "../errors/no-data-integration";
import { AudioStatsContent } from "./audio-stats-content"; import { AudioStatsContent } from "./audio-stats-content";
export default function AudioStatsWidget({ export default function AudioStatsWidget({
@@ -22,17 +22,22 @@ export default function AudioStatsWidget({
widgetStateRef, widgetStateRef,
}: WidgetComponentProps<"audioStats">) { }: WidgetComponentProps<"audioStats">) {
const statsInput = { integrationId: integrationIds[0] ?? "" }; const statsInput = { integrationId: integrationIds[0] ?? "" };
const { data: response } = clientApi.widget.audioStats.getStats.useQuery(statsInput); const { data: response, error: statsError } = clientApi.widget.audioStats.getStats.useQuery(statsInput);
const streamsInput = { integrationIds, showOnlyPlaying: false }; const streamsInput = { integrationIds: [statsInput.integrationId], showOnlyPlaying: true };
const streamsEnabled = displayMode === "advanced" && response?.kind === "navidrome"; const streamsEnabled = displayMode === "advanced" && response?.kind === "navidrome";
const { data: streamResults = [] } = clientApi.widget.mediaServer.getCurrentStreams.useQuery(streamsInput, { const { data: streamResults, error: streamsError } = clientApi.widget.mediaServer.getCurrentStreams.useQuery(
enabled: streamsEnabled, streamsInput,
}); { enabled: streamsEnabled },
);
setWidgetRuntimeQueries(widgetStateRef, [ setWidgetRuntimeQueries(widgetStateRef, [
getQueryKey(clientApi.widget.audioStats.getStats, statsInput, "query"), getQueryKey(clientApi.widget.audioStats.getStats, statsInput, "query"),
...(streamsEnabled ? [getQueryKey(clientApi.widget.mediaServer.getCurrentStreams, streamsInput, "query")] : []), ...(streamsEnabled ? [getQueryKey(clientApi.widget.mediaServer.getCurrentStreams, streamsInput, "query")] : []),
]); ]);
if (statsError && response === undefined) throw statsError;
if (streamsEnabled && streamsError && streamResults === undefined) throw streamsError;
const currentStreams = streamResults ?? [];
if (streamsEnabled && currentStreams.some(({ error }) => Boolean(error))) throw new NoIntegrationDataError();
if (!response) return <WidgetEmptyState />; if (!response) return <WidgetEmptyState />;
const summary = ( const summary = (
@@ -46,22 +51,17 @@ export default function AudioStatsWidget({
); );
if (displayMode === "compact") return summary; if (displayMode === "compact") return summary;
const sessions = streamResults.flatMap((result) => const sessions = currentStreams.flatMap((result) =>
result.sessions.map((session) => ({ integrationId: result.integrationId, session })), result.sessions.map((session) => ({ integrationId: result.integrationId, session })),
); );
const hasStreamFailures = streamResults.some(({ error }) => Boolean(error));
const audiobookStats = response.kind === "audiobookshelf" ? (response.data as AudiobookshelfDashboardData) : null; const audiobookStats = response.kind === "audiobookshelf" ? (response.data as AudiobookshelfDashboardData) : null;
const advancedGridColumns = width >= 760 ? 2 : 1;
return ( return (
<Stack h="100%" gap="lg" p="md"> <Stack h="100%" gap="lg" p="md">
{hasStreamFailures && (
<Group justify="flex-end">
<IntegrationErrorIndicator results={streamResults} />
</Group>
)}
<div style={{ minHeight: 150 }}>{summary}</div> <div style={{ minHeight: 150 }}>{summary}</div>
<ScrollArea style={{ flex: 1, minHeight: 0 }}> <ScrollArea style={{ flex: 1, minHeight: 0 }}>
{response.kind === "navidrome" ? ( {response.kind === "navidrome" ? (
<SimpleGrid cols={width >= 760 ? 2 : 1} spacing="xs"> <SimpleGrid cols={advancedGridColumns} spacing="xs">
{sessions.map(({ integrationId, session }) => { {sessions.map(({ integrationId, session }) => {
const currentlyPlaying = session.currentlyPlaying; const currentlyPlaying = session.currentlyPlaying;
if (!currentlyPlaying) return null; if (!currentlyPlaying) return null;
@@ -75,13 +75,15 @@ export default function AudioStatsWidget({
{currentlyPlaying.seasonName ?? currentlyPlaying.albumName ?? session.user.username} {currentlyPlaying.seasonName ?? currentlyPlaying.albumName ?? session.user.username}
</Text> </Text>
</Stack> </Stack>
<Badge variant="light">{session.sessionName}</Badge> <Badge variant="light" style={{ flexShrink: 0 }}>
{session.sessionName}
</Badge>
</Group> </Group>
); );
})} })}
</SimpleGrid> </SimpleGrid>
) : ( ) : (
<SimpleGrid cols={width >= 760 ? 2 : 1} spacing="xs"> <SimpleGrid cols={advancedGridColumns} spacing="xs">
{(audiobookStats?.libraries ?? []).map((library) => ( {(audiobookStats?.libraries ?? []).map((library) => (
<Stack key={library.id} gap={2} p="sm"> <Stack key={library.id} gap={2} p="sm">
<Group justify="space-between" wrap="nowrap"> <Group justify="space-between" wrap="nowrap">
@@ -6,6 +6,7 @@ import { IconBinaryTree } from "@tabler/icons-react";
import { clientApi } from "@homarr/api/client"; import { clientApi } from "@homarr/api/client";
import { useIntegrationsWithInteractAccess } from "@homarr/auth/client"; import { useIntegrationsWithInteractAccess } from "@homarr/auth/client";
import { showErrorNotification } from "@homarr/notifications";
import { useRegisterSpotlightContextActions } from "@homarr/spotlight"; import { useRegisterSpotlightContextActions } from "@homarr/spotlight";
import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client";
@@ -29,18 +30,27 @@ export default function SmartHomeEntityStateWidget({
entityId: options.entityId, entityId: options.entityId,
integrationId, integrationId,
}; };
const { data: entity } = clientApi.widget.smartHome.entityDetails.useQuery(input); const {
data: entity,
isPending: isEntityPending,
error: entityError,
} = clientApi.widget.smartHome.entityDetails.useQuery(input);
const canInteract = useIntegrationsWithInteractAccess().some(({ id }) => id === integrationId); const canInteract = useIntegrationsWithInteractAccess().some(({ id }) => id === integrationId);
const utils = clientApi.useUtils(); const utils = clientApi.useUtils();
const { mutate, isPending, error } = clientApi.widget.smartHome.switchEntity.useMutation({ const { mutate, isPending, error } = clientApi.widget.smartHome.switchEntity.useMutation({
onSettled: () => void utils.widget.smartHome.entityDetails.invalidate(input), onSettled: () => void utils.widget.smartHome.entityDetails.invalidate(input),
onError: () =>
showErrorNotification({
title: t("common.error"),
message: t("widget.smartHome-entityState.error.toggleFailed"),
}),
}); });
const apiUnit = entity?.attributes.unit_of_measurement; const apiUnit = entity?.attributes.unit_of_measurement;
const unit = options.entityUnit || (typeof apiUnit === "string" ? apiUnit : ""); const unit = options.entityUnit || (typeof apiUnit === "string" ? apiUnit : "");
const attribute = unit.length > 0 ? ` ${unit}` : ""; const attribute = unit.length > 0 ? ` ${unit}` : "";
const isActionable = options.clickable && canInteract && !isPending; const isActionable = options.clickable && canInteract && entity !== undefined && !isEntityPending && !isPending;
const handleClick = useCallback(() => { const handleClick = useCallback(() => {
if (isEditMode) { if (isEditMode) {
@@ -77,6 +87,9 @@ export default function SmartHomeEntityStateWidget({
], ],
[handleClick, isActionable, options.displayName, options.entityId], [handleClick, isActionable, options.displayName, options.entityId],
); );
if (entityError && entity === undefined) throw entityError;
const isTiny = width < 128 || height < 96; const isTiny = width < 128 || height < 96;
const advancedAttributes = [ const advancedAttributes = [
{ key: "unit" as const, value: entity?.attributes.unit_of_measurement }, { key: "unit" as const, value: entity?.attributes.unit_of_measurement },
+7 -2
View File
@@ -48,7 +48,11 @@ export function UmamiContent({
const { colorScheme } = useMantineColorScheme(); const { colorScheme } = useMantineColorScheme();
const tickColor = colorScheme === "dark" ? "#c1c2c5" : "#495057"; const tickColor = colorScheme === "dark" ? "#c1c2c5" : "#495057";
const { data: results = [], isPending: isStatsPending } = clientApi.widget.umami.getVisitorStats.useQuery( const {
data: results,
isPending: isStatsPending,
error: statsError,
} = clientApi.widget.umami.getVisitorStats.useQuery(
{ integrationIds, websiteId, timeFrame, eventName }, { integrationIds, websiteId, timeFrame, eventName },
umamiQueryOptions, umamiQueryOptions,
); );
@@ -68,7 +72,7 @@ export function UmamiContent({
? multiEventSeries.flatMap(({ dataPoints }) => dataPoints).reduce((sum, { y }) => sum + y, 0) ? multiEventSeries.flatMap(({ dataPoints }) => dataPoints).reduce((sum, { y }) => sum + y, 0)
: undefined; : undefined;
const firstResult = results[0]; const firstResult = results?.[0];
if (isStatsPending) { if (isStatsPending) {
return ( return (
<Stack align="center" justify="center" h="100%"> <Stack align="center" justify="center" h="100%">
@@ -78,6 +82,7 @@ export function UmamiContent({
</Stack> </Stack>
); );
} }
if (statsError && results === undefined) throw statsError;
if (!firstResult) { if (!firstResult) {
return ( return (
<Stack align="center" justify="center" h="100%"> <Stack align="center" justify="center" h="100%">