From 8747d5f93ee9a295aad3c7035e8c6c7080bf5ee6 Mon Sep 17 00:00:00 2001 From: Thomas Camlong Date: Sun, 28 Jun 2026 13:55:17 +0200 Subject: [PATCH] fix: add id to repository schema and handle missing ids gracefully --- packages/api/src/router/widgets/releases.ts | 2 +- packages/widgets/src/releases/component.tsx | 15 ++++++++++----- packages/widgets/src/releases/index.ts | 3 +++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/api/src/router/widgets/releases.ts b/packages/api/src/router/widgets/releases.ts index fab3abac7..4ef99b846 100644 --- a/packages/api/src/router/widgets/releases.ts +++ b/packages/api/src/router/widgets/releases.ts @@ -34,7 +34,7 @@ export const releasesRouter = createTRPCRouter({ itemId: z.string().optional(), repositories: z.array( z.object({ - id: z.string(), + id: z.string().optional(), provider: z.enum(releaseProviderKinds), identifier: z.string(), versionFilter: releaseVersionFilterSchema.optional(), diff --git a/packages/widgets/src/releases/component.tsx b/packages/widgets/src/releases/component.tsx index 6a12d4c0b..ca0abbf16 100644 --- a/packages/widgets/src/releases/component.tsx +++ b/packages/widgets/src/releases/component.tsx @@ -20,7 +20,7 @@ import ReactMarkdown from "react-markdown"; import { clientApi } from "@homarr/api/client"; import { useRequiredBoard } from "@homarr/boards/context"; -import { isDateWithin, isNullOrWhitespace, splitToChunksWithNItems } from "@homarr/common"; +import { createId, isDateWithin, isNullOrWhitespace, splitToChunksWithNItems } from "@homarr/common"; import type { ReleaseProviderKind } from "@homarr/definitions"; import { getReleaseProviderIconUrl, getReleaseProviderName } from "@homarr/definitions"; import { useScopedI18n } from "@homarr/translation/client"; @@ -56,9 +56,14 @@ export default function ReleasesWidget({ options, itemId }: WidgetComponentProps [options.newReleaseWithin, options.staleReleaseWithin], ); + const normalizedRepositories = useMemo( + () => options.repositories.map((repo) => (repo.id ? repo : { ...repo, id: createId() })), + [options.repositories], + ); + // Group repositories by provider const groupedRepositories = useMemo(() => { - return options.repositories.reduce( + return normalizedRepositories.reduce( (acc, repo) => { const key = repo.provider; if (!key) return acc; @@ -70,7 +75,7 @@ export default function ReleasesWidget({ options, itemId }: WidgetComponentProps }, {} as Partial>, ); - }, [options.repositories]); + }, [normalizedRepositories]); // For each group, split into chunks of 5 const batchedRepositories = useMemo(() => { @@ -103,7 +108,7 @@ export default function ReleasesWidget({ options, itemId }: WidgetComponentProps ); const repositories = useMemo(() => { - const formattedResults = options.repositories + const formattedResults = normalizedRepositories .map((repository) => { if (!repository.provider) return { ...repository, error: { code: "noProviderSelected" } }; @@ -142,7 +147,7 @@ export default function ReleasesWidget({ options, itemId }: WidgetComponentProps return formattedResults; }, [ results, - options.repositories, + normalizedRepositories, options.showOnlyHighlighted, options.topReleases, relativeDateOptions.newReleaseWithin, diff --git a/packages/widgets/src/releases/index.ts b/packages/widgets/src/releases/index.ts index c82f280cb..2c3d1d3a2 100644 --- a/packages/widgets/src/releases/index.ts +++ b/packages/widgets/src/releases/index.ts @@ -1,6 +1,7 @@ import { IconRocket } from "@tabler/icons-react"; import { z } from "zod/v4"; +import { createId } from "@homarr/common"; import { releaseProviderKinds } from "@homarr/definitions"; import { createWidgetDefinition } from "../definition"; @@ -43,6 +44,7 @@ export const { definition, componentLoader } = createWidgetDefinition("releases" repositories: factory.multiReleasesRepositories({ defaultValue: [ { + id: createId(), provider: "github" as const, identifier: "homarr-labs/homarr", name: "Homarr", @@ -52,6 +54,7 @@ export const { definition, componentLoader } = createWidgetDefinition("releases" ], validate: z.array( z.object({ + id: z.string().default(() => createId()), provider: z.enum(releaseProviderKinds).optional(), identifier: z.string().min(1), name: z.string().optional(),