diff --git a/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.spec.ts b/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.spec.ts index 86f04d35d..b466bc466 100644 --- a/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.spec.ts +++ b/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.spec.ts @@ -1,6 +1,10 @@ import { describe, expect, test } from "vitest"; -import { dismissDockerReconciliationCandidate, filterDockerReconciliationInbox } from "./docker-reconciliation-inbox"; +import { + dismissDockerReconciliationCandidate, + filterDockerReconciliationInbox, + getTemplateUrl, +} from "./docker-reconciliation-inbox"; const candidates = [ { candidateKey: "home:new", state: "newRecognized" as const }, @@ -32,4 +36,45 @@ describe("Docker reconciliation inbox", () => { }); expect(dismissDockerReconciliationCandidate(dismissed, "home:new")).toBe(dismissed); }); + + test("builds service URLs from the server origin and published ports", () => { + expect( + getTemplateUrl( + { + container: { name: "Custom service", ports: [{ PrivatePort: 3000, Type: "tcp" }] }, + match: null, + }, + "home.lan", + "hostPort", + ), + ).toBe("http://home.lan"); + + expect( + getTemplateUrl( + { + container: { + name: "Sonarr", + ports: [ + { PrivatePort: 3000, PublicPort: 3000, Type: "tcp" }, + { PrivatePort: 8989, PublicPort: 9999, Type: "tcp" }, + ], + }, + match: { kind: "sonarr" }, + }, + "home.lan", + "hostPort", + ), + ).toBe("http://home.lan:9999"); + + expect( + getTemplateUrl( + { + container: { name: "Sonarr", ports: [{ PrivatePort: 8989, PublicPort: 9999, Type: "tcp" }] }, + match: { kind: "sonarr" }, + }, + "", + "hostPort", + ), + ).toBe(""); + }); }); diff --git a/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.ts b/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.ts index f9d8f1bfc..5a3cf8082 100644 --- a/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.ts +++ b/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation-inbox.ts @@ -1,3 +1,6 @@ +import type { DockerServiceMatch, DockerServicePort, UrlTemplateMode } from "@homarr/definitions"; +import { buildAppUrl, buildIntegrationUrl, getIntegrationDefaultPort } from "@homarr/definitions"; + export type DockerReconciliationInboxFilter = "attention" | "represented" | "all"; interface DockerReconciliationInboxCandidate { @@ -23,3 +26,29 @@ export const filterDockerReconciliationInbox = dismissedCandidateKeys.includes(candidateKey) ? dismissedCandidateKeys : [...dismissedCandidateKeys, candidateKey]; + +interface DockerTemplateCandidate { + container: { + name: string; + ports?: DockerServicePort[]; + }; + match: Pick | null; +} + +export const getTemplateUrl = (candidate: DockerTemplateCandidate, serverOrigin: string, urlMode: UrlTemplateMode) => { + if (!serverOrigin.trim()) return ""; + + const tcpPorts = candidate.container.ports?.filter(({ Type }) => Type.toLowerCase() === "tcp") ?? []; + let publishedPort = tcpPorts.find(({ PublicPort }) => PublicPort)?.PublicPort; + + if (candidate.match) { + const defaultPort = getIntegrationDefaultPort(candidate.match.kind); + const preferredPort = tcpPorts.find( + ({ PrivatePort, PublicPort }) => PrivatePort === defaultPort && PublicPort !== undefined, + ); + publishedPort = preferredPort?.PublicPort ?? publishedPort; + return buildIntegrationUrl(candidate.match.kind, serverOrigin, urlMode, publishedPort); + } + + return buildAppUrl(candidate.container.name, serverOrigin, urlMode, publishedPort); +}; diff --git a/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation.tsx b/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation.tsx index 88f6cb3e0..3d1a97ace 100644 --- a/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation.tsx +++ b/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-reconciliation.tsx @@ -1,6 +1,6 @@ "use client"; -import { useEffect, useId, useState } from "react"; +import { useEffect, useId, useRef, useState } from "react"; import { Accordion, ActionIcon, @@ -38,7 +38,7 @@ import { import type { RouterOutputs } from "@homarr/api"; import { clientApi } from "@homarr/api/client"; import type { UrlTemplateMode } from "@homarr/definitions"; -import { buildAppUrl, buildIntegrationUrl, getIntegrationDefaultPort, getIntegrationName } from "@homarr/definitions"; +import { getIntegrationName } from "@homarr/definitions"; import { useModalAction } from "@homarr/modals"; import { AddDockerAppToHomarr } from "@homarr/modals-collection"; import { showErrorNotification } from "@homarr/notifications"; @@ -47,7 +47,11 @@ import { useI18n, useScopedI18n } from "@homarr/translation/client"; import { Link } from "@homarr/ui"; import { IntegrationSelectModal } from "~/components/integration/integration-select-modal"; import type { DockerReconciliationInboxFilter } from "./docker-reconciliation-inbox"; -import { dismissDockerReconciliationCandidate, filterDockerReconciliationInbox } from "./docker-reconciliation-inbox"; +import { + dismissDockerReconciliationCandidate, + filterDockerReconciliationInbox, + getTemplateUrl, +} from "./docker-reconciliation-inbox"; type ReconciliationCandidate = RouterOutputs["docker"]["reconcileServices"]["candidates"][number]; type ServiceHealth = RouterOutputs["docker"]["getServiceHealth"]["services"][number]; @@ -247,12 +251,14 @@ const DockerReconciliationCandidate = ({ ); const initialUrl = urlSuggestions[0] ?? ""; const [url, setUrl] = useState(initialUrl); + const isUrlEdited = useRef(false); const target = getCandidateTarget(candidate); const actionNeedsUrl = target.kind === "createApp" || target.kind === "setupIntegration"; const visibleHealthLayers = health?.layers.filter(({ status }) => status !== "notApplicable" && status !== "notObserved") ?? []; useEffect(() => { + if (isUrlEdited.current) return; setUrl(initialUrl); }, [initialUrl]); @@ -362,7 +368,10 @@ const DockerReconciliationCandidate = ({ value={url} data={urlSuggestions} placeholder={t("url.manual")} - onChange={setUrl} + onChange={(value) => { + isUrlEdited.current = true; + setUrl(value); + }} /> )} @@ -403,24 +412,6 @@ const stateColor = (state: ReconciliationCandidate["state"]) => { return "blue"; }; -const getTemplateUrl = (candidate: ReconciliationCandidate, serverOrigin: string, urlMode: UrlTemplateMode) => { - if (!serverOrigin.trim()) return ""; - - const tcpPorts = candidate.container.ports?.filter(({ Type }) => Type.toLowerCase() === "tcp") ?? []; - let publishedPort = tcpPorts.find(({ PublicPort }) => PublicPort)?.PublicPort; - - if (candidate.match) { - const defaultPort = getIntegrationDefaultPort(candidate.match.kind); - const preferredPort = tcpPorts.find( - ({ PrivatePort, PublicPort }) => PrivatePort === defaultPort && PublicPort !== undefined, - ); - publishedPort = preferredPort?.PublicPort ?? publishedPort; - return buildIntegrationUrl(candidate.match.kind, serverOrigin, urlMode, publishedPort); - } - - return buildAppUrl(candidate.container.name, serverOrigin, urlMode, publishedPort); -}; - const HealthStatusIcon = ({ status }: { status: ServiceHealth["layers"][number]["status"] }) => { let color = "gray"; let icon = ; diff --git a/apps/nextjs/src/components/integration/integration-select-modal.tsx b/apps/nextjs/src/components/integration/integration-select-modal.tsx index 11816c2f1..55105c538 100644 --- a/apps/nextjs/src/components/integration/integration-select-modal.tsx +++ b/apps/nextjs/src/components/integration/integration-select-modal.tsx @@ -1,12 +1,13 @@ "use client"; import { useState } from "react"; -import { Group, ScrollArea, Title } from "@mantine/core"; -import { IconArrowLeft } from "@tabler/icons-react"; +import { Group, ScrollArea, Title, UnstyledButton } from "@mantine/core"; +import { IconArrowLeft, IconX } from "@tabler/icons-react"; import type { IntegrationKind } from "@homarr/definitions"; import { getIntegrationName } from "@homarr/definitions"; import { createModal, modalSizeSelect, useModalAction } from "@homarr/modals"; +import { useI18n } from "@homarr/translation/client"; import { IntegrationAvatar } from "@homarr/ui"; import { NewIntegrationForm } from "~/app/[locale]/manage/integrations/new/_integration-new-form"; @@ -25,6 +26,7 @@ interface IntegrationSelectModalProps { } export const IntegrationSelectModal = createModal(({ actions, innerProps }) => { + const t = useI18n(); const [step, setStep] = useState<"select" | "form">(innerProps.initialKind ? "form" : "select"); const [selectedKind, setSelectedKind] = useState(innerProps.initialKind ?? null); const { openModal: openCompletionModal } = useModalAction(IntegrationCompletionModal); @@ -50,13 +52,22 @@ export const IntegrationSelectModal = createModal(( }; if (step === "form" && selectedKind) { + let HeaderIcon = IconArrowLeft; + let headerLabel = t("common.action.previous"); + if (innerProps.initialKind) { + HeaderIcon = IconX; + headerLabel = t("common.action.close"); + } + return ( - - - - {getIntegrationName(selectedKind)} - + + + + + {getIntegrationName(selectedKind)} + + ( name: container.name, iconUrl: container.iconUrl, description: null, - href: containerUrls[index] ?? null, + href: containerUrls[index] || null, pingUrl: null, })), ); @@ -68,28 +68,31 @@ export const AddDockerAppToHomarrModal = createModal( - {innerProps.selectedContainers.map((container, index) => ( - - {container.name.at(0)?.toUpperCase()} - - } - key={container.id} - > - - {container.name} - - - - ))} + {innerProps.selectedContainers.map((container, index) => { + const inputProps = form.getInputProps(`containerUrls.${index}`); + return ( + + {container.name.at(0)?.toUpperCase()} + + } + key={container.id} + > + + {container.name} + + + + ); + })}