feat(onboarding): enhance integration setup with Docker discovery and URL templating (#5607)
This commit is contained in:
1 parent
0a6467979a
commit
dd7a4908a3
68 files changed
+2922
-434
No files matched your search
@@ -11,6 +11,7 @@ import {
|
|||||||
IconLayoutBoard,
|
IconLayoutBoard,
|
||||||
IconPencil,
|
IconPencil,
|
||||||
IconPencilOff,
|
IconPencilOff,
|
||||||
|
IconPlug,
|
||||||
IconPlus,
|
IconPlus,
|
||||||
IconReplace,
|
IconReplace,
|
||||||
IconResize,
|
IconResize,
|
||||||
@@ -36,6 +37,7 @@ import { useBoardPermissions } from "~/components/board/permissions/client";
|
|||||||
import { useCategoryActions } from "~/components/board/sections/category/category-actions";
|
import { useCategoryActions } from "~/components/board/sections/category/category-actions";
|
||||||
import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
|
import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
|
||||||
import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
|
import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
|
||||||
|
import { IntegrationSelectModal } from "~/components/integration/integration-select-modal";
|
||||||
import { HeaderButton } from "~/components/layout/header/button";
|
import { HeaderButton } from "~/components/layout/header/button";
|
||||||
|
|
||||||
export const BoardContentHeaderActions = () => {
|
export const BoardContentHeaderActions = () => {
|
||||||
@@ -70,6 +72,7 @@ const AddMenu = () => {
|
|||||||
const { openModal: openCategoryEditModal } = useModalAction(CategoryEditModal);
|
const { openModal: openCategoryEditModal } = useModalAction(CategoryEditModal);
|
||||||
const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
|
const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
|
||||||
const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
|
const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
|
||||||
|
const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
|
||||||
const { addCategoryToEnd } = useCategoryActions();
|
const { addCategoryToEnd } = useCategoryActions();
|
||||||
const { addDynamicSection } = useDynamicSectionActions();
|
const { addDynamicSection } = useDynamicSectionActions();
|
||||||
const { createItem } = useItemActions();
|
const { createItem } = useItemActions();
|
||||||
@@ -111,6 +114,10 @@ const AddMenu = () => {
|
|||||||
});
|
});
|
||||||
}, [openAppSelectModal, createItem]);
|
}, [openAppSelectModal, createItem]);
|
||||||
|
|
||||||
|
const handleAddIntegration = useCallback(() => {
|
||||||
|
openIntegrationSelectModal({});
|
||||||
|
}, [openIntegrationSelectModal]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu position="bottom-end">
|
<Menu position="bottom-end">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
@@ -130,6 +137,10 @@ const AddMenu = () => {
|
|||||||
{t("app.action.add")}
|
{t("app.action.add")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
|
||||||
|
<Menu.Item leftSection={<IconPlug size={20} />} onClick={handleAddIntegration}>
|
||||||
|
{t("integration.action.create")}
|
||||||
|
</Menu.Item>
|
||||||
|
|
||||||
<Menu.Divider />
|
<Menu.Divider />
|
||||||
|
|
||||||
<Menu.Item leftSection={<IconBoxAlignTop size={20} />} onClick={handleAddCategory}>
|
<Menu.Item leftSection={<IconBoxAlignTop size={20} />} onClick={handleAddCategory}>
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import type { PropsWithChildren } from "react";
|
||||||
|
import { Card } from "@mantine/core";
|
||||||
|
|
||||||
|
interface InitStepCardProps {
|
||||||
|
withBorder?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const InitStepCard = ({ children, withBorder = true }: PropsWithChildren<InitStepCardProps>) => (
|
||||||
|
<Card w="100%" withBorder={withBorder}>
|
||||||
|
{children}
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
export const onboardingContentWidth = 64 * 16;
|
||||||
|
export const onboardingMaxWidth = "90vw";
|
||||||
@@ -1,39 +1,27 @@
|
|||||||
import type { MantineColor } from "@mantine/core";
|
import type { MantineColor } from "@mantine/core";
|
||||||
import { Button, Card, Stack, Text } from "@mantine/core";
|
import { Button, Stack, Text } from "@mantine/core";
|
||||||
import { IconBook2, IconCategoryPlus, IconLayoutDashboard, IconMailForward } from "@tabler/icons-react";
|
import { IconBook2, IconLayoutDashboard, IconMailForward } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { isProviderEnabled } from "@homarr/auth/server";
|
import { isProviderEnabled } from "@homarr/auth/server";
|
||||||
import { getMantineColor } from "@homarr/common";
|
import { getMantineColor } from "@homarr/common";
|
||||||
import { db } from "@homarr/db";
|
|
||||||
import { createDocumentationLink } from "@homarr/definitions";
|
import { createDocumentationLink } from "@homarr/definitions";
|
||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
import { Link } from "@homarr/ui";
|
import { Link } from "@homarr/ui";
|
||||||
import type { TablerIcon } from "@homarr/ui";
|
import type { TablerIcon } from "@homarr/ui";
|
||||||
|
|
||||||
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
|
|
||||||
export const InitFinish = async () => {
|
export const InitFinish = async () => {
|
||||||
const firstBoard = await db.query.boards.findFirst({ columns: { name: true } });
|
|
||||||
const tFinish = await getScopedI18n("init.step.finish");
|
const tFinish = await getScopedI18n("init.step.finish");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw">
|
<InitStepCard>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Text>{tFinish("description")}</Text>
|
<Text>{tFinish("description")}</Text>
|
||||||
|
|
||||||
{firstBoard ? (
|
<InternalLinkButton href="/auth/login?callbackUrl=/" iconProps={{ icon: IconLayoutDashboard, color: "blue" }}>
|
||||||
<InternalLinkButton
|
{tFinish("action.goToBoard", { name: "dashboard" })}
|
||||||
href={`/auth/login?callbackUrl=/boards/${firstBoard.name}`}
|
</InternalLinkButton>
|
||||||
iconProps={{ icon: IconLayoutDashboard, color: "blue" }}
|
|
||||||
>
|
|
||||||
{tFinish("action.goToBoard", { name: firstBoard.name })}
|
|
||||||
</InternalLinkButton>
|
|
||||||
) : (
|
|
||||||
<InternalLinkButton
|
|
||||||
href="/auth/login?callbackUrl=/manage/boards"
|
|
||||||
iconProps={{ icon: IconCategoryPlus, color: "blue" }}
|
|
||||||
>
|
|
||||||
{tFinish("action.createBoard")}
|
|
||||||
</InternalLinkButton>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{isProviderEnabled("credentials") && (
|
{isProviderEnabled("credentials") && (
|
||||||
<InternalLinkButton
|
<InternalLinkButton
|
||||||
@@ -51,7 +39,7 @@ export const InitFinish = async () => {
|
|||||||
{tFinish("action.docs")}
|
{tFinish("action.docs")}
|
||||||
</ExternalLinkButton>
|
</ExternalLinkButton>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</InitStepCard>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Button, Card, Stack, TextInput } from "@mantine/core";
|
import { Button, Stack, TextInput } from "@mantine/core";
|
||||||
import { IconArrowRight } from "@tabler/icons-react";
|
import { IconArrowRight } from "@tabler/icons-react";
|
||||||
import type { z } from "zod/v4";
|
import type { z } from "zod/v4";
|
||||||
|
|
||||||
@@ -10,6 +10,8 @@ import { useZodForm } from "@homarr/form";
|
|||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
import { groupCreateSchema } from "@homarr/validation/group";
|
import { groupCreateSchema } from "@homarr/validation/group";
|
||||||
|
|
||||||
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
|
|
||||||
export const InitGroup = () => {
|
export const InitGroup = () => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const { mutateAsync } = clientApi.group.createInitialExternalGroup.useMutation({
|
const { mutateAsync } = clientApi.group.createInitialExternalGroup.useMutation({
|
||||||
@@ -34,7 +36,7 @@ export const InitGroup = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw">
|
<InitStepCard>
|
||||||
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
||||||
<Stack>
|
<Stack>
|
||||||
<TextInput
|
<TextInput
|
||||||
@@ -48,6 +50,6 @@ export const InitGroup = () => {
|
|||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
</form>
|
</form>
|
||||||
</Card>
|
</InitStepCard>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1,10 +1,12 @@
|
|||||||
import { ActionIcon, Button, Card, Group, Text } from "@mantine/core";
|
import { ActionIcon, Button, Group, Text } from "@mantine/core";
|
||||||
import type { FileWithPath } from "@mantine/dropzone";
|
import type { FileWithPath } from "@mantine/dropzone";
|
||||||
import { IconPencil } from "@tabler/icons-react";
|
import { IconPencil } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { humanFileSize } from "@homarr/common";
|
import { humanFileSize } from "@homarr/common";
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
|
|
||||||
interface FileInfoCardProps {
|
interface FileInfoCardProps {
|
||||||
file: FileWithPath;
|
file: FileWithPath;
|
||||||
onRemove: () => void;
|
onRemove: () => void;
|
||||||
@@ -13,7 +15,7 @@ interface FileInfoCardProps {
|
|||||||
export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
|
export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
|
||||||
const tFileInfo = useScopedI18n("init.step.import.fileInfo");
|
const tFileInfo = useScopedI18n("init.step.import.fileInfo");
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
<InitStepCard withBorder={false}>
|
||||||
<Group justify="space-between" align="center" wrap="nowrap">
|
<Group justify="space-between" align="center" wrap="nowrap">
|
||||||
<Group>
|
<Group>
|
||||||
<Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
|
<Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
|
||||||
@@ -36,6 +38,6 @@ export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
|
|||||||
<IconPencil size={16} stroke={1.5} />
|
<IconPencil size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Group>
|
</Group>
|
||||||
</Card>
|
</InitStepCard>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1,13 +1,14 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { startTransition, useState } from "react";
|
import { startTransition, useState } from "react";
|
||||||
import { Card, Stack } from "@mantine/core";
|
import { Stack } from "@mantine/core";
|
||||||
import type { FileWithPath } from "@mantine/dropzone";
|
import type { FileWithPath } from "@mantine/dropzone";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { InitialOldmarrImport } from "@homarr/old-import/components";
|
import { InitialOldmarrImport } from "@homarr/old-import/components";
|
||||||
|
|
||||||
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
import { FileInfoCard } from "./file-info-card";
|
import { FileInfoCard } from "./file-info-card";
|
||||||
import { ImportDropZone } from "./import-dropzone";
|
import { ImportDropZone } from "./import-dropzone";
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ export const InitImport = () => {
|
|||||||
|
|
||||||
if (!file) {
|
if (!file) {
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw">
|
<InitStepCard>
|
||||||
<ImportDropZone
|
<ImportDropZone
|
||||||
loading={isPending}
|
loading={isPending}
|
||||||
updateFile={(file) => {
|
updateFile={(file) => {
|
||||||
@@ -40,12 +41,12 @@ export const InitImport = () => {
|
|||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Card>
|
</InitStepCard>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack mb="sm">
|
<Stack w="100%" mb="sm">
|
||||||
<FileInfoCard file={file} onRemove={() => setFile(null)} />
|
<FileInfoCard file={file} onRemove={() => setFile(null)} />
|
||||||
{analyseResult !== null && <InitialOldmarrImport file={file} analyseResult={analyseResult} />}
|
{analyseResult !== null && <InitialOldmarrImport file={file} analyseResult={analyseResult} />}
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
@@ -0,0 +1,209 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import {
|
||||||
|
Avatar,
|
||||||
|
Badge,
|
||||||
|
Card,
|
||||||
|
Collapse,
|
||||||
|
Group,
|
||||||
|
Loader,
|
||||||
|
Paper,
|
||||||
|
ScrollArea,
|
||||||
|
SimpleGrid,
|
||||||
|
Stack,
|
||||||
|
Text,
|
||||||
|
ThemeIcon,
|
||||||
|
UnstyledButton,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { IconBrandDocker, IconCheck, IconChevronDown } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import type { IntegrationKind } from "@homarr/definitions";
|
||||||
|
import { getIntegrationName } from "@homarr/definitions";
|
||||||
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
|
import { IntegrationAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
|
export interface DiscoveredIntegration {
|
||||||
|
containerId: string;
|
||||||
|
containerName: string;
|
||||||
|
kind: IntegrationKind;
|
||||||
|
suggestedUrl: string;
|
||||||
|
publishedPort: number | null;
|
||||||
|
iconUrl: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DiscoveredApp {
|
||||||
|
containerId: string;
|
||||||
|
containerName: string;
|
||||||
|
suggestedUrl: string;
|
||||||
|
publishedPort: number | null;
|
||||||
|
iconUrl: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface DockerDiscoveryIndicatorProps {
|
||||||
|
integrations: DiscoveredIntegration[];
|
||||||
|
apps: DiscoveredApp[];
|
||||||
|
selectedAppIds: Set<string>;
|
||||||
|
onToggleApp: (containerId: string) => void;
|
||||||
|
isLoading: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const APP_CARD_HEIGHT = 80;
|
||||||
|
|
||||||
|
export const DockerDiscoveryIndicator = ({
|
||||||
|
integrations,
|
||||||
|
apps,
|
||||||
|
selectedAppIds,
|
||||||
|
onToggleApp,
|
||||||
|
isLoading,
|
||||||
|
}: DockerDiscoveryIndicatorProps) => {
|
||||||
|
const hasApps = apps.length > 0;
|
||||||
|
const [expanded, setExpanded] = useState(false);
|
||||||
|
|
||||||
|
const expandedOnce = useRef(false);
|
||||||
|
useEffect(() => {
|
||||||
|
if ((hasApps || integrations.length > 0) && !expandedOnce.current) {
|
||||||
|
expandedOnce.current = true;
|
||||||
|
setExpanded(true);
|
||||||
|
}
|
||||||
|
}, [hasApps, integrations.length]);
|
||||||
|
|
||||||
|
const t = useScopedI18n("init.step.integrations.docker");
|
||||||
|
const totalCount = integrations.length + apps.length;
|
||||||
|
|
||||||
|
if (!isLoading && totalCount === 0) return null;
|
||||||
|
|
||||||
|
const selectedAppCount = apps.filter((app) => selectedAppIds.has(app.containerId)).length;
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<Paper
|
||||||
|
withBorder
|
||||||
|
p="sm"
|
||||||
|
radius="md"
|
||||||
|
style={{
|
||||||
|
borderColor: "var(--mantine-color-blue-4)",
|
||||||
|
background: "var(--mantine-color-blue-light)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Group gap="sm" wrap="nowrap">
|
||||||
|
<ThemeIcon variant="light" color="blue" size="lg" radius="md">
|
||||||
|
<IconBrandDocker size={20} />
|
||||||
|
</ThemeIcon>
|
||||||
|
<Stack gap={0} style={{ flex: 1 }}>
|
||||||
|
<Text size="sm" fw={600}>
|
||||||
|
{t("scanning")}
|
||||||
|
</Text>
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
{t("scanningDescription")}
|
||||||
|
</Text>
|
||||||
|
</Stack>
|
||||||
|
<Loader size="sm" color="blue" type="dots" />
|
||||||
|
</Group>
|
||||||
|
</Paper>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Paper
|
||||||
|
withBorder
|
||||||
|
p="sm"
|
||||||
|
radius="md"
|
||||||
|
style={{
|
||||||
|
borderColor: "var(--mantine-color-blue-4)",
|
||||||
|
background: "var(--mantine-color-blue-light)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<UnstyledButton onClick={() => setExpanded((prev) => !prev)} w="100%">
|
||||||
|
<Group justify="space-between" wrap="nowrap">
|
||||||
|
<Group gap="sm" wrap="nowrap">
|
||||||
|
<ThemeIcon variant="light" color="blue" size="lg" radius="md">
|
||||||
|
<IconBrandDocker size={20} />
|
||||||
|
</ThemeIcon>
|
||||||
|
<Stack gap={0}>
|
||||||
|
<Text size="sm" fw={600}>
|
||||||
|
{t("detected", { count: String(totalCount) })}
|
||||||
|
</Text>
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
{t("detectedBreakdown", {
|
||||||
|
integrations: String(integrations.length),
|
||||||
|
apps: String(apps.length),
|
||||||
|
})}
|
||||||
|
</Text>
|
||||||
|
</Stack>
|
||||||
|
</Group>
|
||||||
|
<IconChevronDown
|
||||||
|
size={16}
|
||||||
|
color="var(--mantine-color-dimmed)"
|
||||||
|
style={{
|
||||||
|
transform: expanded ? "rotate(180deg)" : undefined,
|
||||||
|
transition: "transform 200ms ease",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Group>
|
||||||
|
</UnstyledButton>
|
||||||
|
|
||||||
|
<Collapse expanded={expanded}>
|
||||||
|
<Stack gap="xs" mt="sm">
|
||||||
|
{integrations.length > 0 && (
|
||||||
|
<Stack gap={4}>
|
||||||
|
{integrations.map((integration) => (
|
||||||
|
<Group key={integration.containerId} gap="xs" wrap="nowrap" py={2}>
|
||||||
|
<IntegrationAvatar kind={integration.kind} size="xs" />
|
||||||
|
<Text size="xs" fw={500} lineClamp={1} style={{ flex: 1, minWidth: 0 }}>
|
||||||
|
{integration.containerName}
|
||||||
|
</Text>
|
||||||
|
<Badge size="xs" variant="light" color="blue">
|
||||||
|
{getIntegrationName(integration.kind)}
|
||||||
|
</Badge>
|
||||||
|
</Group>
|
||||||
|
))}
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{hasApps && (
|
||||||
|
<Stack gap="xs">
|
||||||
|
<Text size="xs" fw={500}>
|
||||||
|
{t("appSectionLabel", { count: String(selectedAppCount) })}
|
||||||
|
</Text>
|
||||||
|
<ScrollArea.Autosize mah="30vh">
|
||||||
|
<SimpleGrid cols={{ base: 3, xs: 4, sm: 5 }} spacing="xs">
|
||||||
|
{apps.map((app) => {
|
||||||
|
const isSelected = selectedAppIds.has(app.containerId);
|
||||||
|
return (
|
||||||
|
<Card
|
||||||
|
key={app.containerId}
|
||||||
|
h={APP_CARD_HEIGHT}
|
||||||
|
p="xs"
|
||||||
|
withBorder
|
||||||
|
style={{
|
||||||
|
cursor: "pointer",
|
||||||
|
borderColor: isSelected ? "var(--mantine-color-blue-6)" : undefined,
|
||||||
|
borderWidth: isSelected ? 2 : undefined,
|
||||||
|
opacity: isSelected ? 1 : 0.6,
|
||||||
|
}}
|
||||||
|
onClick={() => onToggleApp(app.containerId)}
|
||||||
|
>
|
||||||
|
<Stack justify="space-between" h="100%" gap={4} align="center">
|
||||||
|
<Group justify="space-between" w="100%" wrap="nowrap">
|
||||||
|
<Text size="xs" fw={500} lineClamp={1} style={{ flex: 1, minWidth: 0 }}>
|
||||||
|
{app.containerName}
|
||||||
|
</Text>
|
||||||
|
{isSelected && <IconCheck size={14} color="var(--mantine-color-blue-6)" />}
|
||||||
|
</Group>
|
||||||
|
<Avatar size="sm" radius="sm" src={app.iconUrl} styles={{ image: { objectFit: "contain" } }}>
|
||||||
|
{app.containerName.at(0)?.toUpperCase()}
|
||||||
|
</Avatar>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</SimpleGrid>
|
||||||
|
</ScrollArea.Autosize>
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
</Collapse>
|
||||||
|
</Paper>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,483 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import {
|
||||||
|
ActionIcon,
|
||||||
|
Alert,
|
||||||
|
Avatar,
|
||||||
|
Button,
|
||||||
|
Card,
|
||||||
|
Center,
|
||||||
|
Collapse,
|
||||||
|
Group,
|
||||||
|
Loader,
|
||||||
|
Paper,
|
||||||
|
Progress,
|
||||||
|
SegmentedControl,
|
||||||
|
SimpleGrid,
|
||||||
|
Stack,
|
||||||
|
Text,
|
||||||
|
TextInput,
|
||||||
|
ThemeIcon,
|
||||||
|
Tooltip,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { useDisclosure } from "@mantine/hooks";
|
||||||
|
import {
|
||||||
|
IconAlertTriangle,
|
||||||
|
IconArrowRight,
|
||||||
|
IconBrandDocker,
|
||||||
|
IconCheck,
|
||||||
|
IconChevronDown,
|
||||||
|
IconSettings,
|
||||||
|
} from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import { clientApi } from "@homarr/api/client";
|
||||||
|
import type { IntegrationKind, UrlTemplateMode } from "@homarr/definitions";
|
||||||
|
import { buildAppUrl, buildIntegrationUrl, getIntegrationName } from "@homarr/definitions";
|
||||||
|
import { showErrorNotification } from "@homarr/notifications";
|
||||||
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
|
import { IntegrationAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
|
import { NewIntegrationForm } from "~/app/[locale]/manage/integrations/new/_integration-new-form";
|
||||||
|
import { IntegrationMultiSelectGrid } from "~/components/integration/integration-multi-select-grid";
|
||||||
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
|
|
||||||
|
type Phase = "select" | "configure" | "done";
|
||||||
|
|
||||||
|
interface IntegrationDraft {
|
||||||
|
kind: IntegrationKind;
|
||||||
|
initialUrl: string;
|
||||||
|
initialName?: string;
|
||||||
|
dockerPort?: number | null;
|
||||||
|
source: "manual" | "docker";
|
||||||
|
}
|
||||||
|
|
||||||
|
export const InitIntegrations = () => {
|
||||||
|
const [phase, setPhase] = useState<Phase>("select");
|
||||||
|
const [drafts, setDrafts] = useState<Map<IntegrationKind, IntegrationDraft>>(new Map());
|
||||||
|
const [selectedKinds, setSelectedKinds] = useState<IntegrationKind[]>([]);
|
||||||
|
const [currentIndex, setCurrentIndex] = useState(0);
|
||||||
|
const [baseHost, setBaseHost] = useState("");
|
||||||
|
const [urlMode, setUrlMode] = useState<UrlTemplateMode>("subdomain");
|
||||||
|
const t = useScopedI18n("init.step.integrations");
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
const { mutateAsync: setupIntegrations } = clientApi.onboard.setupIntegrations.useMutation();
|
||||||
|
const { mutateAsync: createApps } = clientApi.onboard.createAppsFromDiscovery.useMutation();
|
||||||
|
|
||||||
|
const { data: dockerData, isPending: isDockerLoading } = clientApi.onboard.discoverDockerServices.useQuery(
|
||||||
|
undefined,
|
||||||
|
{
|
||||||
|
retry: false,
|
||||||
|
refetchOnWindowFocus: false,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
const dockerIntegrations = dockerData?.status === "success" ? dockerData.integrations : [];
|
||||||
|
const dockerApps = dockerData?.status === "success" ? dockerData.apps : [];
|
||||||
|
const totalDetected = dockerIntegrations.length + dockerApps.length;
|
||||||
|
|
||||||
|
const detectedKinds = useMemo(() => new Set(dockerIntegrations.map((i) => i.kind)), [dockerIntegrations]);
|
||||||
|
|
||||||
|
const [selectedAppIds, setSelectedAppIds] = useState<Set<string>>(new Set());
|
||||||
|
const [appsExpanded, setAppsExpanded] = useState(false);
|
||||||
|
|
||||||
|
const dockerApplied = useRef(false);
|
||||||
|
useEffect(() => {
|
||||||
|
if (dockerData?.status !== "success" || dockerApplied.current) return;
|
||||||
|
dockerApplied.current = true;
|
||||||
|
|
||||||
|
const newDrafts = new Map(drafts);
|
||||||
|
const newKinds = new Set(selectedKinds);
|
||||||
|
|
||||||
|
for (const item of dockerData.integrations) {
|
||||||
|
if (!newDrafts.has(item.kind)) {
|
||||||
|
newDrafts.set(item.kind, {
|
||||||
|
kind: item.kind,
|
||||||
|
initialUrl: item.suggestedUrl,
|
||||||
|
initialName: item.containerName,
|
||||||
|
dockerPort: item.publishedPort,
|
||||||
|
source: "docker",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
newKinds.add(item.kind);
|
||||||
|
}
|
||||||
|
|
||||||
|
setDrafts(newDrafts);
|
||||||
|
setSelectedKinds(Array.from(newKinds));
|
||||||
|
setSelectedAppIds(new Set(dockerData.apps.map((app) => app.containerId)));
|
||||||
|
if (dockerData.apps.length > 0) {
|
||||||
|
setAppsExpanded(true);
|
||||||
|
}
|
||||||
|
}, [dockerData]);
|
||||||
|
|
||||||
|
const handleSelectionChange = useCallback((kinds: IntegrationKind[]) => {
|
||||||
|
setSelectedKinds(kinds);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleToggleApp = useCallback((containerId: string) => {
|
||||||
|
setSelectedAppIds((prev) => {
|
||||||
|
const next = new Set(prev);
|
||||||
|
if (next.has(containerId)) {
|
||||||
|
next.delete(containerId);
|
||||||
|
} else {
|
||||||
|
next.add(containerId);
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleContinueToConfig = () => {
|
||||||
|
const newDrafts = new Map(drafts);
|
||||||
|
for (const kind of selectedKinds) {
|
||||||
|
const existing = newDrafts.get(kind);
|
||||||
|
if (baseHost) {
|
||||||
|
newDrafts.set(kind, {
|
||||||
|
kind,
|
||||||
|
initialUrl: buildIntegrationUrl(kind, baseHost, urlMode, existing?.dockerPort ?? undefined),
|
||||||
|
initialName: existing?.initialName,
|
||||||
|
dockerPort: existing?.dockerPort,
|
||||||
|
source: existing?.source ?? "manual",
|
||||||
|
});
|
||||||
|
} else if (!existing) {
|
||||||
|
newDrafts.set(kind, { kind, initialUrl: "", source: "manual" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setDrafts(newDrafts);
|
||||||
|
setCurrentIndex(0);
|
||||||
|
setPhase("configure");
|
||||||
|
};
|
||||||
|
|
||||||
|
const finishSetupAsync = async () => {
|
||||||
|
setPhase("done");
|
||||||
|
try {
|
||||||
|
const appsToCreate = dockerApps.filter((app) => selectedAppIds.has(app.containerId));
|
||||||
|
if (appsToCreate.length > 0) {
|
||||||
|
await createApps(
|
||||||
|
appsToCreate.map((app) => {
|
||||||
|
const href = baseHost
|
||||||
|
? buildAppUrl(app.containerName, baseHost, urlMode, app.publishedPort ?? undefined)
|
||||||
|
: app.suggestedUrl;
|
||||||
|
return {
|
||||||
|
name: app.containerName,
|
||||||
|
href: href || null,
|
||||||
|
iconUrl: app.iconUrl,
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await setupIntegrations();
|
||||||
|
router.refresh();
|
||||||
|
} catch {
|
||||||
|
showErrorNotification({
|
||||||
|
title: t("configure.error.title"),
|
||||||
|
message: t("configure.error.message"),
|
||||||
|
});
|
||||||
|
setPhase("select");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const advanceOrFinish = () => {
|
||||||
|
if (currentIndex + 1 >= selectedKinds.length) {
|
||||||
|
void finishSetupAsync();
|
||||||
|
} else {
|
||||||
|
setCurrentIndex((i) => i + 1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const backToSelect = () => {
|
||||||
|
setPhase("select");
|
||||||
|
setCurrentIndex(0);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (phase === "done") {
|
||||||
|
return (
|
||||||
|
<InitStepCard>
|
||||||
|
<Center py="xl">
|
||||||
|
<Stack align="center" gap="md">
|
||||||
|
<Loader size="lg" />
|
||||||
|
<Text>{t("configure.finishing")}</Text>
|
||||||
|
</Stack>
|
||||||
|
</Center>
|
||||||
|
</InitStepCard>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (phase === "configure") {
|
||||||
|
return (
|
||||||
|
<ConfigurePhase
|
||||||
|
selectedKinds={selectedKinds}
|
||||||
|
currentIndex={currentIndex}
|
||||||
|
drafts={drafts}
|
||||||
|
baseHost={baseHost}
|
||||||
|
setBaseHost={setBaseHost}
|
||||||
|
urlMode={urlMode}
|
||||||
|
setUrlMode={setUrlMode}
|
||||||
|
onSuccess={advanceOrFinish}
|
||||||
|
onCancel={backToSelect}
|
||||||
|
onSkip={advanceOrFinish}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectedAppCount = dockerApps.filter((app) => selectedAppIds.has(app.containerId)).length;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<InitStepCard>
|
||||||
|
<Stack>
|
||||||
|
<Text>{t("description")}</Text>
|
||||||
|
|
||||||
|
<Alert variant="outline" color="orange" icon={<IconAlertTriangle />} title={t("urlTemplate.label")}>
|
||||||
|
<Stack gap="xs">
|
||||||
|
<Text size="sm" fw={500}>
|
||||||
|
{t("urlTemplate.warning")}
|
||||||
|
</Text>
|
||||||
|
<Group gap="sm" grow>
|
||||||
|
<TextInput
|
||||||
|
placeholder={t("urlTemplate.placeholder")}
|
||||||
|
value={baseHost}
|
||||||
|
onChange={(e) => setBaseHost(e.currentTarget.value)}
|
||||||
|
data-autofocus
|
||||||
|
/>
|
||||||
|
<SegmentedControl
|
||||||
|
value={urlMode}
|
||||||
|
onChange={(value) => setUrlMode(value as UrlTemplateMode)}
|
||||||
|
data={[
|
||||||
|
{ label: t("urlTemplate.mode.subdomain"), value: "subdomain" },
|
||||||
|
{ label: t("urlTemplate.mode.hostPort"), value: "hostPort" },
|
||||||
|
]}
|
||||||
|
style={{ flex: "0 0 auto" }}
|
||||||
|
/>
|
||||||
|
</Group>
|
||||||
|
{baseHost && (
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
{t("urlTemplate.preview", { example: buildIntegrationUrl("sonarr", baseHost, urlMode) })}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
</Alert>
|
||||||
|
|
||||||
|
{isDockerLoading && (
|
||||||
|
<Paper withBorder p="sm" radius="md">
|
||||||
|
<Group gap="sm" wrap="nowrap">
|
||||||
|
<ThemeIcon variant="light" color="blue" size="lg" radius="md">
|
||||||
|
<IconBrandDocker size={20} />
|
||||||
|
</ThemeIcon>
|
||||||
|
<Text size="sm" fw={500}>
|
||||||
|
{t("docker.scanning")}
|
||||||
|
</Text>
|
||||||
|
<Loader size="sm" color="blue" type="dots" />
|
||||||
|
</Group>
|
||||||
|
</Paper>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!isDockerLoading && totalDetected > 0 && (
|
||||||
|
<Paper withBorder p="sm" radius="md" style={{ borderColor: "var(--mantine-color-teal-4)" }}>
|
||||||
|
<Group gap="sm" wrap="nowrap">
|
||||||
|
<ThemeIcon variant="light" color="teal" size="lg" radius="md">
|
||||||
|
<IconBrandDocker size={20} />
|
||||||
|
</ThemeIcon>
|
||||||
|
<Text size="sm">
|
||||||
|
{t("docker.summary", {
|
||||||
|
apps: String(totalDetected),
|
||||||
|
integrations: String(dockerIntegrations.length),
|
||||||
|
})}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
</Paper>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<IntegrationMultiSelectGrid
|
||||||
|
selectedKinds={selectedKinds}
|
||||||
|
onSelectionChange={handleSelectionChange}
|
||||||
|
detectedKinds={detectedKinds}
|
||||||
|
onboarding
|
||||||
|
/>
|
||||||
|
|
||||||
|
{dockerApps.length > 0 && (
|
||||||
|
<Paper withBorder p="sm" radius="md">
|
||||||
|
<Stack gap="xs">
|
||||||
|
<Group
|
||||||
|
justify="space-between"
|
||||||
|
wrap="nowrap"
|
||||||
|
style={{ cursor: "pointer" }}
|
||||||
|
onClick={() => setAppsExpanded((prev) => !prev)}
|
||||||
|
>
|
||||||
|
<Text size="sm" fw={500}>
|
||||||
|
{t("docker.appSectionLabel", { count: String(selectedAppCount) })}
|
||||||
|
</Text>
|
||||||
|
<IconChevronDown
|
||||||
|
size={16}
|
||||||
|
color="var(--mantine-color-dimmed)"
|
||||||
|
style={{
|
||||||
|
transform: appsExpanded ? "rotate(180deg)" : undefined,
|
||||||
|
transition: "transform 200ms ease",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Group>
|
||||||
|
<Collapse expanded={appsExpanded}>
|
||||||
|
<SimpleGrid cols={{ base: 3, xs: 4, sm: 5 }} spacing="xs">
|
||||||
|
{dockerApps.map((app) => {
|
||||||
|
const isSelected = selectedAppIds.has(app.containerId);
|
||||||
|
return (
|
||||||
|
<Card
|
||||||
|
key={app.containerId}
|
||||||
|
h={80}
|
||||||
|
p="xs"
|
||||||
|
withBorder
|
||||||
|
style={{
|
||||||
|
cursor: "pointer",
|
||||||
|
borderColor: isSelected ? "var(--mantine-color-blue-6)" : undefined,
|
||||||
|
borderWidth: isSelected ? 2 : undefined,
|
||||||
|
opacity: isSelected ? 1 : 0.6,
|
||||||
|
}}
|
||||||
|
onClick={() => handleToggleApp(app.containerId)}
|
||||||
|
>
|
||||||
|
<Stack justify="space-between" h="100%" gap={4} align="center">
|
||||||
|
<Group justify="space-between" w="100%" wrap="nowrap">
|
||||||
|
<Text size="xs" fw={500} lineClamp={1} style={{ flex: 1, minWidth: 0 }}>
|
||||||
|
{app.containerName}
|
||||||
|
</Text>
|
||||||
|
{isSelected && <IconCheck size={14} color="var(--mantine-color-blue-6)" />}
|
||||||
|
</Group>
|
||||||
|
<Avatar size="sm" radius="sm" src={app.iconUrl} styles={{ image: { objectFit: "contain" } }}>
|
||||||
|
{app.containerName.at(0)?.toUpperCase()}
|
||||||
|
</Avatar>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</SimpleGrid>
|
||||||
|
</Collapse>
|
||||||
|
</Stack>
|
||||||
|
</Paper>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Group justify="space-between">
|
||||||
|
<Button variant="subtle" onClick={() => void finishSetupAsync()}>
|
||||||
|
{t("action.skip")}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
onClick={handleContinueToConfig}
|
||||||
|
disabled={selectedKinds.length === 0 || undefined}
|
||||||
|
rightSection={<IconArrowRight size={16} stroke={1.5} />}
|
||||||
|
suppressHydrationWarning
|
||||||
|
>
|
||||||
|
{t("action.continue")} {selectedKinds.length > 0 && `(${selectedKinds.length})`}
|
||||||
|
</Button>
|
||||||
|
</Group>
|
||||||
|
</Stack>
|
||||||
|
</InitStepCard>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
interface ConfigurePhaseProps {
|
||||||
|
selectedKinds: IntegrationKind[];
|
||||||
|
currentIndex: number;
|
||||||
|
drafts: Map<IntegrationKind, IntegrationDraft>;
|
||||||
|
baseHost: string;
|
||||||
|
setBaseHost: (value: string) => void;
|
||||||
|
urlMode: UrlTemplateMode;
|
||||||
|
setUrlMode: (value: UrlTemplateMode) => void;
|
||||||
|
onSuccess: () => void;
|
||||||
|
onCancel: () => void;
|
||||||
|
onSkip: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ConfigurePhase = ({
|
||||||
|
selectedKinds,
|
||||||
|
currentIndex,
|
||||||
|
drafts,
|
||||||
|
baseHost,
|
||||||
|
setBaseHost,
|
||||||
|
urlMode,
|
||||||
|
setUrlMode,
|
||||||
|
onSuccess,
|
||||||
|
onCancel,
|
||||||
|
onSkip,
|
||||||
|
}: ConfigurePhaseProps) => {
|
||||||
|
const t = useScopedI18n("init.step.integrations");
|
||||||
|
const [helpersOpen, { toggle: toggleHelpers }] = useDisclosure(false);
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- currentIndex is always within bounds of selectedKinds
|
||||||
|
const currentKind = selectedKinds[currentIndex]!;
|
||||||
|
const draft = drafts.get(currentKind);
|
||||||
|
const progress = ((currentIndex + 1) / selectedKinds.length) * 100;
|
||||||
|
const computedUrl = baseHost
|
||||||
|
? buildIntegrationUrl(currentKind, baseHost, urlMode, draft?.dockerPort ?? undefined)
|
||||||
|
: draft?.initialUrl;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<InitStepCard>
|
||||||
|
<Stack>
|
||||||
|
<Group justify="space-between" align="center">
|
||||||
|
<Group gap="xs">
|
||||||
|
<IntegrationAvatar kind={currentKind} size="sm" />
|
||||||
|
<Text fw={500}>{getIntegrationName(currentKind)}</Text>
|
||||||
|
</Group>
|
||||||
|
<Tooltip label={t("configure.helpers.tooltip")}>
|
||||||
|
<ActionIcon variant={helpersOpen ? "light" : "subtle"} color="gray" onClick={toggleHelpers}>
|
||||||
|
<IconSettings size={18} stroke={1.5} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
<Stack gap={4}>
|
||||||
|
<Progress value={progress} size="sm" />
|
||||||
|
<Text size="xs" c="dimmed" ta="center">
|
||||||
|
{t("configure.progress", { current: String(currentIndex + 1), total: String(selectedKinds.length) })}
|
||||||
|
</Text>
|
||||||
|
</Stack>
|
||||||
|
|
||||||
|
<Collapse expanded={helpersOpen}>
|
||||||
|
<Stack
|
||||||
|
gap="xs"
|
||||||
|
p="xs"
|
||||||
|
style={{ background: "var(--mantine-color-default-hover)", borderRadius: "var(--mantine-radius-sm)" }}
|
||||||
|
>
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
{t("configure.helpers.description")}
|
||||||
|
</Text>
|
||||||
|
<Group gap="sm" grow>
|
||||||
|
<TextInput
|
||||||
|
size="xs"
|
||||||
|
placeholder={t("urlTemplate.placeholder")}
|
||||||
|
value={baseHost}
|
||||||
|
onChange={(e) => setBaseHost(e.currentTarget.value)}
|
||||||
|
/>
|
||||||
|
<SegmentedControl
|
||||||
|
size="xs"
|
||||||
|
value={urlMode}
|
||||||
|
onChange={(value) => setUrlMode(value as UrlTemplateMode)}
|
||||||
|
data={[
|
||||||
|
{ label: t("urlTemplate.mode.subdomain"), value: "subdomain" },
|
||||||
|
{ label: t("urlTemplate.mode.hostPort"), value: "hostPort" },
|
||||||
|
]}
|
||||||
|
style={{ flex: "0 0 auto" }}
|
||||||
|
/>
|
||||||
|
</Group>
|
||||||
|
{baseHost && (
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
{t("urlTemplate.preview", {
|
||||||
|
example: buildIntegrationUrl(currentKind, baseHost, urlMode, draft?.dockerPort ?? undefined),
|
||||||
|
})}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
</Collapse>
|
||||||
|
|
||||||
|
<NewIntegrationForm
|
||||||
|
key={currentKind}
|
||||||
|
kind={currentKind}
|
||||||
|
initialUrl={computedUrl}
|
||||||
|
initialName={draft?.initialName}
|
||||||
|
onSuccess={onSuccess}
|
||||||
|
onCancel={onCancel}
|
||||||
|
onSkip={onSkip}
|
||||||
|
isOnboarding
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</InitStepCard>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Button, Card, Group, Stack, Switch, Text } from "@mantine/core";
|
import { Button, Group, Stack, Switch, Text } from "@mantine/core";
|
||||||
import { IconArrowRight } from "@tabler/icons-react";
|
import { IconArrowRight } from "@tabler/icons-react";
|
||||||
import type { z } from "zod/v4";
|
import type { z } from "zod/v4";
|
||||||
|
|
||||||
@@ -13,6 +13,8 @@ import type { TranslationObject } from "@homarr/translation";
|
|||||||
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
||||||
import { settingsInitSchema } from "@homarr/validation/settings";
|
import { settingsInitSchema } from "@homarr/validation/settings";
|
||||||
|
|
||||||
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
|
|
||||||
export const InitSettings = () => {
|
export const InitSettings = () => {
|
||||||
const tSection = useScopedI18n("management.page.settings.section");
|
const tSection = useScopedI18n("management.page.settings.section");
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
@@ -29,8 +31,8 @@ export const InitSettings = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
||||||
<Stack>
|
<Stack w="100%">
|
||||||
<Card w={64 * 12 + 8} maw="90vw">
|
<InitStepCard>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Text fw={500}>{tSection("analytics.title")}</Text>
|
<Text fw={500}>{tSection("analytics.title")}</Text>
|
||||||
|
|
||||||
@@ -38,8 +40,8 @@ export const InitSettings = () => {
|
|||||||
<AnalyticsRow kind="general" {...form.getInputProps("analytics.enableGeneral", { type: "checkbox" })} />
|
<AnalyticsRow kind="general" {...form.getInputProps("analytics.enableGeneral", { type: "checkbox" })} />
|
||||||
</Stack>
|
</Stack>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</InitStepCard>
|
||||||
<Card w={64 * 12 + 8} maw="90vw">
|
<InitStepCard>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Text fw={500}>{tSection("crawlingAndIndexing.title")}</Text>
|
<Text fw={500}>{tSection("crawlingAndIndexing.title")}</Text>
|
||||||
|
|
||||||
@@ -62,7 +64,7 @@ export const InitSettings = () => {
|
|||||||
/>
|
/>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</InitStepCard>
|
||||||
|
|
||||||
<Button type="submit" loading={form.submitting} rightSection={<IconArrowRight size={16} stroke={1.5} />}>
|
<Button type="submit" loading={form.submitting} rightSection={<IconArrowRight size={16} stroke={1.5} />}>
|
||||||
{t("common.action.continue")}
|
{t("common.action.continue")}
|
||||||
|
|||||||
@@ -1,16 +1,17 @@
|
|||||||
import { Card, Stack, Text } from "@mantine/core";
|
import { Stack, Text } from "@mantine/core";
|
||||||
import { IconFileImport, IconPlayerPlay } from "@tabler/icons-react";
|
import { IconFileImport, IconPlayerPlay } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { getMantineColor } from "@homarr/common";
|
import { getMantineColor } from "@homarr/common";
|
||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
|
|
||||||
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
import { InitStartButton } from "./next-button";
|
import { InitStartButton } from "./next-button";
|
||||||
|
|
||||||
export const InitStart = async () => {
|
export const InitStart = async () => {
|
||||||
const tStart = await getScopedI18n("init.step.start");
|
const tStart = await getScopedI18n("init.step.start");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw">
|
<InitStepCard>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Text>{tStart("description")}</Text>
|
<Text>{tStart("description")}</Text>
|
||||||
|
|
||||||
@@ -27,6 +28,6 @@ export const InitStart = async () => {
|
|||||||
{tStart("action.importOldmarr")}
|
{tStart("action.importOldmarr")}
|
||||||
</InitStartButton>
|
</InitStartButton>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</InitStepCard>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
import { Card } from "@mantine/core";
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
|
|
||||||
import { InitUserForm } from "./init-user-form";
|
import { InitUserForm } from "./init-user-form";
|
||||||
|
|
||||||
export const InitUser = () => {
|
export const InitUser = () => {
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw">
|
<InitStepCard>
|
||||||
<InitUserForm />
|
<InitUserForm />
|
||||||
</Card>
|
</InitStepCard>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -9,10 +9,12 @@ import { getScopedI18n } from "@homarr/translation/server";
|
|||||||
import { CurrentColorSchemeCombobox } from "~/components/color-scheme/current-color-scheme-combobox";
|
import { CurrentColorSchemeCombobox } from "~/components/color-scheme/current-color-scheme-combobox";
|
||||||
import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
|
import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
|
||||||
import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo";
|
import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo";
|
||||||
|
import { onboardingContentWidth, onboardingMaxWidth } from "./_constants";
|
||||||
import { BackToStart } from "./_steps/back";
|
import { BackToStart } from "./_steps/back";
|
||||||
import { InitFinish } from "./_steps/finish/init-finish";
|
import { InitFinish } from "./_steps/finish/init-finish";
|
||||||
import { InitGroup } from "./_steps/group/init-group";
|
import { InitGroup } from "./_steps/group/init-group";
|
||||||
import { InitImport } from "./_steps/import/init-import";
|
import { InitImport } from "./_steps/import/init-import";
|
||||||
|
import { InitIntegrations } from "./_steps/integrations/init-integrations";
|
||||||
import { InitSettings } from "./_steps/settings/init-settings";
|
import { InitSettings } from "./_steps/settings/init-settings";
|
||||||
import { InitStart } from "./_steps/start/init-start";
|
import { InitStart } from "./_steps/start/init-start";
|
||||||
import { InitUser } from "./_steps/user/init-user";
|
import { InitUser } from "./_steps/user/init-user";
|
||||||
@@ -23,6 +25,7 @@ const stepComponents: Record<OnboardingStep, null | (() => MaybePromise<JSX.Elem
|
|||||||
user: InitUser,
|
user: InitUser,
|
||||||
group: InitGroup,
|
group: InitGroup,
|
||||||
settings: InitSettings,
|
settings: InitSettings,
|
||||||
|
integrations: InitIntegrations,
|
||||||
finish: InitFinish,
|
finish: InitFinish,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -35,7 +38,7 @@ export default async function InitPage() {
|
|||||||
return (
|
return (
|
||||||
<Box mih="100dvh">
|
<Box mih="100dvh">
|
||||||
<Center>
|
<Center>
|
||||||
<Stack align="center" mt="xl">
|
<Stack align="center" mt="xl" w={onboardingContentWidth} maw={onboardingMaxWidth}>
|
||||||
<HomarrLogoWithTitle size="lg" />
|
<HomarrLogoWithTitle size="lg" />
|
||||||
<Stack gap={6} align="center">
|
<Stack gap={6} align="center">
|
||||||
<Title order={3} fw={400} ta="center">
|
<Title order={3} fw={400} ta="center">
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import type { ChangeEvent } from "react";
|
|
||||||
import React, { useMemo, useState } from "react";
|
|
||||||
import { Flex, Group, Menu, ScrollArea, Text, TextInput } from "@mantine/core";
|
|
||||||
import { IconSearch } from "@tabler/icons-react";
|
|
||||||
|
|
||||||
import { getIntegrationName, integrationKinds } from "@homarr/definitions";
|
|
||||||
import { useI18n } from "@homarr/translation/client";
|
|
||||||
import { IntegrationAvatar, Link } from "@homarr/ui";
|
|
||||||
|
|
||||||
interface IntegrationCreateDropdownContentProps {
|
|
||||||
enableMockIntegration: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const IntegrationCreateDropdownContent = ({ enableMockIntegration }: IntegrationCreateDropdownContentProps) => {
|
|
||||||
const t = useI18n();
|
|
||||||
const [search, setSearch] = useState("");
|
|
||||||
|
|
||||||
const filteredKinds = useMemo(() => {
|
|
||||||
return integrationKinds
|
|
||||||
.filter((kind) => enableMockIntegration || kind !== "mock")
|
|
||||||
.filter((kind) => getIntegrationName(kind).toLowerCase().includes(search.toLowerCase().trim()))
|
|
||||||
.sort((kindA, kindB) => getIntegrationName(kindA).localeCompare(getIntegrationName(kindB)));
|
|
||||||
}, [search, enableMockIntegration]);
|
|
||||||
|
|
||||||
const handleSearch = React.useCallback(
|
|
||||||
(event: ChangeEvent<HTMLInputElement>) => setSearch(event.target.value),
|
|
||||||
[setSearch],
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Flex direction={{ base: "column-reverse", md: "column" }} gap="sm">
|
|
||||||
<TextInput
|
|
||||||
leftSection={<IconSearch stroke={1.5} size={20} />}
|
|
||||||
placeholder={t("integration.page.list.search")}
|
|
||||||
value={search}
|
|
||||||
data-autofocus
|
|
||||||
onChange={handleSearch}
|
|
||||||
variant="filled"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{filteredKinds.length > 0 ? (
|
|
||||||
<ScrollArea.Autosize mah={384}>
|
|
||||||
{filteredKinds.map((kind) => (
|
|
||||||
<Menu.Item component={Link} href={`/manage/integrations/new?kind=${kind}`} key={kind}>
|
|
||||||
<Group>
|
|
||||||
<IntegrationAvatar kind={kind} size="sm" />
|
|
||||||
<Text size="sm">{getIntegrationName(kind)}</Text>
|
|
||||||
</Group>
|
|
||||||
</Menu.Item>
|
|
||||||
))}
|
|
||||||
</ScrollArea.Autosize>
|
|
||||||
) : (
|
|
||||||
<Menu.Item disabled>{t("common.noResults")}</Menu.Item>
|
|
||||||
)}
|
|
||||||
</Flex>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
|
||||||
|
import type { IntegrationKind } from "@homarr/definitions";
|
||||||
|
|
||||||
|
import { NewIntegrationForm } from "./_integration-new-form";
|
||||||
|
|
||||||
|
interface IntegrationNewFormWrapperProps {
|
||||||
|
kind: IntegrationKind;
|
||||||
|
initialUrl?: string;
|
||||||
|
initialName?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const IntegrationNewFormWrapper = ({ kind, initialUrl, initialName }: IntegrationNewFormWrapperProps) => {
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<NewIntegrationForm
|
||||||
|
kind={kind}
|
||||||
|
initialUrl={initialUrl}
|
||||||
|
initialName={initialName}
|
||||||
|
onSuccess={() => router.push("/manage/integrations")}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { startTransition, useState } from "react";
|
import { startTransition, useState } from "react";
|
||||||
import { useRouter } from "next/navigation";
|
|
||||||
import {
|
import {
|
||||||
Alert,
|
Alert,
|
||||||
|
Anchor,
|
||||||
Button,
|
Button,
|
||||||
Checkbox,
|
Checkbox,
|
||||||
Collapse,
|
Collapse,
|
||||||
@@ -16,7 +16,7 @@ import {
|
|||||||
Text,
|
Text,
|
||||||
TextInput,
|
TextInput,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { IconCheck, IconInfoCircle } from "@tabler/icons-react";
|
import { IconCheck, IconExternalLink, IconInfoCircle, IconKey } from "@tabler/icons-react";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
@@ -27,6 +27,7 @@ import type { IntegrationKind } from "@homarr/definitions";
|
|||||||
import {
|
import {
|
||||||
getAllSecretKindOptions,
|
getAllSecretKindOptions,
|
||||||
getIconUrl,
|
getIconUrl,
|
||||||
|
getIntegrationApiKeyUrl,
|
||||||
getIntegrationDefaultUrl,
|
getIntegrationDefaultUrl,
|
||||||
getIntegrationName,
|
getIntegrationName,
|
||||||
integrationDefs,
|
integrationDefs,
|
||||||
@@ -45,9 +46,13 @@ import { IntegrationTestConnectionError } from "../_components/test-connection/i
|
|||||||
import type { AnyMappedTestConnectionError } from "../_components/test-connection/types";
|
import type { AnyMappedTestConnectionError } from "../_components/test-connection/types";
|
||||||
|
|
||||||
interface NewIntegrationFormProps {
|
interface NewIntegrationFormProps {
|
||||||
searchParams: Partial<z.infer<typeof integrationCreateSchema>> & {
|
kind: IntegrationKind;
|
||||||
kind: IntegrationKind;
|
initialUrl?: string;
|
||||||
};
|
initialName?: string;
|
||||||
|
onSuccess: () => void;
|
||||||
|
onCancel?: () => void;
|
||||||
|
onSkip?: () => void;
|
||||||
|
isOnboarding?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const formSchema = integrationCreateSchema.omit({ kind: true, app: true }).and(
|
const formSchema = integrationCreateSchema.omit({ kind: true, app: true }).and(
|
||||||
@@ -58,39 +63,48 @@ const formSchema = integrationCreateSchema.omit({ kind: true, app: true }).and(
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) => {
|
export const NewIntegrationForm = ({
|
||||||
|
kind,
|
||||||
|
initialUrl,
|
||||||
|
initialName,
|
||||||
|
onSuccess,
|
||||||
|
onCancel,
|
||||||
|
onSkip,
|
||||||
|
isOnboarding = false,
|
||||||
|
}: NewIntegrationFormProps) => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const secretKinds = getAllSecretKindOptions(searchParams.kind);
|
const secretKinds = getAllSecretKindOptions(kind);
|
||||||
const hasUrlSecret = secretKinds.some((kinds) => kinds.includes("url"));
|
const hasUrlSecret = secretKinds.some((kinds) => kinds.includes("url"));
|
||||||
const router = useRouter();
|
|
||||||
const { data: session } = useSession();
|
const { data: session } = useSession();
|
||||||
const canCreateApps = session?.user.permissions.includes("app-create") ?? false;
|
const canCreateApps = !isOnboarding && (session?.user.permissions.includes("app-create") ?? false);
|
||||||
|
|
||||||
let url = searchParams.url ?? getIntegrationDefaultUrl(searchParams.kind) ?? "";
|
let url = initialUrl ?? getIntegrationDefaultUrl(kind) ?? "";
|
||||||
if (hasUrlSecret) {
|
if (hasUrlSecret) {
|
||||||
// Placeholder Url, replaced with origin of the secret Url on submit
|
|
||||||
url = "http://localhost";
|
url = "http://localhost";
|
||||||
}
|
}
|
||||||
const form = useZodForm(formSchema, {
|
const form = useZodForm(formSchema, {
|
||||||
initialValues: {
|
initialValues: {
|
||||||
name: searchParams.name ?? getIntegrationName(searchParams.kind),
|
name: initialName ?? getIntegrationName(kind),
|
||||||
url,
|
url,
|
||||||
secrets: secretKinds[0].map((kind) => ({
|
secrets: secretKinds[0].map((kind) => ({
|
||||||
kind,
|
kind,
|
||||||
value: "",
|
value: "",
|
||||||
})),
|
})),
|
||||||
attemptSearchEngineCreation: true,
|
attemptSearchEngineCreation: !isOnboarding,
|
||||||
hasApp: false,
|
hasApp: !isOnboarding,
|
||||||
appHref: url,
|
appHref: isOnboarding ? null : url,
|
||||||
appId: null,
|
appId: null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const { mutateAsync: createIntegrationAsync, isPending } = clientApi.integration.create.useMutation({
|
const { mutateAsync: createIntegrationAsync, isPending: isCreatePending } = clientApi.integration.create.useMutation({
|
||||||
async onSuccess() {
|
async onSuccess() {
|
||||||
await revalidatePathActionAsync("/manage/integrations");
|
await revalidatePathActionAsync("/manage/integrations");
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
const { mutateAsync: createOnboardingIntegrationAsync, isPending: isOnboardingCreatePending } =
|
||||||
|
clientApi.onboard.createIntegration.useMutation();
|
||||||
|
const isPending = isCreatePending || isOnboardingCreatePending;
|
||||||
const [error, setError] = useState<null | AnyMappedTestConnectionError>(null);
|
const [error, setError] = useState<null | AnyMappedTestConnectionError>(null);
|
||||||
|
|
||||||
const handleSubmitAsync = async ({ appId, appHref, hasApp, ...values }: FormType) => {
|
const handleSubmitAsync = async ({ appId, appHref, hasApp, ...values }: FormType) => {
|
||||||
@@ -98,6 +112,39 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
|
|||||||
? new URL(values.secrets.find((secret) => secret.kind === "url")?.value ?? values.url).origin
|
? new URL(values.secrets.find((secret) => secret.kind === "url")?.value ?? values.url).origin
|
||||||
: values.url;
|
: values.url;
|
||||||
|
|
||||||
|
const onMutationSuccess = (data: { error?: AnyMappedTestConnectionError } | undefined | void) => {
|
||||||
|
if (data && "error" in data && data.error) {
|
||||||
|
setError(data.error);
|
||||||
|
showErrorNotification({
|
||||||
|
title: t("integration.page.create.notification.error.title"),
|
||||||
|
message: t("integration.page.create.notification.error.message"),
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
showSuccessNotification({
|
||||||
|
title: t("integration.page.create.notification.success.title"),
|
||||||
|
message: t("integration.page.create.notification.success.message"),
|
||||||
|
});
|
||||||
|
|
||||||
|
onSuccess();
|
||||||
|
};
|
||||||
|
|
||||||
|
const onMutationError = () => {
|
||||||
|
showErrorNotification({
|
||||||
|
title: t("integration.page.create.notification.error.title"),
|
||||||
|
message: t("integration.page.create.notification.error.message"),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isOnboarding) {
|
||||||
|
await createOnboardingIntegrationAsync(
|
||||||
|
{ kind, name: values.name, url, secrets: values.secrets },
|
||||||
|
{ onSuccess: onMutationSuccess, onError: onMutationError },
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const hasCustomHref = appHref !== null && appHref.trim().length >= 1;
|
const hasCustomHref = appHref !== null && appHref.trim().length >= 1;
|
||||||
|
|
||||||
const app = hasApp
|
const app = hasApp
|
||||||
@@ -106,49 +153,19 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
|
|||||||
: {
|
: {
|
||||||
name: values.name,
|
name: values.name,
|
||||||
href: hasCustomHref ? appHref : url,
|
href: hasCustomHref ? appHref : url,
|
||||||
iconUrl: getIconUrl(searchParams.kind),
|
iconUrl: getIconUrl(kind),
|
||||||
description: null,
|
description: null,
|
||||||
pingUrl: url,
|
pingUrl: url,
|
||||||
}
|
}
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
await createIntegrationAsync(
|
await createIntegrationAsync(
|
||||||
{
|
{ kind, ...values, url, app },
|
||||||
kind: searchParams.kind,
|
{ onSuccess: onMutationSuccess, onError: onMutationError },
|
||||||
...values,
|
|
||||||
url,
|
|
||||||
app,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
onSuccess(data) {
|
|
||||||
// We do it this way as we are unable to send a typesafe error through onError
|
|
||||||
if (data?.error) {
|
|
||||||
setError(data.error);
|
|
||||||
showErrorNotification({
|
|
||||||
title: t("integration.page.create.notification.error.title"),
|
|
||||||
message: t("integration.page.create.notification.error.message"),
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
showSuccessNotification({
|
|
||||||
title: t("integration.page.create.notification.success.title"),
|
|
||||||
message: t("integration.page.create.notification.success.message"),
|
|
||||||
});
|
|
||||||
|
|
||||||
router.push("/manage/integrations");
|
|
||||||
},
|
|
||||||
onError: () => {
|
|
||||||
showErrorNotification({
|
|
||||||
title: t("integration.page.create.notification.error.title"),
|
|
||||||
message: t("integration.page.create.notification.error.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const integrationCategories = integrationDefs[searchParams.kind].category.flat();
|
const integrationCategories = integrationDefs[kind].category.flat();
|
||||||
const supportsSearchEngine =
|
const supportsSearchEngine =
|
||||||
integrationCategories.includes("search") && !integrationCategories.includes("mediaSearch");
|
integrationCategories.includes("search") && !integrationCategories.includes("mediaSearch");
|
||||||
|
|
||||||
@@ -177,27 +194,39 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
|
|||||||
<Text c={"blue"}>{t("integration.secrets.noSecretsRequired.text")}</Text>
|
<Text c={"blue"}>{t("integration.secrets.noSecretsRequired.text")}</Text>
|
||||||
</Alert>
|
</Alert>
|
||||||
)}
|
)}
|
||||||
|
<ApiKeySettingsLink kind={kind} url={form.values.url} />
|
||||||
</Stack>
|
</Stack>
|
||||||
</Fieldset>
|
</Fieldset>
|
||||||
|
|
||||||
{error !== null && <IntegrationTestConnectionError error={error} url={form.values.url} />}
|
{error !== null && <IntegrationTestConnectionError error={error} url={form.values.url} />}
|
||||||
|
|
||||||
{supportsSearchEngine && (
|
{!isOnboarding && supportsSearchEngine && (
|
||||||
<Checkbox
|
<Checkbox
|
||||||
label={t("integration.field.attemptSearchEngineCreation.label")}
|
label={t("integration.field.attemptSearchEngineCreation.label")}
|
||||||
description={t("integration.field.attemptSearchEngineCreation.description", {
|
description={t("integration.field.attemptSearchEngineCreation.description", {
|
||||||
kind: getIntegrationName(searchParams.kind),
|
kind: getIntegrationName(kind),
|
||||||
})}
|
})}
|
||||||
{...form.getInputProps("attemptSearchEngineCreation", { type: "checkbox" })}
|
{...form.getInputProps("attemptSearchEngineCreation", { type: "checkbox" })}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<AppForm form={form} canCreateApps={canCreateApps} />
|
{!isOnboarding && <AppForm form={form} canCreateApps={canCreateApps} />}
|
||||||
|
|
||||||
<Group justify="end" align="center">
|
<Group justify="end" align="center">
|
||||||
<Button variant="default" component={Link} href="/manage/integrations">
|
{onCancel ? (
|
||||||
{t("common.action.backToOverview")}
|
<Button variant="default" onClick={onCancel}>
|
||||||
</Button>
|
{t("common.action.backToOverview")}
|
||||||
|
</Button>
|
||||||
|
) : (
|
||||||
|
<Button variant="default" component={Link} href="/manage/integrations">
|
||||||
|
{t("common.action.backToOverview")}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
{onSkip && (
|
||||||
|
<Button variant="default" onClick={onSkip}>
|
||||||
|
{t("common.action.skip")}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
<Button type="submit" loading={isPending}>
|
<Button type="submit" loading={isPending}>
|
||||||
{t("integration.testConnection.action.create")}
|
{t("integration.testConnection.action.create")}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -268,6 +297,40 @@ const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; c
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const normalizeUrl = (raw: string): string | null => {
|
||||||
|
try {
|
||||||
|
return new URL(raw).href;
|
||||||
|
} catch {
|
||||||
|
// Bare IP / hostname — prepend http:// and retry
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return new URL(`http://${raw}`).href;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const ApiKeySettingsLink = ({ kind, url }: { kind: IntegrationKind; url: string }) => {
|
||||||
|
const t = useI18n();
|
||||||
|
const apiKeyUrl = getIntegrationApiKeyUrl(url, kind);
|
||||||
|
if (!apiKeyUrl) return null;
|
||||||
|
|
||||||
|
const resolved = normalizeUrl(url);
|
||||||
|
if (!resolved) return null;
|
||||||
|
|
||||||
|
const fullApiKeyUrl = getIntegrationApiKeyUrl(resolved, kind);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Anchor href={fullApiKeyUrl ?? apiKeyUrl} target="_blank" rel="noopener noreferrer" size="sm">
|
||||||
|
<Group gap={4}>
|
||||||
|
<IconKey size={14} stroke={1.5} />
|
||||||
|
<Text size="sm">{t("integration.field.apiKeySettings.label")}</Text>
|
||||||
|
<IconExternalLink size={14} stroke={1.5} />
|
||||||
|
</Group>
|
||||||
|
</Anchor>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
type IntegrationAppSelectProps = Modify<
|
type IntegrationAppSelectProps = Modify<
|
||||||
GetInputPropsReturnType,
|
GetInputPropsReturnType,
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
|
||||||
|
import type { IntegrationKind } from "@homarr/definitions";
|
||||||
|
|
||||||
|
import { IntegrationSelectGrid } from "~/components/integration/integration-select-grid";
|
||||||
|
|
||||||
|
interface IntegrationNewSelectGridProps {
|
||||||
|
enableMockIntegration: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const IntegrationNewSelectGrid = ({ enableMockIntegration }: IntegrationNewSelectGridProps) => {
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
const handleSelect = (kind: IntegrationKind) => {
|
||||||
|
router.push(`/manage/integrations/new?kind=${kind}`);
|
||||||
|
};
|
||||||
|
|
||||||
|
return <IntegrationSelectGrid onSelect={handleSelect} enableMockIntegration={enableMockIntegration} />;
|
||||||
|
};
|
||||||
@@ -3,21 +3,21 @@ import { Container, Group, Stack, Title } from "@mantine/core";
|
|||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import type { IntegrationKind } from "@homarr/definitions";
|
|
||||||
import { getIntegrationName, integrationKinds } from "@homarr/definitions";
|
import { getIntegrationName, integrationKinds } from "@homarr/definitions";
|
||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
import { IntegrationAvatar } from "@homarr/ui";
|
import { IntegrationAvatar } from "@homarr/ui";
|
||||||
import type { integrationCreateSchema } from "@homarr/validation/integration";
|
|
||||||
|
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
||||||
import { NewIntegrationForm } from "./_integration-new-form";
|
import { env } from "~/env";
|
||||||
|
import { IntegrationNewFormWrapper } from "./_integration-new-form-wrapper";
|
||||||
|
import { IntegrationNewSelectGrid } from "./_integration-new-select-grid";
|
||||||
|
|
||||||
interface NewIntegrationPageProps {
|
interface NewIntegrationPageProps {
|
||||||
searchParams: Promise<
|
searchParams: Promise<{
|
||||||
Partial<z.infer<typeof integrationCreateSchema>> & {
|
kind?: string;
|
||||||
kind: IntegrationKind;
|
url?: string;
|
||||||
}
|
name?: string;
|
||||||
>;
|
}>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function IntegrationsNewPage(props: NewIntegrationPageProps) {
|
export default async function IntegrationsNewPage(props: NewIntegrationPageProps) {
|
||||||
@@ -28,8 +28,20 @@ export default async function IntegrationsNewPage(props: NewIntegrationPageProps
|
|||||||
}
|
}
|
||||||
|
|
||||||
const result = z.enum(integrationKinds).safeParse(searchParams.kind);
|
const result = z.enum(integrationKinds).safeParse(searchParams.kind);
|
||||||
|
|
||||||
if (!result.success) {
|
if (!result.success) {
|
||||||
notFound();
|
const t = await getScopedI18n("integration");
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<DynamicBreadcrumb />
|
||||||
|
<Container>
|
||||||
|
<Stack>
|
||||||
|
<Title>{t("action.create")}</Title>
|
||||||
|
<IntegrationNewSelectGrid enableMockIntegration={env.UNSAFE_ENABLE_MOCK_INTEGRATION} />
|
||||||
|
</Stack>
|
||||||
|
</Container>
|
||||||
|
</>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const tCreate = await getScopedI18n("integration.page.create");
|
const tCreate = await getScopedI18n("integration.page.create");
|
||||||
@@ -45,7 +57,7 @@ export default async function IntegrationsNewPage(props: NewIntegrationPageProps
|
|||||||
<IntegrationAvatar kind={currentKind} size="md" />
|
<IntegrationAvatar kind={currentKind} size="md" />
|
||||||
<Title>{tCreate("title", { name: getIntegrationName(currentKind) })}</Title>
|
<Title>{tCreate("title", { name: getIntegrationName(currentKind) })}</Title>
|
||||||
</Group>
|
</Group>
|
||||||
<NewIntegrationForm searchParams={searchParams} />
|
<IntegrationNewFormWrapper kind={currentKind} initialUrl={searchParams.url} initialName={searchParams.name} />
|
||||||
</Stack>
|
</Stack>
|
||||||
</Container>
|
</Container>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { Fragment } from "react";
|
import { Fragment } from "react";
|
||||||
import type { PropsWithChildren } from "react";
|
|
||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
import {
|
import {
|
||||||
AccordionControl,
|
AccordionControl,
|
||||||
@@ -8,12 +7,8 @@ import {
|
|||||||
ActionIcon,
|
ActionIcon,
|
||||||
ActionIconGroup,
|
ActionIconGroup,
|
||||||
Anchor,
|
Anchor,
|
||||||
Button,
|
|
||||||
Divider,
|
Divider,
|
||||||
Group,
|
Group,
|
||||||
Menu,
|
|
||||||
MenuDropdown,
|
|
||||||
MenuTarget,
|
|
||||||
Stack,
|
Stack,
|
||||||
Table,
|
Table,
|
||||||
TableTbody,
|
TableTbody,
|
||||||
@@ -23,7 +18,7 @@ import {
|
|||||||
TableTr,
|
TableTr,
|
||||||
Text,
|
Text,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { IconChevronDown, IconPencil, IconPlugX } from "@tabler/icons-react";
|
import { IconPencil, IconPlugX } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
@@ -34,13 +29,11 @@ import { getIntegrationName } from "@homarr/definitions";
|
|||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
import { CountBadge, IntegrationAvatar, Link } from "@homarr/ui";
|
import { CountBadge, IntegrationAvatar, Link } from "@homarr/ui";
|
||||||
|
|
||||||
import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
|
|
||||||
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
|
import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
||||||
import { NoResults } from "~/components/no-results";
|
import { NoResults } from "~/components/no-results";
|
||||||
import { env } from "~/env";
|
|
||||||
import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
|
import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
|
||||||
import { DeleteIntegrationActionButton } from "./_integration-buttons";
|
import { DeleteIntegrationActionButton } from "./_integration-buttons";
|
||||||
import { IntegrationCreateDropdownContent } from "./new/_integration-new-dropdown";
|
|
||||||
import classes from "./page.module.css";
|
import classes from "./page.module.css";
|
||||||
|
|
||||||
interface IntegrationsPageProps {
|
interface IntegrationsPageProps {
|
||||||
@@ -67,13 +60,9 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
|
|||||||
title={t("page.list.title")}
|
title={t("page.list.title")}
|
||||||
primaryAction={
|
primaryAction={
|
||||||
canCreateIntegrations ? (
|
canCreateIntegrations ? (
|
||||||
<ManageMobilePrimaryAction>
|
<MobileAffixButton component={Link} href="/manage/integrations/new">
|
||||||
<IntegrationSelectMenu>
|
{t("action.create")}
|
||||||
<MenuTarget>
|
</MobileAffixButton>
|
||||||
<Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
|
|
||||||
</MenuTarget>
|
|
||||||
</IntegrationSelectMenu>
|
|
||||||
</ManageMobilePrimaryAction>
|
|
||||||
) : undefined
|
) : undefined
|
||||||
}
|
}
|
||||||
floatingPrimaryAction={canCreateIntegrations}
|
floatingPrimaryAction={canCreateIntegrations}
|
||||||
@@ -83,25 +72,6 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const IntegrationSelectMenu = ({ children }: PropsWithChildren) => {
|
|
||||||
return (
|
|
||||||
<Menu
|
|
||||||
width={256}
|
|
||||||
trapFocus
|
|
||||||
position="bottom-end"
|
|
||||||
withinPortal
|
|
||||||
shadow="md"
|
|
||||||
keepMounted={false}
|
|
||||||
withInitialFocusPlaceholder={false}
|
|
||||||
>
|
|
||||||
{children}
|
|
||||||
<MenuDropdown>
|
|
||||||
<IntegrationCreateDropdownContent enableMockIntegration={env.UNSAFE_ENABLE_MOCK_INTEGRATION || env.DEMO_MODE} />
|
|
||||||
</MenuDropdown>
|
|
||||||
</Menu>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
interface IntegrationListProps {
|
interface IntegrationListProps {
|
||||||
integrations: RouterOutputs["integration"]["all"];
|
integrations: RouterOutputs["integration"]["all"];
|
||||||
activeTab?: IntegrationKind;
|
activeTab?: IntegrationKind;
|
||||||
@@ -134,12 +104,12 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<ActiveTabAccordion defaultValue={activeTab} radius="lg" classNames={classes}>
|
<ActiveTabAccordion defaultValue={activeTab} radius="lg" classNames={classes}>
|
||||||
{entries.map(([kind, integrations], index) => (
|
{entries.map(([kind, kindIntegrations], index) => (
|
||||||
<AccordionItem key={kind} value={kind} data-first={index === 0} data-last={index === entries.length - 1}>
|
<AccordionItem key={kind} value={kind} data-first={index === 0} data-last={index === entries.length - 1}>
|
||||||
<AccordionControl icon={<IntegrationAvatar size="sm" kind={kind} radius="sm" />}>
|
<AccordionControl icon={<IntegrationAvatar size="sm" kind={kind} radius="sm" />}>
|
||||||
<Group>
|
<Group>
|
||||||
<Text>{getIntegrationName(kind)}</Text>
|
<Text>{getIntegrationName(kind)}</Text>
|
||||||
<CountBadge count={integrations.length} />
|
<CountBadge count={kindIntegrations.length} />
|
||||||
</Group>
|
</Group>
|
||||||
</AccordionControl>
|
</AccordionControl>
|
||||||
<AccordionPanel>
|
<AccordionPanel>
|
||||||
@@ -152,7 +122,7 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
|
|||||||
</TableTr>
|
</TableTr>
|
||||||
</TableThead>
|
</TableThead>
|
||||||
<TableTbody>
|
<TableTbody>
|
||||||
{integrations.map((integration) => (
|
{kindIntegrations.map((integration) => (
|
||||||
<TableTr key={integration.id}>
|
<TableTr key={integration.id}>
|
||||||
<TableTd>{integration.name}</TableTd>
|
<TableTd>{integration.name}</TableTd>
|
||||||
<TableTd>
|
<TableTd>
|
||||||
@@ -173,7 +143,7 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
|
|||||||
>
|
>
|
||||||
<IconPencil size={16} stroke={1.5} />
|
<IconPencil size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
<DeleteIntegrationActionButton integration={integration} count={integrations.length} />
|
<DeleteIntegrationActionButton integration={integration} count={kindIntegrations.length} />
|
||||||
</ActionIconGroup>
|
</ActionIconGroup>
|
||||||
)}
|
)}
|
||||||
</Group>
|
</Group>
|
||||||
@@ -184,9 +154,9 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
|
|||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Stack gap="xs" hiddenFrom="md">
|
<Stack gap="xs" hiddenFrom="md">
|
||||||
{integrations.map((integration, index) => (
|
{kindIntegrations.map((integration, integrationIndex) => (
|
||||||
<Fragment key={integration.id}>
|
<Fragment key={integration.id}>
|
||||||
{index !== 0 && <Divider />}
|
{integrationIndex !== 0 && <Divider />}
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Group justify="space-between" align="center" wrap="nowrap">
|
<Group justify="space-between" align="center" wrap="nowrap">
|
||||||
<Text>{integration.name}</Text>
|
<Text>{integration.name}</Text>
|
||||||
@@ -201,7 +171,7 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
|
|||||||
>
|
>
|
||||||
<IconPencil size={16} stroke={1.5} />
|
<IconPencil size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
<DeleteIntegrationActionButton integration={integration} count={integrations.length} />
|
<DeleteIntegrationActionButton integration={integration} count={kindIntegrations.length} />
|
||||||
</ActionIconGroup>
|
</ActionIconGroup>
|
||||||
)}
|
)}
|
||||||
</Group>
|
</Group>
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Group, Slider, Text } from "@mantine/core";
|
||||||
|
import { IconTextSize } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import { useLogContext } from "./log-context";
|
||||||
|
|
||||||
|
export const LogFontSizeSlider = () => {
|
||||||
|
const { fontSize, setFontSize } = useLogContext();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Group gap="xs" wrap="nowrap" w={160}>
|
||||||
|
<IconTextSize size={18} style={{ flexShrink: 0 }} />
|
||||||
|
<Slider
|
||||||
|
min={10}
|
||||||
|
max={24}
|
||||||
|
step={1}
|
||||||
|
value={fontSize}
|
||||||
|
onChange={setFontSize}
|
||||||
|
label={(val) => `${val}px`}
|
||||||
|
style={{ flex: 1 }}
|
||||||
|
size="xs"
|
||||||
|
/>
|
||||||
|
<Text size="xs" c="dimmed" w={32} ta="right">
|
||||||
|
{fontSize}px
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -6,10 +6,23 @@ import { createContext, useContext, useMemo, useState } from "react";
|
|||||||
import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
|
import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
|
||||||
import { logLevels } from "@homarr/core/infrastructure/logs/constants";
|
import { logLevels } from "@homarr/core/infrastructure/logs/constants";
|
||||||
|
|
||||||
|
const FONT_SIZE_KEY = "homarr-log-font-size";
|
||||||
|
const DEFAULT_FONT_SIZE = 14;
|
||||||
|
|
||||||
|
const readStoredFontSize = () => {
|
||||||
|
if (typeof window === "undefined") return DEFAULT_FONT_SIZE;
|
||||||
|
const stored = localStorage.getItem(FONT_SIZE_KEY);
|
||||||
|
if (!stored) return DEFAULT_FONT_SIZE;
|
||||||
|
const parsed = Number(stored);
|
||||||
|
return Number.isFinite(parsed) ? Math.min(Math.max(parsed, 10), 24) : DEFAULT_FONT_SIZE;
|
||||||
|
};
|
||||||
|
|
||||||
const LogContext = createContext<{
|
const LogContext = createContext<{
|
||||||
level: LogLevel;
|
level: LogLevel;
|
||||||
setLevel: (level: LogLevel) => void;
|
setLevel: (level: LogLevel) => void;
|
||||||
activeLevels: LogLevel[];
|
activeLevels: LogLevel[];
|
||||||
|
fontSize: number;
|
||||||
|
setFontSize: (size: number) => void;
|
||||||
} | null>(null);
|
} | null>(null);
|
||||||
|
|
||||||
interface LogContextProviderProps extends PropsWithChildren {
|
interface LogContextProviderProps extends PropsWithChildren {
|
||||||
@@ -18,9 +31,19 @@ interface LogContextProviderProps extends PropsWithChildren {
|
|||||||
|
|
||||||
export const LogContextProvider = ({ defaultLevel, children }: LogContextProviderProps) => {
|
export const LogContextProvider = ({ defaultLevel, children }: LogContextProviderProps) => {
|
||||||
const [level, setLevel] = useState(defaultLevel);
|
const [level, setLevel] = useState(defaultLevel);
|
||||||
|
const [fontSize, setFontSizeRaw] = useState(readStoredFontSize);
|
||||||
const activeLevels = useMemo(() => logLevels.slice(0, logLevels.indexOf(level) + 1), [level]);
|
const activeLevels = useMemo(() => logLevels.slice(0, logLevels.indexOf(level) + 1), [level]);
|
||||||
|
|
||||||
return <LogContext.Provider value={{ level, setLevel, activeLevels }}>{children}</LogContext.Provider>;
|
const setFontSize = (size: number) => {
|
||||||
|
setFontSizeRaw(size);
|
||||||
|
localStorage.setItem(FONT_SIZE_KEY, String(size));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<LogContext.Provider value={{ level, setLevel, activeLevels, fontSize, setFontSize }}>
|
||||||
|
{children}
|
||||||
|
</LogContext.Provider>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useLogContext = () => {
|
export const useLogContext = () => {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
|||||||
import { fullHeightWithoutHeaderAndFooter } from "~/constants";
|
import { fullHeightWithoutHeaderAndFooter } from "~/constants";
|
||||||
import { createMetaTitle } from "~/metadata";
|
import { createMetaTitle } from "~/metadata";
|
||||||
import { ClientSideTerminalComponent } from "./client";
|
import { ClientSideTerminalComponent } from "./client";
|
||||||
|
import { LogFontSizeSlider } from "./font-size-slider";
|
||||||
import { LogLevelSelection } from "./level-selection";
|
import { LogLevelSelection } from "./level-selection";
|
||||||
import { LogContextProvider } from "./log-context";
|
import { LogContextProvider } from "./log-context";
|
||||||
|
|
||||||
@@ -38,7 +39,10 @@ export default async function LogsManagementPage() {
|
|||||||
<LogContextProvider defaultLevel={logsEnv.LEVEL}>
|
<LogContextProvider defaultLevel={logsEnv.LEVEL}>
|
||||||
<Group justify="space-between" align="center" wrap="nowrap">
|
<Group justify="space-between" align="center" wrap="nowrap">
|
||||||
<DynamicBreadcrumb />
|
<DynamicBreadcrumb />
|
||||||
<LogLevelSelection />
|
<Group gap="md" wrap="nowrap">
|
||||||
|
<LogFontSizeSlider />
|
||||||
|
<LogLevelSelection />
|
||||||
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
<Box style={{ borderRadius: 6 }} h={fullHeightWithoutHeaderAndFooter} p="md" bg="black">
|
<Box style={{ borderRadius: 6 }} h={fullHeightWithoutHeaderAndFooter} p="md" bg="black">
|
||||||
<ClientSideTerminalComponent />
|
<ClientSideTerminalComponent />
|
||||||
|
|||||||
@@ -13,9 +13,11 @@ import classes from "./terminal.module.css";
|
|||||||
|
|
||||||
export const TerminalComponent = () => {
|
export const TerminalComponent = () => {
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
const { activeLevels } = useLogContext();
|
const { activeLevels, fontSize } = useLogContext();
|
||||||
|
|
||||||
const terminalRef = useRef<Terminal>(null);
|
const terminalRef = useRef<Terminal>(null);
|
||||||
|
const fitAddonRef = useRef<FitAddon>(null);
|
||||||
|
|
||||||
clientApi.log.subscribe.useSubscription(
|
clientApi.log.subscribe.useSubscription(
|
||||||
{
|
{
|
||||||
levels: activeLevels,
|
levels: activeLevels,
|
||||||
@@ -26,7 +28,6 @@ export const TerminalComponent = () => {
|
|||||||
terminalRef.current?.refresh(0, terminalRef.current.rows - 1);
|
terminalRef.current?.refresh(0, terminalRef.current.rows - 1);
|
||||||
},
|
},
|
||||||
onError(err) {
|
onError(err) {
|
||||||
// This makes sense as logging might cause an infinite loop
|
|
||||||
alert(err);
|
alert(err);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -43,14 +44,14 @@ export const TerminalComponent = () => {
|
|||||||
cursorBlink: false,
|
cursorBlink: false,
|
||||||
disableStdin: true,
|
disableStdin: true,
|
||||||
convertEol: true,
|
convertEol: true,
|
||||||
|
fontSize,
|
||||||
});
|
});
|
||||||
terminalRef.current.open(ref.current);
|
terminalRef.current.open(ref.current);
|
||||||
terminalRef.current.loadAddon(canvasAddon);
|
terminalRef.current.loadAddon(canvasAddon);
|
||||||
|
|
||||||
// This is a hack to make sure the terminal is rendered before we try to fit it
|
|
||||||
// You can blame @Meierschlumpf for this
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const fitAddon = new FitAddon();
|
const fitAddon = new FitAddon();
|
||||||
|
fitAddonRef.current = fitAddon;
|
||||||
terminalRef.current?.loadAddon(fitAddon);
|
terminalRef.current?.loadAddon(fitAddon);
|
||||||
fitAddon.fit();
|
fitAddon.fit();
|
||||||
});
|
});
|
||||||
@@ -60,5 +61,12 @@ export const TerminalComponent = () => {
|
|||||||
canvasAddon.dispose();
|
canvasAddon.dispose();
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!terminalRef.current) return;
|
||||||
|
terminalRef.current.options.fontSize = fontSize;
|
||||||
|
fitAddonRef.current?.fit();
|
||||||
|
}, [fontSize]);
|
||||||
|
|
||||||
return <Box ref={ref} id="terminal" className={classes.outerTerminal} h="100%"></Box>;
|
return <Box ref={ref} id="terminal" className={classes.outerTerminal} h="100%"></Box>;
|
||||||
};
|
};
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
import { useCallback, useRef } from "react";
|
import { useCallback, useRef } from "react";
|
||||||
import { Button, Grid, Group, NumberInput, Stack } from "@mantine/core";
|
import { Grid, NumberInput, Stack } from "@mantine/core";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { useZodForm } from "@homarr/form";
|
import { useZodForm } from "@homarr/form";
|
||||||
import type { GridStack } from "@homarr/gridstack";
|
import type { GridStack } from "@homarr/gridstack";
|
||||||
import { createModal } from "@homarr/modals";
|
import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
|
||||||
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
import type { Item, SectionItem } from "~/app/[locale]/boards/_types";
|
import type { Item, SectionItem } from "~/app/[locale]/boards/_types";
|
||||||
|
|
||||||
@@ -16,9 +16,7 @@ interface InnerProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) => {
|
export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) => {
|
||||||
const tCommon = useScopedI18n("common");
|
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
// Keep track of the maximum width based on the x offset
|
|
||||||
const maxWidthRef = useRef(innerProps.columnCount - innerProps.item.xOffset);
|
const maxWidthRef = useRef(innerProps.columnCount - innerProps.item.xOffset);
|
||||||
const form = useZodForm(
|
const form = useZodForm(
|
||||||
z.object({
|
z.object({
|
||||||
@@ -38,7 +36,6 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
|
|||||||
height: innerProps.item.height,
|
height: innerProps.item.height,
|
||||||
},
|
},
|
||||||
onValuesChange(values, previous) {
|
onValuesChange(values, previous) {
|
||||||
// Update the maximum width when the x offset changes
|
|
||||||
if (values.xOffset !== previous.xOffset) {
|
if (values.xOffset !== previous.xOffset) {
|
||||||
maxWidthRef.current = innerProps.columnCount - values.xOffset;
|
maxWidthRef.current = innerProps.columnCount - values.xOffset;
|
||||||
}
|
}
|
||||||
@@ -70,6 +67,7 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
|
|||||||
<Grid.Col span={{ base: 12, md: 6 }}>
|
<Grid.Col span={{ base: 12, md: 6 }}>
|
||||||
<NumberInput
|
<NumberInput
|
||||||
label={t("item.moveResize.field.xOffset.label")}
|
label={t("item.moveResize.field.xOffset.label")}
|
||||||
|
data-autofocus
|
||||||
min={0}
|
min={0}
|
||||||
max={innerProps.columnCount - 1}
|
max={innerProps.columnCount - 1}
|
||||||
{...form.getInputProps("xOffset")}
|
{...form.getInputProps("xOffset")}
|
||||||
@@ -93,12 +91,7 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
|
|||||||
<NumberInput label={t("item.moveResize.field.height.label")} min={1} {...form.getInputProps("height")} />
|
<NumberInput label={t("item.moveResize.field.height.label")} min={1} {...form.getInputProps("height")} />
|
||||||
</Grid.Col>
|
</Grid.Col>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Group justify="end">
|
<ModalFormFooter onCancel={actions.closeModal} />
|
||||||
<Button variant="subtle" onClick={actions.closeModal}>
|
|
||||||
{tCommon("action.cancel")}
|
|
||||||
</Button>
|
|
||||||
<Button type="submit">{tCommon("action.saveChanges")}</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
@@ -106,5 +99,5 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
|
|||||||
defaultTitle(t) {
|
defaultTitle(t) {
|
||||||
return t("item.moveResize.title");
|
return t("item.moveResize.title");
|
||||||
},
|
},
|
||||||
size: "lg",
|
size: modalSizeForm,
|
||||||
});
|
});
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
import { useMemo, useState } from "react";
|
import { useMemo, useState } from "react";
|
||||||
import { Avatar, Button, Card, Center, Grid, Group, Input, Stack, Text, Tooltip } from "@mantine/core";
|
import { Avatar, Box, Button, Card, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
|
||||||
import { IconSearch } from "@tabler/icons-react";
|
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { createId, objectEntries } from "@homarr/common";
|
import { createId, objectEntries } from "@homarr/common";
|
||||||
import { getIconUrl, getIntegrationName } from "@homarr/definitions";
|
import { getIconUrl, getIntegrationName } from "@homarr/definitions";
|
||||||
import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
|
import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
|
||||||
import { createModal, useModalAction } from "@homarr/modals";
|
import { createModal, modalSizeSelect, useModalAction } from "@homarr/modals";
|
||||||
import { useSettings } from "@homarr/settings";
|
import { useSettings } from "@homarr/settings";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
import { SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
|
||||||
import type { TablerIcon } from "@homarr/ui";
|
import type { TablerIcon } from "@homarr/ui";
|
||||||
import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
|
import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
|
||||||
import { WidgetEditModal } from "@homarr/widgets/modals";
|
import { WidgetEditModal } from "@homarr/widgets/modals";
|
||||||
@@ -86,32 +86,31 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack>
|
<SelectGridLayout
|
||||||
<Input
|
search={search}
|
||||||
value={search}
|
onSearchChange={setSearch}
|
||||||
onChange={(event) => setSearch(event.currentTarget.value)}
|
placeholder={`${t("item.create.search")}...`}
|
||||||
leftSection={<IconSearch />}
|
onSearchKeyDown={(event) => {
|
||||||
placeholder={`${t("item.create.search")}...`}
|
if (event.key === "Enter" && filteredItems.length === 1) {
|
||||||
data-autofocus
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
onKeyDown={(event) => {
|
handleAdd(filteredItems[0]!.kind);
|
||||||
// Add item if there is only one item in the list and user presses Enter
|
}
|
||||||
if (event.key === "Enter" && filteredItems.length === 1) {
|
}}
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
>
|
||||||
handleAdd(filteredItems[0]!.kind);
|
{filteredItems.map((item) => (
|
||||||
}
|
<WidgetItem key={item.kind} item={item} onSelect={() => handleAdd(item.kind)} />
|
||||||
}}
|
))}
|
||||||
/>
|
|
||||||
|
|
||||||
<Grid>
|
{filteredItems.length === 0 && (
|
||||||
{filteredItems.map((item) => (
|
<Center p="xl">
|
||||||
<WidgetItem key={item.kind} item={item} onSelect={() => handleAdd(item.kind)} />
|
<Text c="dimmed">{t("common.noResults")}</Text>
|
||||||
))}
|
</Center>
|
||||||
</Grid>
|
)}
|
||||||
</Stack>
|
</SelectGridLayout>
|
||||||
);
|
);
|
||||||
}).withOptions({
|
}).withOptions({
|
||||||
defaultTitle: (t) => t("item.create.title"),
|
defaultTitle: (t) => t("item.create.title"),
|
||||||
size: "xl",
|
size: modalSizeSelect,
|
||||||
});
|
});
|
||||||
|
|
||||||
const WidgetItem = ({
|
const WidgetItem = ({
|
||||||
@@ -130,46 +129,58 @@ const WidgetItem = ({
|
|||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Grid.Col span={{ xs: 12, sm: 4, md: 3 }}>
|
<Card
|
||||||
<Card h="100%">
|
h={selectGridCardHeight}
|
||||||
<Stack justify="space-between" h="100%">
|
withBorder
|
||||||
<Stack gap="xs">
|
pos="relative"
|
||||||
<Center>
|
style={{ overflow: "hidden", "--_hover-opacity": "0" }}
|
||||||
<item.icon />
|
onMouseEnter={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "1")}
|
||||||
</Center>
|
onMouseLeave={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "0")}
|
||||||
<Text lh={1.2} style={{ whiteSpace: "normal" }} ta="center">
|
>
|
||||||
{item.name}
|
<Stack h="100%" gap="xs">
|
||||||
</Text>
|
<Group gap="sm" wrap="nowrap" align="flex-start">
|
||||||
<Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" ta="center" c="dimmed">
|
<item.icon size={22} style={{ flexShrink: 0, marginTop: 2 }} />
|
||||||
{item.description}
|
<Text lh={1.2} style={{ whiteSpace: "normal" }} fw={500} size="sm" lineClamp={2}>
|
||||||
</Text>
|
{item.name}
|
||||||
</Stack>
|
</Text>
|
||||||
<SupportedIntegrations mt="auto" integrations={item.supportedIntegrations} />
|
</Group>
|
||||||
<Button onClick={onSelect} variant="light" size="xs" fullWidth>
|
<Tooltip label={item.description} multiline w={250} disabled={!item.description}>
|
||||||
{t(`item.create.addToBoard`)}
|
<Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" c="dimmed" lineClamp={1}>
|
||||||
</Button>
|
{item.description}
|
||||||
</Stack>
|
</Text>
|
||||||
</Card>
|
</Tooltip>
|
||||||
</Grid.Col>
|
<SupportedIntegrations integrations={item.supportedIntegrations} />
|
||||||
|
</Stack>
|
||||||
|
<Box
|
||||||
|
pos="absolute"
|
||||||
|
bottom={0}
|
||||||
|
left={0}
|
||||||
|
right={0}
|
||||||
|
p="xs"
|
||||||
|
style={{
|
||||||
|
opacity: "var(--_hover-opacity)",
|
||||||
|
transition: "opacity 150ms ease",
|
||||||
|
background: "linear-gradient(transparent, var(--mantine-color-body) 30%)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button onClick={onSelect} variant="light" size="xs" fullWidth>
|
||||||
|
{t(`item.create.addToBoard`)}
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
</Card>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
interface SupportedIntegrationsProps {
|
const SupportedIntegrations = ({ integrations }: { integrations: IntegrationKind[] }) => {
|
||||||
integrations: IntegrationKind[];
|
|
||||||
mt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
const SupportedIntegrations = ({ integrations, mt }: SupportedIntegrationsProps) => {
|
|
||||||
if (integrations.length === 0) {
|
if (integrations.length === 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// When there are 8 or more integrations, we show 6 and a "+X" avatar. Otherwise, we show all integrations.
|
|
||||||
const countToShow = integrations.length >= 8 ? 6 : 7;
|
const countToShow = integrations.length >= 8 ? 6 : 7;
|
||||||
const moreCount = integrations.length - countToShow;
|
const moreCount = integrations.length - countToShow;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Center mt={mt}>
|
<Group gap={2} mt="auto">
|
||||||
<Tooltip.Group closeDelay={100}>
|
<Tooltip.Group closeDelay={100}>
|
||||||
<Group gap={2}>
|
<Group gap={2}>
|
||||||
{integrations.slice(0, countToShow).map((integration) => (
|
{integrations.slice(0, countToShow).map((integration) => (
|
||||||
@@ -195,6 +206,6 @@ const SupportedIntegrations = ({ integrations, mt }: SupportedIntegrationsProps)
|
|||||||
)}
|
)}
|
||||||
</Group>
|
</Group>
|
||||||
</Tooltip.Group>
|
</Tooltip.Group>
|
||||||
</Center>
|
</Group>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import { Button, Group, Stack, TextInput } from "@mantine/core";
|
import { Stack, TextInput } from "@mantine/core";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { useZodForm } from "@homarr/form";
|
import { useZodForm } from "@homarr/form";
|
||||||
import { createModal } from "@homarr/modals";
|
import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
interface Category {
|
interface Category {
|
||||||
@@ -36,13 +36,10 @@ export const CategoryEditModal = createModal<InnerProps>(({ actions, innerProps
|
|||||||
>
|
>
|
||||||
<Stack>
|
<Stack>
|
||||||
<TextInput label={t("section.category.field.name.label")} data-autofocus {...form.getInputProps("name")} />
|
<TextInput label={t("section.category.field.name.label")} data-autofocus {...form.getInputProps("name")} />
|
||||||
<Group justify="right">
|
<ModalFormFooter onCancel={actions.closeModal} submitLabel={innerProps.submitLabel} />
|
||||||
<Button onClick={actions.closeModal} variant="subtle" color="gray">
|
|
||||||
{t("common.action.cancel")}
|
|
||||||
</Button>
|
|
||||||
<Button type="submit">{innerProps.submitLabel}</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
}).withOptions({});
|
}).withOptions({
|
||||||
|
size: modalSizeForm,
|
||||||
|
});
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Button, CloseButton, ColorInput, Group, Stack, TextInput, useMantineTheme } from "@mantine/core";
|
import { CloseButton, ColorInput, Stack, TextInput, useMantineTheme } from "@mantine/core";
|
||||||
import type { z } from "zod/v4";
|
import type { z } from "zod/v4";
|
||||||
|
|
||||||
import { useZodForm } from "@homarr/form";
|
import { useZodForm } from "@homarr/form";
|
||||||
import { createModal } from "@homarr/modals";
|
import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
import { TextMultiSelect } from "@homarr/ui";
|
import { TextMultiSelect } from "@homarr/ui";
|
||||||
import { dynamicSectionOptionsSchema } from "@homarr/validation/shared";
|
import { dynamicSectionOptionsSchema } from "@homarr/validation/shared";
|
||||||
@@ -31,7 +31,7 @@ export const DynamicSectionEditModal = createModal<ModalProps>(({ actions, inner
|
|||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<Stack>
|
<Stack>
|
||||||
<TextInput label={t("section.dynamic.option.title.label")} {...form.getInputProps("title")} />
|
<TextInput label={t("section.dynamic.option.title.label")} data-autofocus {...form.getInputProps("title")} />
|
||||||
<TextMultiSelect
|
<TextMultiSelect
|
||||||
label={t("section.dynamic.option.customCssClasses.label")}
|
label={t("section.dynamic.option.customCssClasses.label")}
|
||||||
{...form.getInputProps("customCssClasses")}
|
{...form.getInputProps("customCssClasses")}
|
||||||
@@ -48,14 +48,7 @@ export const DynamicSectionEditModal = createModal<ModalProps>(({ actions, inner
|
|||||||
}
|
}
|
||||||
{...form.getInputProps("borderColor")}
|
{...form.getInputProps("borderColor")}
|
||||||
/>
|
/>
|
||||||
<Group justify="end">
|
<ModalFormFooter onCancel={actions.closeModal} />
|
||||||
<Group justify="end" w={{ base: "100%", xs: "auto" }}>
|
|
||||||
<Button onClick={actions.closeModal} variant="subtle" color="gray">
|
|
||||||
{t("common.action.cancel")}
|
|
||||||
</Button>
|
|
||||||
<Button type="submit">{t("common.action.saveChanges")}</Button>
|
|
||||||
</Group>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
@@ -63,5 +56,5 @@ export const DynamicSectionEditModal = createModal<ModalProps>(({ actions, inner
|
|||||||
defaultTitle(t) {
|
defaultTitle(t) {
|
||||||
return t("item.edit.title");
|
return t("item.edit.title");
|
||||||
},
|
},
|
||||||
size: "lg",
|
size: modalSizeForm,
|
||||||
});
|
});
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
import { objectEntries } from "@homarr/common";
|
||||||
|
import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
|
||||||
|
import {
|
||||||
|
featuredIntegrations,
|
||||||
|
getIntegrationName,
|
||||||
|
hiddenFromOnboarding,
|
||||||
|
integrationDefs,
|
||||||
|
integrationKinds,
|
||||||
|
} from "@homarr/definitions";
|
||||||
|
import { widgetImports } from "@homarr/widgets";
|
||||||
|
|
||||||
|
const buildWidgetsByIntegration = () => {
|
||||||
|
const map = Object.fromEntries(integrationKinds.map((kind) => [kind, [] as WidgetKind[]])) as Record<
|
||||||
|
IntegrationKind,
|
||||||
|
WidgetKind[]
|
||||||
|
>;
|
||||||
|
|
||||||
|
for (const [widgetKind, widget] of objectEntries(widgetImports)) {
|
||||||
|
const supported =
|
||||||
|
"supportedIntegrations" in widget.definition
|
||||||
|
? (widget.definition.supportedIntegrations as IntegrationKind[])
|
||||||
|
: [];
|
||||||
|
for (const kind of supported) {
|
||||||
|
if (kind in map) {
|
||||||
|
map[kind].push(widgetKind);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const widgetsByIntegration = buildWidgetsByIntegration();
|
||||||
|
|
||||||
|
export const categoryTranslationKeys: Record<string, string> = {
|
||||||
|
dnsHole: "integration.category.dnsHole",
|
||||||
|
mediaService: "integration.category.mediaService",
|
||||||
|
calendar: "integration.category.calendar",
|
||||||
|
mediaSearch: "integration.category.mediaSearch",
|
||||||
|
mediaRelease: "integration.category.mediaRelease",
|
||||||
|
mediaRequest: "integration.category.mediaRequest",
|
||||||
|
downloadClient: "integration.category.downloadClient",
|
||||||
|
usenet: "integration.category.usenet",
|
||||||
|
torrent: "integration.category.torrent",
|
||||||
|
miscellaneous: "integration.category.miscellaneous",
|
||||||
|
smartHomeServer: "integration.category.smartHomeServer",
|
||||||
|
indexerManager: "integration.category.indexerManager",
|
||||||
|
healthMonitoring: "integration.category.healthMonitoring",
|
||||||
|
search: "integration.category.search",
|
||||||
|
mediaTranscoding: "integration.category.mediaTranscoding",
|
||||||
|
networkController: "integration.category.networkController",
|
||||||
|
releasesProvider: "integration.category.releasesProvider",
|
||||||
|
notifications: "integration.category.notifications",
|
||||||
|
firewall: "integration.category.firewall",
|
||||||
|
timetable: "integration.category.timetable",
|
||||||
|
photoService: "integration.category.photoService",
|
||||||
|
notes: "integration.category.notes",
|
||||||
|
mediaMonitoring: "integration.category.mediaMonitoring",
|
||||||
|
speedtest: "integration.category.speedtest",
|
||||||
|
analytics: "integration.category.analytics",
|
||||||
|
};
|
||||||
|
|
||||||
|
export interface IntegrationGridItem {
|
||||||
|
kind: IntegrationKind;
|
||||||
|
name: string;
|
||||||
|
categories: string[];
|
||||||
|
widgets: WidgetKind[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export const buildSortedIntegrations = (
|
||||||
|
options: { enableMockIntegration?: boolean; onboarding?: boolean } = {},
|
||||||
|
): IntegrationGridItem[] =>
|
||||||
|
integrationKinds
|
||||||
|
.filter((kind) => {
|
||||||
|
if (options.onboarding && hiddenFromOnboarding.has(kind)) return false;
|
||||||
|
if (options.onboarding && widgetsByIntegration[kind].length === 0) return false;
|
||||||
|
if (!options.enableMockIntegration && kind === "mock") return false;
|
||||||
|
return true;
|
||||||
|
})
|
||||||
|
.map((kind) => ({
|
||||||
|
kind,
|
||||||
|
name: getIntegrationName(kind),
|
||||||
|
categories: [...new Set(integrationDefs[kind].category.flat())] as string[],
|
||||||
|
widgets: widgetsByIntegration[kind],
|
||||||
|
}))
|
||||||
|
.sort((left, right) => {
|
||||||
|
const leftIdx = featuredIntegrations.indexOf(left.kind);
|
||||||
|
const rightIdx = featuredIntegrations.indexOf(right.kind);
|
||||||
|
if (leftIdx !== -1 && rightIdx !== -1) return leftIdx - rightIdx;
|
||||||
|
if (leftIdx !== -1) return -1;
|
||||||
|
if (rightIdx !== -1) return 1;
|
||||||
|
return right.widgets.length - left.widgets.length || left.name.localeCompare(right.name);
|
||||||
|
});
|
||||||
|
|
||||||
|
export const filterIntegrations = (items: IntegrationGridItem[], search: string) =>
|
||||||
|
items.filter((i) => i.name.toLowerCase().includes(search.toLowerCase().trim()));
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useMemo, useState } from "react";
|
||||||
|
import { Badge, Card, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
|
||||||
|
import { IconBrandDocker, IconCheck, IconPuzzle } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import type { IntegrationKind } from "@homarr/definitions";
|
||||||
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
import { IntegrationAvatar, SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
|
||||||
|
|
||||||
|
import { buildSortedIntegrations, categoryTranslationKeys, filterIntegrations } from "./integration-grid-shared";
|
||||||
|
|
||||||
|
interface IntegrationMultiSelectGridProps {
|
||||||
|
selectedKinds: IntegrationKind[];
|
||||||
|
onSelectionChange: (kinds: IntegrationKind[]) => void;
|
||||||
|
enableMockIntegration?: boolean;
|
||||||
|
onboarding?: boolean;
|
||||||
|
detectedKinds?: Set<IntegrationKind>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const IntegrationMultiSelectGrid = ({
|
||||||
|
selectedKinds: selectedKindsArray,
|
||||||
|
onSelectionChange,
|
||||||
|
enableMockIntegration = false,
|
||||||
|
onboarding = false,
|
||||||
|
detectedKinds,
|
||||||
|
}: IntegrationMultiSelectGridProps) => {
|
||||||
|
const [search, setSearch] = useState("");
|
||||||
|
const selectedKinds = useMemo(() => new Set(selectedKindsArray), [selectedKindsArray]);
|
||||||
|
const t = useI18n();
|
||||||
|
|
||||||
|
const toggleKind = useCallback(
|
||||||
|
(kind: IntegrationKind) => {
|
||||||
|
const current = new Set(selectedKindsArray);
|
||||||
|
if (current.has(kind)) {
|
||||||
|
current.delete(kind);
|
||||||
|
} else {
|
||||||
|
current.add(kind);
|
||||||
|
}
|
||||||
|
onSelectionChange(Array.from(current));
|
||||||
|
},
|
||||||
|
[selectedKindsArray, onSelectionChange],
|
||||||
|
);
|
||||||
|
|
||||||
|
const integrations = useMemo(
|
||||||
|
() => buildSortedIntegrations({ enableMockIntegration, onboarding }),
|
||||||
|
[enableMockIntegration, onboarding],
|
||||||
|
);
|
||||||
|
|
||||||
|
const sorted = useMemo(() => {
|
||||||
|
if (!detectedKinds || detectedKinds.size === 0) return integrations;
|
||||||
|
const detected = integrations.filter((i) => detectedKinds.has(i.kind));
|
||||||
|
const rest = integrations.filter((i) => !detectedKinds.has(i.kind));
|
||||||
|
return [...detected, ...rest];
|
||||||
|
}, [integrations, detectedKinds]);
|
||||||
|
|
||||||
|
const filtered = useMemo(() => filterIntegrations(sorted, search), [sorted, search]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SelectGridLayout
|
||||||
|
search={search}
|
||||||
|
onSearchChange={setSearch}
|
||||||
|
placeholder={`${t("integration.page.list.search")}...`}
|
||||||
|
disableScroll={onboarding}
|
||||||
|
disableAutoFocus={onboarding}
|
||||||
|
>
|
||||||
|
{filtered.map((integration) => {
|
||||||
|
const isSelected = selectedKinds.has(integration.kind);
|
||||||
|
const isDetected = detectedKinds?.has(integration.kind) ?? false;
|
||||||
|
return (
|
||||||
|
<Card
|
||||||
|
key={integration.kind}
|
||||||
|
h={selectGridCardHeight}
|
||||||
|
style={{
|
||||||
|
cursor: "pointer",
|
||||||
|
borderColor: isSelected ? "var(--mantine-color-blue-6)" : undefined,
|
||||||
|
borderWidth: isSelected ? 2 : undefined,
|
||||||
|
}}
|
||||||
|
onClick={() => toggleKind(integration.kind)}
|
||||||
|
withBorder
|
||||||
|
>
|
||||||
|
<Stack justify="space-between" h="100%" gap="xs">
|
||||||
|
<Group gap="sm" wrap="nowrap" align="flex-start">
|
||||||
|
<IntegrationAvatar kind={integration.kind} size="sm" />
|
||||||
|
<Text fw={500} lh={1.2} size="sm" lineClamp={2} style={{ flex: 1 }}>
|
||||||
|
{integration.name}
|
||||||
|
</Text>
|
||||||
|
{isSelected && <IconCheck size={18} color="var(--mantine-color-blue-6)" style={{ flexShrink: 0 }} />}
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
<Stack gap={4} mt="auto">
|
||||||
|
{isDetected && (
|
||||||
|
<Badge variant="light" color="teal" size="xs" leftSection={<IconBrandDocker size={12} />}>
|
||||||
|
{t("integration.grid.detected")}
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
|
<Group gap={4} wrap="wrap">
|
||||||
|
{integration.categories.slice(0, 2).map((cat) => (
|
||||||
|
<Badge key={cat} variant="light" size="xs">
|
||||||
|
{categoryTranslationKeys[cat] ? t(categoryTranslationKeys[cat] as never) : cat}
|
||||||
|
</Badge>
|
||||||
|
))}
|
||||||
|
</Group>
|
||||||
|
{integration.widgets.length > 0 ? (
|
||||||
|
<Tooltip
|
||||||
|
multiline
|
||||||
|
w={200}
|
||||||
|
label={
|
||||||
|
<Stack gap={4}>
|
||||||
|
{integration.widgets.map((widgetKind) => (
|
||||||
|
<Text key={widgetKind} size="xs">
|
||||||
|
{t(`widget.${widgetKind}.name`)}
|
||||||
|
</Text>
|
||||||
|
))}
|
||||||
|
</Stack>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<Badge variant="light" color="blue" size="sm" leftSection={<IconPuzzle size={12} />}>
|
||||||
|
{t("integration.grid.widgetCount", { count: String(integration.widgets.length) })}
|
||||||
|
</Badge>
|
||||||
|
</Tooltip>
|
||||||
|
) : (
|
||||||
|
<Badge variant="light" color="gray" size="sm">
|
||||||
|
{t("integration.grid.noWidgets")}
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
|
||||||
|
{filtered.length === 0 && (
|
||||||
|
<Center p="xl">
|
||||||
|
<Text c="dimmed">{t("common.noResults")}</Text>
|
||||||
|
</Center>
|
||||||
|
)}
|
||||||
|
</SelectGridLayout>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useMemo, useState } from "react";
|
||||||
|
import { Badge, Card, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
|
||||||
|
import { IconPuzzle } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import type { IntegrationKind } from "@homarr/definitions";
|
||||||
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
import { IntegrationAvatar, SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
|
||||||
|
|
||||||
|
import { buildSortedIntegrations, categoryTranslationKeys, filterIntegrations } from "./integration-grid-shared";
|
||||||
|
|
||||||
|
interface IntegrationSelectGridProps {
|
||||||
|
onSelect: (kind: IntegrationKind) => void;
|
||||||
|
enableMockIntegration?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const IntegrationSelectGrid = ({ onSelect, enableMockIntegration = false }: IntegrationSelectGridProps) => {
|
||||||
|
const [search, setSearch] = useState("");
|
||||||
|
const t = useI18n();
|
||||||
|
|
||||||
|
const integrations = useMemo(() => buildSortedIntegrations({ enableMockIntegration }), [enableMockIntegration]);
|
||||||
|
const filtered = useMemo(() => filterIntegrations(integrations, search), [integrations, search]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SelectGridLayout
|
||||||
|
search={search}
|
||||||
|
onSearchChange={setSearch}
|
||||||
|
placeholder={`${t("integration.page.list.search")}...`}
|
||||||
|
>
|
||||||
|
{filtered.map((integration) => (
|
||||||
|
<Card
|
||||||
|
key={integration.kind}
|
||||||
|
h={selectGridCardHeight}
|
||||||
|
style={{ cursor: "pointer" }}
|
||||||
|
onClick={() => onSelect(integration.kind)}
|
||||||
|
withBorder
|
||||||
|
>
|
||||||
|
<Stack justify="space-between" h="100%" gap="xs">
|
||||||
|
<Group gap="sm" wrap="nowrap" align="flex-start">
|
||||||
|
<IntegrationAvatar kind={integration.kind} size="sm" />
|
||||||
|
<Text fw={500} lh={1.2} size="sm" lineClamp={2}>
|
||||||
|
{integration.name}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
<Stack gap={4} mt="auto">
|
||||||
|
<Group gap={4} wrap="wrap">
|
||||||
|
{integration.categories.slice(0, 2).map((cat) => (
|
||||||
|
<Badge key={cat} variant="light" size="xs">
|
||||||
|
{categoryTranslationKeys[cat] ? t(categoryTranslationKeys[cat] as never) : cat}
|
||||||
|
</Badge>
|
||||||
|
))}
|
||||||
|
</Group>
|
||||||
|
{integration.widgets.length > 0 ? (
|
||||||
|
<Tooltip
|
||||||
|
multiline
|
||||||
|
w={200}
|
||||||
|
label={
|
||||||
|
<Stack gap={4}>
|
||||||
|
{integration.widgets.map((widgetKind) => (
|
||||||
|
<Text key={widgetKind} size="xs">
|
||||||
|
{t(`widget.${widgetKind}.name`)}
|
||||||
|
</Text>
|
||||||
|
))}
|
||||||
|
</Stack>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<Badge variant="light" color="blue" size="sm" leftSection={<IconPuzzle size={12} />}>
|
||||||
|
{t("integration.grid.widgetCount", { count: String(integration.widgets.length) })}
|
||||||
|
</Badge>
|
||||||
|
</Tooltip>
|
||||||
|
) : (
|
||||||
|
<Badge variant="light" color="gray" size="sm">
|
||||||
|
{t("integration.grid.noWidgets")}
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
))}
|
||||||
|
|
||||||
|
{filtered.length === 0 && (
|
||||||
|
<Center p="xl">
|
||||||
|
<Text c="dimmed">{t("common.noResults")}</Text>
|
||||||
|
</Center>
|
||||||
|
)}
|
||||||
|
</SelectGridLayout>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { Group, ScrollArea, Title } from "@mantine/core";
|
||||||
|
import { IconArrowLeft } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import type { IntegrationKind } from "@homarr/definitions";
|
||||||
|
import { getIntegrationName } from "@homarr/definitions";
|
||||||
|
import { createModal, modalSizeSelect } from "@homarr/modals";
|
||||||
|
import { IntegrationAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
|
import { NewIntegrationForm } from "~/app/[locale]/manage/integrations/new/_integration-new-form";
|
||||||
|
import { IntegrationSelectGrid } from "./integration-select-grid";
|
||||||
|
|
||||||
|
interface IntegrationSelectModalProps {
|
||||||
|
onSuccess?: () => void;
|
||||||
|
enableMockIntegration?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const IntegrationSelectModal = createModal<IntegrationSelectModalProps>(({ actions, innerProps }) => {
|
||||||
|
const [step, setStep] = useState<"select" | "form">("select");
|
||||||
|
const [selectedKind, setSelectedKind] = useState<IntegrationKind | null>(null);
|
||||||
|
|
||||||
|
const handleSelect = (kind: IntegrationKind) => {
|
||||||
|
setSelectedKind(kind);
|
||||||
|
setStep("form");
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBack = () => {
|
||||||
|
setStep("select");
|
||||||
|
setSelectedKind(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSuccess = () => {
|
||||||
|
innerProps.onSuccess?.();
|
||||||
|
actions.closeModal();
|
||||||
|
};
|
||||||
|
|
||||||
|
if (step === "form" && selectedKind) {
|
||||||
|
return (
|
||||||
|
<ScrollArea.Autosize mah="80vh">
|
||||||
|
<Group gap="xs" mb="md" style={{ cursor: "pointer" }} onClick={handleBack}>
|
||||||
|
<IconArrowLeft size={18} />
|
||||||
|
<IntegrationAvatar kind={selectedKind} size="sm" />
|
||||||
|
<Title order={4}>{getIntegrationName(selectedKind)}</Title>
|
||||||
|
</Group>
|
||||||
|
<NewIntegrationForm kind={selectedKind} onSuccess={handleSuccess} onCancel={handleBack} />
|
||||||
|
</ScrollArea.Autosize>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return <IntegrationSelectGrid onSelect={handleSelect} enableMockIntegration={innerProps.enableMockIntegration} />;
|
||||||
|
}).withOptions({
|
||||||
|
defaultTitle: (t) => t("integration.action.create"),
|
||||||
|
size: modalSizeSelect,
|
||||||
|
});
|
||||||
@@ -31,6 +31,7 @@ describe("Onboarding", () => {
|
|||||||
confirmPassword: "Comp(exP4sswOrd",
|
confirmPassword: "Comp(exP4sswOrd",
|
||||||
});
|
});
|
||||||
await actions.processSettingsStepAsync();
|
await actions.processSettingsStepAsync();
|
||||||
|
await actions.processIntegrationsStepAsync();
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
await assertions.assertFinishStepVisibleAsync();
|
await assertions.assertFinishStepVisibleAsync();
|
||||||
@@ -72,6 +73,7 @@ describe("Onboarding", () => {
|
|||||||
name: externalGroupName,
|
name: externalGroupName,
|
||||||
});
|
});
|
||||||
await actions.processSettingsStepAsync();
|
await actions.processSettingsStepAsync();
|
||||||
|
await actions.processIntegrationsStepAsync();
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
await assertions.assertFinishStepVisibleAsync();
|
await assertions.assertFinishStepVisibleAsync();
|
||||||
|
|||||||
@@ -51,4 +51,9 @@ export class OnboardingActions {
|
|||||||
await this.page.waitForSelector("text=Analytics");
|
await this.page.waitForSelector("text=Analytics");
|
||||||
await this.page.locator("css=button[type='submit']").click();
|
await this.page.locator("css=button[type='submit']").click();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async processIntegrationsStepAsync() {
|
||||||
|
await this.page.waitForSelector("text=integrations you'd like to connect");
|
||||||
|
await this.page.locator("button", { hasText: "Skip for now" }).click();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,7 @@ import { eq } from "drizzle-orm";
|
|||||||
import { expect } from "vitest";
|
import { expect } from "vitest";
|
||||||
|
|
||||||
import * as sqliteSchema from "../../../packages/db/schema/sqlite";
|
import * as sqliteSchema from "../../../packages/db/schema/sqlite";
|
||||||
import { OnboardingStep } from "../../../packages/definitions/src";
|
import type { OnboardingStep } from "../../../packages/definitions/src";
|
||||||
import { credentialsAdminGroup } from "../../../packages/definitions/src/group";
|
import { credentialsAdminGroup } from "../../../packages/definitions/src/group";
|
||||||
import type { SqliteDatabase } from "../e2e-db";
|
import type { SqliteDatabase } from "../e2e-db";
|
||||||
|
|
||||||
@@ -57,6 +57,6 @@ export class OnboardingAssertions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async assertFinishStepVisibleAsync() {
|
public async assertFinishStepVisibleAsync() {
|
||||||
await this.page.waitForSelector("text=completed the setup", { timeout: 5000 });
|
await this.page.waitForSelector("text=completed the setup", { timeout: 15000 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -76,6 +76,9 @@ const nextSteps: Partial<Record<OnboardingStep, Partial<Record<OnboardingStep, N
|
|||||||
settings: true,
|
settings: true,
|
||||||
},
|
},
|
||||||
settings: {
|
settings: {
|
||||||
|
integrations: true,
|
||||||
|
},
|
||||||
|
integrations: {
|
||||||
finish: true,
|
finish: true,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -1,12 +1,57 @@
|
|||||||
|
import { TRPCError } from "@trpc/server";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { onboarding } from "@homarr/db/schema";
|
import { createId } from "@homarr/common";
|
||||||
import { onboardingSteps } from "@homarr/definitions";
|
import { encryptSecret } from "@homarr/common/server";
|
||||||
|
import { eq, like, or } from "@homarr/db";
|
||||||
|
import { placeAllWidgetsAsync } from "@homarr/db/queries";
|
||||||
|
import {
|
||||||
|
apps,
|
||||||
|
groups,
|
||||||
|
icons,
|
||||||
|
integrationItems,
|
||||||
|
integrations,
|
||||||
|
integrationSecrets,
|
||||||
|
itemLayouts,
|
||||||
|
items,
|
||||||
|
onboarding,
|
||||||
|
} from "@homarr/db/schema";
|
||||||
|
import {
|
||||||
|
everyoneGroup,
|
||||||
|
extractContainerImageName,
|
||||||
|
getIconUrl,
|
||||||
|
integrationKinds,
|
||||||
|
integrationSecretKinds,
|
||||||
|
matchIntegrationKindFromContainer,
|
||||||
|
onboardingSteps,
|
||||||
|
} from "@homarr/definitions";
|
||||||
|
import type { IntegrationKind } from "@homarr/definitions";
|
||||||
import { zodEnumFromArray } from "@homarr/validation/enums";
|
import { zodEnumFromArray } from "@homarr/validation/enums";
|
||||||
|
|
||||||
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
import { createTRPCRouter, onboardingProcedure, publicProcedure } from "../../trpc";
|
||||||
|
import { MissingSecretError, testConnectionAsync } from "../integration/integration-test-connection";
|
||||||
|
import { mapTestConnectionError } from "../integration/map-test-connection-error";
|
||||||
import { getOnboardingOrFallbackAsync, nextOnboardingStepAsync } from "./onboard-queries";
|
import { getOnboardingOrFallbackAsync, nextOnboardingStepAsync } from "./onboard-queries";
|
||||||
|
|
||||||
|
interface PortInfo {
|
||||||
|
IP?: string;
|
||||||
|
PublicPort?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface SuggestedUrlResult {
|
||||||
|
url: string;
|
||||||
|
publishedPort: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const buildSuggestedUrl = (ports: PortInfo[] | undefined, host: string): SuggestedUrlResult => {
|
||||||
|
const port = ports?.[0];
|
||||||
|
if (port?.PublicPort) {
|
||||||
|
const ip = port.IP && port.IP !== "0.0.0.0" && port.IP !== "::" ? port.IP : host;
|
||||||
|
return { url: `http://${ip}:${port.PublicPort}`, publishedPort: port.PublicPort };
|
||||||
|
}
|
||||||
|
return { url: "", publishedPort: null };
|
||||||
|
};
|
||||||
|
|
||||||
export const onboardRouter = createTRPCRouter({
|
export const onboardRouter = createTRPCRouter({
|
||||||
currentStep: publicProcedure.query(async ({ ctx }) => {
|
currentStep: publicProcedure.query(async ({ ctx }) => {
|
||||||
return await getOnboardingOrFallbackAsync(ctx.db);
|
return await getOnboardingOrFallbackAsync(ctx.db);
|
||||||
@@ -33,4 +78,249 @@ export const onboardRouter = createTRPCRouter({
|
|||||||
step: "start",
|
step: "start",
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
createIntegration: onboardingProcedure
|
||||||
|
.requiresStep("integrations")
|
||||||
|
.input(
|
||||||
|
z.object({
|
||||||
|
name: z.string().nonempty().max(127),
|
||||||
|
url: z.string().nonempty(),
|
||||||
|
kind: zodEnumFromArray(integrationKinds),
|
||||||
|
secrets: z.array(
|
||||||
|
z.object({
|
||||||
|
kind: zodEnumFromArray(integrationSecretKinds),
|
||||||
|
value: z.string().nonempty(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.mutation(async ({ ctx, input }) => {
|
||||||
|
const result = await testConnectionAsync({
|
||||||
|
id: "new",
|
||||||
|
name: input.name,
|
||||||
|
url: input.url,
|
||||||
|
kind: input.kind,
|
||||||
|
secrets: input.secrets,
|
||||||
|
}).catch((error) => {
|
||||||
|
if (!(error instanceof MissingSecretError)) throw error;
|
||||||
|
|
||||||
|
throw new TRPCError({
|
||||||
|
code: "BAD_REQUEST",
|
||||||
|
message: error.message,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!result.success) {
|
||||||
|
return { error: mapTestConnectionError(result.error) };
|
||||||
|
}
|
||||||
|
|
||||||
|
const integrationId = createId();
|
||||||
|
const appId = createId();
|
||||||
|
|
||||||
|
await ctx.db.insert(apps).values({
|
||||||
|
id: appId,
|
||||||
|
name: input.name,
|
||||||
|
iconUrl: getIconUrl(input.kind),
|
||||||
|
href: input.url,
|
||||||
|
pingUrl: input.url,
|
||||||
|
description: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
await ctx.db.insert(integrations).values({
|
||||||
|
id: integrationId,
|
||||||
|
name: input.name,
|
||||||
|
url: input.url,
|
||||||
|
kind: input.kind,
|
||||||
|
appId,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (input.secrets.length >= 1) {
|
||||||
|
await ctx.db.insert(integrationSecrets).values(
|
||||||
|
input.secrets.map((secret) => ({
|
||||||
|
kind: secret.kind,
|
||||||
|
value: encryptSecret(secret.value),
|
||||||
|
integrationId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
discoverDockerServices: onboardingProcedure.requiresStep("integrations").query(async ({ ctx }) => {
|
||||||
|
const emptyResult = {
|
||||||
|
integrations: [] as {
|
||||||
|
containerId: string;
|
||||||
|
containerName: string;
|
||||||
|
kind: IntegrationKind;
|
||||||
|
suggestedUrl: string;
|
||||||
|
publishedPort: number | null;
|
||||||
|
iconUrl: string | null;
|
||||||
|
}[],
|
||||||
|
apps: [] as {
|
||||||
|
containerId: string;
|
||||||
|
containerName: string;
|
||||||
|
suggestedUrl: string;
|
||||||
|
publishedPort: number | null;
|
||||||
|
iconUrl: string | null;
|
||||||
|
}[],
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const { DockerSingleton, dockerLabels } = await import("@homarr/docker");
|
||||||
|
|
||||||
|
const dockerInstances = DockerSingleton.getInstances();
|
||||||
|
if (dockerInstances.length === 0) {
|
||||||
|
return { status: "empty" as const, ...emptyResult };
|
||||||
|
}
|
||||||
|
|
||||||
|
const results = await Promise.allSettled(
|
||||||
|
dockerInstances.map(async ({ instance, host }) => {
|
||||||
|
const containerList = await instance.listContainers({ all: false });
|
||||||
|
return containerList.filter((c) => !(dockerLabels.hide in c.Labels)).map((c) => ({ ...c, host }));
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
const containers = results.flatMap((r) => (r.status === "fulfilled" ? r.value : []));
|
||||||
|
|
||||||
|
if (containers.length === 0) {
|
||||||
|
return { status: "empty" as const, ...emptyResult };
|
||||||
|
}
|
||||||
|
|
||||||
|
const likeQueries = containers.map((c) => like(icons.name, `%${extractContainerImageName(c.Image)}%`));
|
||||||
|
const dbIcons = likeQueries.length > 0 ? await ctx.db.query.icons.findMany({ where: or(...likeQueries) }) : [];
|
||||||
|
|
||||||
|
const seenKinds = new Set<IntegrationKind>();
|
||||||
|
const discoveredIntegrations = emptyResult.integrations;
|
||||||
|
const discoveredApps = emptyResult.apps;
|
||||||
|
|
||||||
|
const cdnIconUrl = (slug: string) =>
|
||||||
|
`https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/${slug}.svg`;
|
||||||
|
|
||||||
|
const strictIconMatch = (imageName: string) => {
|
||||||
|
const normalized = imageName.toLowerCase().trim();
|
||||||
|
if (normalized.length < 3) return null;
|
||||||
|
const exact = dbIcons.find((icon) => icon.name.toLowerCase() === normalized);
|
||||||
|
if (exact) return exact.url;
|
||||||
|
return dbIcons.find((icon) => icon.name.toLowerCase().startsWith(normalized))?.url ?? null;
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const container of containers) {
|
||||||
|
const imageName = extractContainerImageName(container.Image);
|
||||||
|
const containerName = container.Names[0]?.split("/")[1] ?? "Unknown";
|
||||||
|
const dbIcon = strictIconMatch(imageName);
|
||||||
|
const iconUrl = dbIcon ?? cdnIconUrl(imageName.toLowerCase());
|
||||||
|
|
||||||
|
const { url: suggestedUrl, publishedPort } = buildSuggestedUrl(container.Ports, container.host);
|
||||||
|
|
||||||
|
const kind = matchIntegrationKindFromContainer({
|
||||||
|
image: container.Image,
|
||||||
|
name: containerName,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (kind && !seenKinds.has(kind)) {
|
||||||
|
seenKinds.add(kind);
|
||||||
|
discoveredIntegrations.push({
|
||||||
|
containerId: container.Id,
|
||||||
|
containerName,
|
||||||
|
kind,
|
||||||
|
suggestedUrl,
|
||||||
|
publishedPort,
|
||||||
|
iconUrl,
|
||||||
|
});
|
||||||
|
} else if (!kind && dbIcon) {
|
||||||
|
discoveredApps.push({
|
||||||
|
containerId: container.Id,
|
||||||
|
containerName,
|
||||||
|
suggestedUrl,
|
||||||
|
publishedPort,
|
||||||
|
iconUrl,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
status: "success" as const,
|
||||||
|
integrations: discoveredIntegrations,
|
||||||
|
apps: discoveredApps,
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return { status: "unavailable" as const, ...emptyResult };
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
createAppsFromDiscovery: onboardingProcedure
|
||||||
|
.requiresStep("integrations")
|
||||||
|
.input(
|
||||||
|
z.array(
|
||||||
|
z.object({
|
||||||
|
name: z.string().nonempty().max(127),
|
||||||
|
href: z.string().nullable(),
|
||||||
|
iconUrl: z.string().nullable(),
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.mutation(async ({ ctx, input }) => {
|
||||||
|
if (input.length === 0) return;
|
||||||
|
const defaultIcon = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/homarr.svg";
|
||||||
|
await ctx.db.insert(apps).values(
|
||||||
|
input.map((app) => ({
|
||||||
|
id: createId(),
|
||||||
|
name: app.name,
|
||||||
|
iconUrl: app.iconUrl ?? defaultIcon,
|
||||||
|
href: app.href,
|
||||||
|
description: null,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
setupIntegrations: onboardingProcedure.requiresStep("integrations").mutation(async ({ ctx }) => {
|
||||||
|
const db = ctx.db;
|
||||||
|
|
||||||
|
const allIntegrations = await db.query.integrations.findMany();
|
||||||
|
const allApps = await db.query.apps.findMany();
|
||||||
|
|
||||||
|
const board = await db.query.boards.findFirst({
|
||||||
|
with: {
|
||||||
|
sections: true,
|
||||||
|
layouts: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!board) {
|
||||||
|
await nextOnboardingStepAsync(db, undefined);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const everyoneGroupRow = await db.query.groups.findFirst({
|
||||||
|
where: eq(groups.name, everyoneGroup),
|
||||||
|
});
|
||||||
|
if (everyoneGroupRow && !everyoneGroupRow.homeBoardId) {
|
||||||
|
await db.update(groups).set({ homeBoardId: board.id }).where(eq(groups.id, everyoneGroupRow.id));
|
||||||
|
}
|
||||||
|
|
||||||
|
const section = board.sections.find((boardSection) => boardSection.kind === "empty");
|
||||||
|
const layout = board.layouts[0];
|
||||||
|
|
||||||
|
if (section && layout) {
|
||||||
|
const existingItems = await db.query.items.findMany({
|
||||||
|
where: eq(items.boardId, board.id),
|
||||||
|
});
|
||||||
|
for (const item of existingItems) {
|
||||||
|
await db.delete(integrationItems).where(eq(integrationItems.itemId, item.id));
|
||||||
|
await db.delete(itemLayouts).where(eq(itemLayouts.itemId, item.id));
|
||||||
|
}
|
||||||
|
if (existingItems.length > 0) {
|
||||||
|
await db.delete(items).where(eq(items.boardId, board.id));
|
||||||
|
}
|
||||||
|
|
||||||
|
await placeAllWidgetsAsync(
|
||||||
|
db,
|
||||||
|
{
|
||||||
|
boardId: board.id,
|
||||||
|
sectionId: section.id,
|
||||||
|
layoutId: layout.id,
|
||||||
|
columnCount: layout.columnCount,
|
||||||
|
},
|
||||||
|
allIntegrations,
|
||||||
|
allApps,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await nextOnboardingStepAsync(db, undefined);
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
@@ -1,7 +1,11 @@
|
|||||||
import type { ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapters/headers";
|
import type { ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapters/headers";
|
||||||
|
|
||||||
export const removeTrailingSlash = (path: string) => {
|
export const removeTrailingSlash = (path: string) => {
|
||||||
return path.at(-1) === "/" ? path.substring(0, path.length - 1) : path;
|
let end = path.length;
|
||||||
|
while (end > 0 && path.charAt(end - 1) === "/") {
|
||||||
|
end--;
|
||||||
|
}
|
||||||
|
return path.slice(0, end);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const extractBaseUrlFromHeaders = (
|
export const extractBaseUrlFromHeaders = (
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { createId, objectKeys } from "@homarr/common";
|
|||||||
import {
|
import {
|
||||||
createDocumentationLink,
|
createDocumentationLink,
|
||||||
credentialsAdminGroup,
|
credentialsAdminGroup,
|
||||||
|
defaultBookmarkApps,
|
||||||
everyoneGroup,
|
everyoneGroup,
|
||||||
getIntegrationDefaultUrl,
|
getIntegrationDefaultUrl,
|
||||||
getIntegrationName,
|
getIntegrationName,
|
||||||
@@ -15,7 +16,7 @@ import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server
|
|||||||
|
|
||||||
import type { Database } from "..";
|
import type { Database } from "..";
|
||||||
import { eq } from "..";
|
import { eq } from "..";
|
||||||
import { getMaxGroupPositionAsync } from "../queries";
|
import { getMaxGroupPositionAsync, placeAllWidgetsAsync } from "../queries";
|
||||||
import {
|
import {
|
||||||
getServerSettingByKeyAsync,
|
getServerSettingByKeyAsync,
|
||||||
insertServerSettingByKeyAsync,
|
insertServerSettingByKeyAsync,
|
||||||
@@ -46,6 +47,9 @@ export const seedDataAsync = async (db: Database) => {
|
|||||||
await seedServerSettingsAsync(db);
|
await seedServerSettingsAsync(db);
|
||||||
await seedDefaultSearchEnginesAsync(db);
|
await seedDefaultSearchEnginesAsync(db);
|
||||||
await seedDefaultIntegrationsAsync(db);
|
await seedDefaultIntegrationsAsync(db);
|
||||||
|
await seedDefaultAppsAsync(db);
|
||||||
|
await seedDefaultBoardAsync(db);
|
||||||
|
await seedBoardWidgetsAsync(db);
|
||||||
|
|
||||||
if (["1", "yes", "t", "true"].includes((process.env.DEMO_MODE ?? "").toLowerCase())) {
|
if (["1", "yes", "t", "true"].includes((process.env.DEMO_MODE ?? "").toLowerCase())) {
|
||||||
await seedDemoUserAsync(db);
|
await seedDemoUserAsync(db);
|
||||||
@@ -217,6 +221,64 @@ const seedDefaultIntegrationsAsync = async (db: Database) => {
|
|||||||
console.log(`Created ${createdCount} default integrations through seeding process`);
|
console.log(`Created ${createdCount} default integrations through seeding process`);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const seedDefaultAppsAsync = async (db: Database) => {
|
||||||
|
const existingApps = await db.$count(apps);
|
||||||
|
if (existingApps > 0) {
|
||||||
|
console.log("Skipping seeding of default apps as some already exist");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const app of defaultBookmarkApps) {
|
||||||
|
await db.insert(apps).values({
|
||||||
|
id: createId(),
|
||||||
|
name: app.name,
|
||||||
|
iconUrl: app.iconUrl,
|
||||||
|
href: app.href,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
console.log(`Created ${defaultBookmarkApps.length} default apps through seeding process`);
|
||||||
|
};
|
||||||
|
|
||||||
|
const seedDefaultBoardAsync = async (db: Database) => {
|
||||||
|
const existingBoard = await db.query.boards.findFirst();
|
||||||
|
|
||||||
|
if (existingBoard) {
|
||||||
|
console.log("Skipping seeding of default board as one already exists");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const boardId = createId();
|
||||||
|
await db.insert(boards).values({
|
||||||
|
id: boardId,
|
||||||
|
name: "dashboard",
|
||||||
|
isPublic: false,
|
||||||
|
});
|
||||||
|
await db.insert(sections).values({
|
||||||
|
id: createId(),
|
||||||
|
kind: "empty",
|
||||||
|
xOffset: 0,
|
||||||
|
yOffset: 0,
|
||||||
|
boardId,
|
||||||
|
});
|
||||||
|
await db.insert(layouts).values({
|
||||||
|
id: createId(),
|
||||||
|
name: "Base",
|
||||||
|
columnCount: 10,
|
||||||
|
breakpoint: 0,
|
||||||
|
boardId,
|
||||||
|
});
|
||||||
|
|
||||||
|
const everyoneGroupRow = await db.query.groups.findFirst({
|
||||||
|
where: eq(groups.name, everyoneGroup),
|
||||||
|
});
|
||||||
|
if (everyoneGroupRow) {
|
||||||
|
await db.update(groups).set({ homeBoardId: boardId }).where(eq(groups.id, everyoneGroupRow.id));
|
||||||
|
console.log("Set default board as home board for everyone group");
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("Created default board 'dashboard' through seed");
|
||||||
|
};
|
||||||
|
|
||||||
interface DemoWidget {
|
interface DemoWidget {
|
||||||
kind: WidgetKind;
|
kind: WidgetKind;
|
||||||
width: number;
|
width: number;
|
||||||
@@ -475,3 +537,32 @@ const seedDemoUserAsync = async (db: Database) => {
|
|||||||
"Demo mode enabled: created demo user, mock integration, and sample board with widgets. Disable by setting DEMO_MODE=false.",
|
"Demo mode enabled: created demo user, mock integration, and sample board with widgets. Disable by setting DEMO_MODE=false.",
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const seedBoardWidgetsAsync = async (db: Database) => {
|
||||||
|
const existingItems = await db.$count(items);
|
||||||
|
if (existingItems > 0) {
|
||||||
|
console.log("Skipping seeding of board widgets as some already exist");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const board = await db.query.boards.findFirst({
|
||||||
|
with: { sections: true, layouts: true },
|
||||||
|
});
|
||||||
|
if (!board) return;
|
||||||
|
|
||||||
|
const section = board.sections.find((sec) => sec.kind === "empty");
|
||||||
|
const layout = board.layouts[0];
|
||||||
|
if (!section || !layout) return;
|
||||||
|
|
||||||
|
const allIntegrations = await db.query.integrations.findMany();
|
||||||
|
const allApps = await db.query.apps.findMany();
|
||||||
|
|
||||||
|
const count = await placeAllWidgetsAsync(
|
||||||
|
db,
|
||||||
|
{ boardId: board.id, sectionId: section.id, layoutId: layout.id, columnCount: layout.columnCount },
|
||||||
|
allIntegrations,
|
||||||
|
allApps,
|
||||||
|
);
|
||||||
|
|
||||||
|
console.log(`Placed ${count} widgets on board`);
|
||||||
|
};
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
export * from "./item";
|
export * from "./item";
|
||||||
export * from "./server-setting";
|
export * from "./server-setting";
|
||||||
export * from "./group";
|
export * from "./group";
|
||||||
|
export * from "./widget-placement";
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
import superjson from "superjson";
|
||||||
|
|
||||||
|
import { createId } from "@homarr/common";
|
||||||
|
import {
|
||||||
|
defaultBookmarkApps,
|
||||||
|
defaultWidgetConfigs,
|
||||||
|
emptySuperJSON,
|
||||||
|
getWidgetKindsForIntegration,
|
||||||
|
} from "@homarr/definitions";
|
||||||
|
import type { WidgetKind } from "@homarr/definitions";
|
||||||
|
|
||||||
|
import type { Database } from "..";
|
||||||
|
import { integrationItems, itemLayouts, items } from "../schema";
|
||||||
|
import type { Integration } from "../schema";
|
||||||
|
|
||||||
|
const widgetConfigMap = new Map(defaultWidgetConfigs.map((config) => [config.kind, config]));
|
||||||
|
|
||||||
|
interface BoardTarget {
|
||||||
|
boardId: string;
|
||||||
|
sectionId: string;
|
||||||
|
layoutId: string;
|
||||||
|
columnCount: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PlacementContext extends BoardTarget {
|
||||||
|
xOffset: number;
|
||||||
|
yOffset: number;
|
||||||
|
rowMaxHeight: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const placeWidgetAsync = async (
|
||||||
|
db: Database,
|
||||||
|
ctx: PlacementContext,
|
||||||
|
kind: WidgetKind,
|
||||||
|
linkedIntegrationIds: string[],
|
||||||
|
options?: string,
|
||||||
|
size?: { width: number; height: number },
|
||||||
|
) => {
|
||||||
|
const itemWidth = size?.width ?? 2;
|
||||||
|
const itemHeight = size?.height ?? 2;
|
||||||
|
|
||||||
|
if (ctx.xOffset + itemWidth > ctx.columnCount) {
|
||||||
|
ctx.xOffset = 0;
|
||||||
|
ctx.yOffset += ctx.rowMaxHeight;
|
||||||
|
ctx.rowMaxHeight = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const itemId = createId();
|
||||||
|
await db.insert(items).values({
|
||||||
|
id: itemId,
|
||||||
|
boardId: ctx.boardId,
|
||||||
|
kind,
|
||||||
|
options: options ?? emptySuperJSON,
|
||||||
|
advancedOptions: emptySuperJSON,
|
||||||
|
});
|
||||||
|
|
||||||
|
await db.insert(itemLayouts).values({
|
||||||
|
itemId,
|
||||||
|
sectionId: ctx.sectionId,
|
||||||
|
layoutId: ctx.layoutId,
|
||||||
|
xOffset: ctx.xOffset,
|
||||||
|
yOffset: ctx.yOffset,
|
||||||
|
width: itemWidth,
|
||||||
|
height: itemHeight,
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const integrationId of linkedIntegrationIds) {
|
||||||
|
await db.insert(integrationItems).values({ itemId, integrationId });
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.rowMaxHeight = Math.max(ctx.rowMaxHeight, itemHeight);
|
||||||
|
ctx.xOffset += itemWidth;
|
||||||
|
};
|
||||||
|
|
||||||
|
interface App {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const placeAllWidgetsAsync = async (
|
||||||
|
db: Database,
|
||||||
|
target: BoardTarget,
|
||||||
|
allIntegrations: Integration[],
|
||||||
|
allApps: App[],
|
||||||
|
) => {
|
||||||
|
const ctx: PlacementContext = {
|
||||||
|
...target,
|
||||||
|
xOffset: 0,
|
||||||
|
yOffset: 0,
|
||||||
|
rowMaxHeight: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
const placedWidgets = new Set<WidgetKind>();
|
||||||
|
|
||||||
|
for (const integration of allIntegrations) {
|
||||||
|
for (const widgetKind of getWidgetKindsForIntegration(integration.kind)) {
|
||||||
|
if (placedWidgets.has(widgetKind)) continue;
|
||||||
|
const config = widgetConfigMap.get(widgetKind);
|
||||||
|
if (config?.skip) continue;
|
||||||
|
placedWidgets.add(widgetKind);
|
||||||
|
|
||||||
|
const matchingIds = allIntegrations
|
||||||
|
.filter((row) => getWidgetKindsForIntegration(row.kind).includes(widgetKind))
|
||||||
|
.map((row) => row.id);
|
||||||
|
|
||||||
|
const options = config?.options ? superjson.stringify(config.options) : undefined;
|
||||||
|
await placeWidgetAsync(
|
||||||
|
db,
|
||||||
|
ctx,
|
||||||
|
widgetKind,
|
||||||
|
matchingIds,
|
||||||
|
options,
|
||||||
|
config && { width: config.width, height: config.height },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const app of allApps) {
|
||||||
|
await placeWidgetAsync(
|
||||||
|
db,
|
||||||
|
ctx,
|
||||||
|
"app",
|
||||||
|
[],
|
||||||
|
superjson.stringify({ appId: app.id, openInNewTab: true, showTitle: true }),
|
||||||
|
{ width: 1, height: 1 },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const bookmarkAppNames = new Set(defaultBookmarkApps.map((bookmark) => bookmark.name));
|
||||||
|
const bookmarkAppIds = allApps.filter((app) => bookmarkAppNames.has(app.name)).map((app) => app.id);
|
||||||
|
|
||||||
|
for (const config of defaultWidgetConfigs) {
|
||||||
|
if (config.skip || placedWidgets.has(config.kind)) continue;
|
||||||
|
placedWidgets.add(config.kind);
|
||||||
|
|
||||||
|
let options = config.options ? { ...config.options } : undefined;
|
||||||
|
if (config.kind === "bookmarks" && bookmarkAppIds.length > 0) {
|
||||||
|
options = { ...options, items: bookmarkAppIds };
|
||||||
|
}
|
||||||
|
|
||||||
|
await placeWidgetAsync(db, ctx, config.kind, [], options ? superjson.stringify(options) : undefined, {
|
||||||
|
width: config.width,
|
||||||
|
height: config.height,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return placedWidgets.size + allApps.length;
|
||||||
|
};
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
import { objectKeys } from "@homarr/common";
|
||||||
|
|
||||||
|
import { integrationDefs } from "./integration";
|
||||||
|
import type { IntegrationKind } from "./integration";
|
||||||
|
|
||||||
|
export const extractContainerImageName = (image: string): string => image.split("/").at(-1)?.split(":").at(0) ?? "";
|
||||||
|
|
||||||
|
const extractIconSlug = (iconUrl: string): string => {
|
||||||
|
const filename = iconUrl.split("/").pop() ?? "";
|
||||||
|
return filename.replace(/\.(svg|png)$/, "").toLowerCase();
|
||||||
|
};
|
||||||
|
|
||||||
|
export const integrationIconSlugs: Record<IntegrationKind, string> = Object.fromEntries(
|
||||||
|
objectKeys(integrationDefs).map((kind) => [kind, extractIconSlug(integrationDefs[kind].iconUrl)]),
|
||||||
|
) as Record<IntegrationKind, string>;
|
||||||
|
|
||||||
|
const integrationAliases: Partial<Record<IntegrationKind, readonly string[]>> = {
|
||||||
|
piHole: ["pihole", "pi-hole"],
|
||||||
|
adGuardHome: ["adguardhome", "adguard-home", "adguard"],
|
||||||
|
homeAssistant: ["homeassistant", "home-assistant", "hass"],
|
||||||
|
openmediavault: ["omv"],
|
||||||
|
qBittorrent: ["qbittorrent"],
|
||||||
|
sabNzbd: ["sabnzbd"],
|
||||||
|
nzbGet: ["nzbget"],
|
||||||
|
unifiController: ["unifi", "unifi-controller"],
|
||||||
|
jellyseerr: ["jellyseerr"],
|
||||||
|
overseerr: ["overseerr"],
|
||||||
|
dashDot: ["dashdot", "dash-dot", "dash."],
|
||||||
|
speedtestTracker: ["speedtest-tracker"],
|
||||||
|
searchCh: ["search-ch"],
|
||||||
|
gitHubContainerRegistry: ["ghcr"],
|
||||||
|
linuxServerIO: ["linuxserver"],
|
||||||
|
coolify: ["coolify"],
|
||||||
|
truenas: ["truenas"],
|
||||||
|
};
|
||||||
|
|
||||||
|
export const matchIntegrationKind = (search: string): IntegrationKind | null => {
|
||||||
|
const normalized = search.toLowerCase().trim();
|
||||||
|
if (!normalized) return null;
|
||||||
|
|
||||||
|
for (const kind of objectKeys(integrationDefs)) {
|
||||||
|
if (kind.toLowerCase() === normalized) return kind;
|
||||||
|
if (integrationDefs[kind].name.toLowerCase() === normalized) return kind;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const kind of objectKeys(integrationDefs)) {
|
||||||
|
if (integrationIconSlugs[kind] === normalized) return kind;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [kind, aliases] of Object.entries(integrationAliases) as [IntegrationKind, readonly string[]][]) {
|
||||||
|
if (aliases.some((alias) => alias === normalized)) return kind;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const kind of objectKeys(integrationDefs)) {
|
||||||
|
if (normalized.includes(kind.toLowerCase())) return kind;
|
||||||
|
if (normalized.includes(integrationIconSlugs[kind])) return kind;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const notDockerDiscoverable = new Set<IntegrationKind>([
|
||||||
|
"dockerHub",
|
||||||
|
"github",
|
||||||
|
"gitlab",
|
||||||
|
"npm",
|
||||||
|
"codeberg",
|
||||||
|
"linuxServerIO",
|
||||||
|
"gitHubContainerRegistry",
|
||||||
|
"quay",
|
||||||
|
"ical",
|
||||||
|
"searchCh",
|
||||||
|
"mock",
|
||||||
|
]);
|
||||||
|
|
||||||
|
interface ContainerMatchInput {
|
||||||
|
image: string;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const matchIntegrationKindFromContainer = (container: ContainerMatchInput): IntegrationKind | null => {
|
||||||
|
const imageName = extractContainerImageName(container.image);
|
||||||
|
const fromImage = matchIntegrationKind(imageName);
|
||||||
|
if (fromImage && !notDockerDiscoverable.has(fromImage)) return fromImage;
|
||||||
|
|
||||||
|
const fromName = matchIntegrationKind(container.name);
|
||||||
|
if (fromName && !notDockerDiscoverable.has(fromName)) return fromName;
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
@@ -12,5 +12,8 @@ export * from "./docs";
|
|||||||
export * from "./cookie";
|
export * from "./cookie";
|
||||||
export * from "./search-engine";
|
export * from "./search-engine";
|
||||||
export * from "./onboarding";
|
export * from "./onboarding";
|
||||||
|
export * from "./widget-integration-map";
|
||||||
export * from "./emptysuperjson";
|
export * from "./emptysuperjson";
|
||||||
export * from "./hotkeys";
|
export * from "./hotkeys";
|
||||||
|
export * from "./docker-integration-match";
|
||||||
|
export * from "./integration-url-template";
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { removeTrailingSlash } from "@homarr/common";
|
||||||
|
|
||||||
|
import { integrationIconSlugs } from "./docker-integration-match";
|
||||||
|
import type { IntegrationKind } from "./integration";
|
||||||
|
import { getIntegrationDefaultPort } from "./integration";
|
||||||
|
|
||||||
|
export type UrlTemplateMode = "hostPort" | "subdomain";
|
||||||
|
|
||||||
|
const getSlugForKind = (kind: IntegrationKind): string => integrationIconSlugs[kind];
|
||||||
|
|
||||||
|
const buildUrl = (slug: string, host: string, mode: UrlTemplateMode, port?: number): string => {
|
||||||
|
const modeBuilders: Record<UrlTemplateMode, () => string> = {
|
||||||
|
subdomain: () => `https://${slug}.${host}`,
|
||||||
|
hostPort: () => (port ? `http://${host}:${port}` : `http://${host}`),
|
||||||
|
};
|
||||||
|
return modeBuilders[mode]();
|
||||||
|
};
|
||||||
|
|
||||||
|
export const buildIntegrationUrl = (
|
||||||
|
kind: IntegrationKind,
|
||||||
|
baseHost: string,
|
||||||
|
mode: UrlTemplateMode,
|
||||||
|
dockerPort?: number,
|
||||||
|
): string => {
|
||||||
|
const host = removeTrailingSlash(baseHost.trim());
|
||||||
|
if (!host) return "";
|
||||||
|
const port = dockerPort ?? getIntegrationDefaultPort(kind);
|
||||||
|
return buildUrl(getSlugForKind(kind), host, mode, port ?? undefined);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const buildAppUrl = (
|
||||||
|
containerName: string,
|
||||||
|
baseHost: string,
|
||||||
|
mode: UrlTemplateMode,
|
||||||
|
dockerPort?: number,
|
||||||
|
): string => {
|
||||||
|
const host = removeTrailingSlash(baseHost.trim());
|
||||||
|
if (!host) return "";
|
||||||
|
const slug = containerName.toLowerCase().replace(/[^a-z0-9-]/g, "-");
|
||||||
|
return buildUrl(slug, host, mode, dockerPort);
|
||||||
|
};
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { objectKeys } from "@homarr/common";
|
import { objectKeys, removeTrailingSlash } from "@homarr/common";
|
||||||
import type { AtLeastOneOf } from "@homarr/common/types";
|
import type { AtLeastOneOf } from "@homarr/common/types";
|
||||||
|
|
||||||
import { createDocumentationLink } from "./docs";
|
import { createDocumentationLink } from "./docs";
|
||||||
@@ -27,7 +27,9 @@ interface integrationDefinition {
|
|||||||
secretKinds: AtLeastOneOf<IntegrationSecretKind[]>; // at least one secret kind set is required
|
secretKinds: AtLeastOneOf<IntegrationSecretKind[]>; // at least one secret kind set is required
|
||||||
category: AtLeastOneOf<IntegrationCategory>;
|
category: AtLeastOneOf<IntegrationCategory>;
|
||||||
documentationUrl: string | null;
|
documentationUrl: string | null;
|
||||||
defaultUrl?: string; // optional default URL for the integration
|
defaultUrl?: string;
|
||||||
|
defaultPort?: number;
|
||||||
|
apiKeySettingsPath?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const integrationDefs = {
|
export const integrationDefs = {
|
||||||
@@ -37,6 +39,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/sabnzbd.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/sabnzbd.svg",
|
||||||
category: ["downloadClient", "usenet"],
|
category: ["downloadClient", "usenet"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/sabnzbd"),
|
documentationUrl: createDocumentationLink("/docs/integrations/sabnzbd"),
|
||||||
|
defaultPort: 8080,
|
||||||
|
apiKeySettingsPath: "/config/general/",
|
||||||
},
|
},
|
||||||
nzbGet: {
|
nzbGet: {
|
||||||
name: "NZBGet",
|
name: "NZBGet",
|
||||||
@@ -44,6 +48,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/nzbget.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/nzbget.svg",
|
||||||
category: ["downloadClient", "usenet"],
|
category: ["downloadClient", "usenet"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/nzbget"),
|
documentationUrl: createDocumentationLink("/docs/integrations/nzbget"),
|
||||||
|
defaultPort: 6789,
|
||||||
},
|
},
|
||||||
deluge: {
|
deluge: {
|
||||||
name: "Deluge",
|
name: "Deluge",
|
||||||
@@ -51,6 +56,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/deluge.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/deluge.svg",
|
||||||
category: ["downloadClient", "torrent"],
|
category: ["downloadClient", "torrent"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/deluge"),
|
documentationUrl: createDocumentationLink("/docs/integrations/deluge"),
|
||||||
|
defaultPort: 8112,
|
||||||
},
|
},
|
||||||
transmission: {
|
transmission: {
|
||||||
name: "Transmission",
|
name: "Transmission",
|
||||||
@@ -58,6 +64,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/transmission.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/transmission.svg",
|
||||||
category: ["downloadClient", "torrent"],
|
category: ["downloadClient", "torrent"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/transmission"),
|
documentationUrl: createDocumentationLink("/docs/integrations/transmission"),
|
||||||
|
defaultPort: 9091,
|
||||||
},
|
},
|
||||||
qBittorrent: {
|
qBittorrent: {
|
||||||
name: "qBittorrent",
|
name: "qBittorrent",
|
||||||
@@ -65,6 +72,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/qbittorrent.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/qbittorrent.svg",
|
||||||
category: ["downloadClient", "torrent"],
|
category: ["downloadClient", "torrent"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/q-bittorent"),
|
documentationUrl: createDocumentationLink("/docs/integrations/q-bittorent"),
|
||||||
|
defaultPort: 8080,
|
||||||
|
apiKeySettingsPath: "/#/settings/webui",
|
||||||
},
|
},
|
||||||
aria2: {
|
aria2: {
|
||||||
name: "Aria2",
|
name: "Aria2",
|
||||||
@@ -72,6 +81,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/PapirusDevelopmentTeam/papirus_icons@latest/src/system_downloads_3.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/PapirusDevelopmentTeam/papirus_icons@latest/src/system_downloads_3.svg",
|
||||||
category: ["downloadClient", "torrent", "miscellaneous"],
|
category: ["downloadClient", "torrent", "miscellaneous"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/aria2"),
|
documentationUrl: createDocumentationLink("/docs/integrations/aria2"),
|
||||||
|
defaultPort: 6800,
|
||||||
},
|
},
|
||||||
slskd: {
|
slskd: {
|
||||||
name: "Slskd",
|
name: "Slskd",
|
||||||
@@ -79,6 +89,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/slskd.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/slskd.svg",
|
||||||
category: ["downloadClient", "miscellaneous"],
|
category: ["downloadClient", "miscellaneous"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/slskd"),
|
documentationUrl: createDocumentationLink("/docs/integrations/slskd"),
|
||||||
|
defaultPort: 5030,
|
||||||
},
|
},
|
||||||
sonarr: {
|
sonarr: {
|
||||||
name: "Sonarr",
|
name: "Sonarr",
|
||||||
@@ -86,6 +97,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/sonarr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/sonarr.svg",
|
||||||
category: ["calendar"],
|
category: ["calendar"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/sonarr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/sonarr"),
|
||||||
|
defaultPort: 8989,
|
||||||
|
apiKeySettingsPath: "/settings/general",
|
||||||
},
|
},
|
||||||
radarr: {
|
radarr: {
|
||||||
name: "Radarr",
|
name: "Radarr",
|
||||||
@@ -93,6 +106,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/radarr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/radarr.svg",
|
||||||
category: ["calendar"],
|
category: ["calendar"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/radarr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/radarr"),
|
||||||
|
defaultPort: 7878,
|
||||||
|
apiKeySettingsPath: "/settings/general",
|
||||||
},
|
},
|
||||||
lidarr: {
|
lidarr: {
|
||||||
name: "Lidarr",
|
name: "Lidarr",
|
||||||
@@ -100,6 +115,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/lidarr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/lidarr.svg",
|
||||||
category: ["calendar"],
|
category: ["calendar"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/lidarr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/lidarr"),
|
||||||
|
defaultPort: 8686,
|
||||||
|
apiKeySettingsPath: "/settings/general",
|
||||||
},
|
},
|
||||||
readarr: {
|
readarr: {
|
||||||
name: "Readarr",
|
name: "Readarr",
|
||||||
@@ -107,6 +124,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/readarr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/readarr.svg",
|
||||||
category: ["calendar"],
|
category: ["calendar"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/readarr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/readarr"),
|
||||||
|
defaultPort: 8787,
|
||||||
|
apiKeySettingsPath: "/settings/general",
|
||||||
},
|
},
|
||||||
prowlarr: {
|
prowlarr: {
|
||||||
name: "Prowlarr",
|
name: "Prowlarr",
|
||||||
@@ -114,6 +133,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/prowlarr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/prowlarr.svg",
|
||||||
category: ["indexerManager"],
|
category: ["indexerManager"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/prowlarr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/prowlarr"),
|
||||||
|
defaultPort: 9696,
|
||||||
|
apiKeySettingsPath: "/settings/general",
|
||||||
},
|
},
|
||||||
jellyfin: {
|
jellyfin: {
|
||||||
name: "Jellyfin",
|
name: "Jellyfin",
|
||||||
@@ -121,6 +142,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyfin.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyfin.svg",
|
||||||
category: ["mediaService", "mediaRelease"],
|
category: ["mediaService", "mediaRelease"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/jellyfin"),
|
documentationUrl: createDocumentationLink("/docs/integrations/jellyfin"),
|
||||||
|
defaultPort: 8096,
|
||||||
|
apiKeySettingsPath: "/web/index.html#!/dashboard/keys",
|
||||||
},
|
},
|
||||||
emby: {
|
emby: {
|
||||||
name: "Emby",
|
name: "Emby",
|
||||||
@@ -128,6 +151,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/emby.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/emby.svg",
|
||||||
category: ["mediaService", "mediaRelease"],
|
category: ["mediaService", "mediaRelease"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/emby"),
|
documentationUrl: createDocumentationLink("/docs/integrations/emby"),
|
||||||
|
defaultPort: 8096,
|
||||||
},
|
},
|
||||||
plex: {
|
plex: {
|
||||||
name: "Plex",
|
name: "Plex",
|
||||||
@@ -135,6 +159,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/plex.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/plex.svg",
|
||||||
category: ["mediaService", "mediaRelease"],
|
category: ["mediaService", "mediaRelease"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/plex"),
|
documentationUrl: createDocumentationLink("/docs/integrations/plex"),
|
||||||
|
defaultPort: 32400,
|
||||||
},
|
},
|
||||||
jellyseerr: {
|
jellyseerr: {
|
||||||
name: "Jellyseerr",
|
name: "Jellyseerr",
|
||||||
@@ -142,6 +167,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg",
|
||||||
category: ["mediaSearch", "mediaRequest", "search"],
|
category: ["mediaSearch", "mediaRequest", "search"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/jellyseerr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/jellyseerr"),
|
||||||
|
defaultPort: 5055,
|
||||||
|
apiKeySettingsPath: "/settings",
|
||||||
},
|
},
|
||||||
seerr: {
|
seerr: {
|
||||||
name: "Seerr",
|
name: "Seerr",
|
||||||
@@ -149,6 +176,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/seerr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/seerr.svg",
|
||||||
category: ["mediaSearch", "mediaRequest", "search"],
|
category: ["mediaSearch", "mediaRequest", "search"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/seerr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/seerr"),
|
||||||
|
defaultPort: 5055,
|
||||||
|
apiKeySettingsPath: "/settings",
|
||||||
},
|
},
|
||||||
overseerr: {
|
overseerr: {
|
||||||
name: "Overseerr",
|
name: "Overseerr",
|
||||||
@@ -156,6 +185,8 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/overseerr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/overseerr.svg",
|
||||||
category: ["mediaSearch", "mediaRequest", "search"],
|
category: ["mediaSearch", "mediaRequest", "search"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/overseerr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/overseerr"),
|
||||||
|
defaultPort: 5055,
|
||||||
|
apiKeySettingsPath: "/settings",
|
||||||
},
|
},
|
||||||
piHole: {
|
piHole: {
|
||||||
name: "Pi-hole",
|
name: "Pi-hole",
|
||||||
@@ -163,6 +194,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/pi-hole.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/pi-hole.svg",
|
||||||
category: ["dnsHole"],
|
category: ["dnsHole"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/pi-hole"),
|
documentationUrl: createDocumentationLink("/docs/integrations/pi-hole"),
|
||||||
|
defaultPort: 80,
|
||||||
},
|
},
|
||||||
adGuardHome: {
|
adGuardHome: {
|
||||||
name: "AdGuard Home",
|
name: "AdGuard Home",
|
||||||
@@ -170,6 +202,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/adguard-home.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/adguard-home.svg",
|
||||||
category: ["dnsHole"],
|
category: ["dnsHole"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/adguard-home"),
|
documentationUrl: createDocumentationLink("/docs/integrations/adguard-home"),
|
||||||
|
defaultPort: 3000,
|
||||||
},
|
},
|
||||||
homeAssistant: {
|
homeAssistant: {
|
||||||
name: "Home Assistant",
|
name: "Home Assistant",
|
||||||
@@ -177,6 +210,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/home-assistant.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/home-assistant.svg",
|
||||||
category: ["smartHomeServer", "calendar"],
|
category: ["smartHomeServer", "calendar"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/home-assistant"),
|
documentationUrl: createDocumentationLink("/docs/integrations/home-assistant"),
|
||||||
|
defaultPort: 8123,
|
||||||
},
|
},
|
||||||
openmediavault: {
|
openmediavault: {
|
||||||
name: "OpenMediaVault",
|
name: "OpenMediaVault",
|
||||||
@@ -184,6 +218,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/openmediavault.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/openmediavault.svg",
|
||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/open-media-vault"),
|
documentationUrl: createDocumentationLink("/docs/integrations/open-media-vault"),
|
||||||
|
defaultPort: 80,
|
||||||
},
|
},
|
||||||
dashDot: {
|
dashDot: {
|
||||||
name: "Dash.",
|
name: "Dash.",
|
||||||
@@ -198,6 +233,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/glances.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/glances.svg",
|
||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
documentationUrl: null,
|
documentationUrl: null,
|
||||||
|
defaultPort: 61208,
|
||||||
},
|
},
|
||||||
tdarr: {
|
tdarr: {
|
||||||
name: "Tdarr",
|
name: "Tdarr",
|
||||||
@@ -205,6 +241,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/tdarr.png",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/tdarr.png",
|
||||||
category: ["mediaTranscoding"],
|
category: ["mediaTranscoding"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/tdarr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/tdarr"),
|
||||||
|
defaultPort: 8265,
|
||||||
},
|
},
|
||||||
proxmox: {
|
proxmox: {
|
||||||
name: "Proxmox",
|
name: "Proxmox",
|
||||||
@@ -212,6 +249,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/proxmox.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/proxmox.svg",
|
||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/proxmox"),
|
documentationUrl: createDocumentationLink("/docs/integrations/proxmox"),
|
||||||
|
defaultPort: 8006,
|
||||||
},
|
},
|
||||||
nextcloud: {
|
nextcloud: {
|
||||||
name: "Nextcloud",
|
name: "Nextcloud",
|
||||||
@@ -219,6 +257,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/nextcloud.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/nextcloud.svg",
|
||||||
category: ["calendar", "notifications"],
|
category: ["calendar", "notifications"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/nextcloud"),
|
documentationUrl: createDocumentationLink("/docs/integrations/nextcloud"),
|
||||||
|
defaultPort: 443,
|
||||||
},
|
},
|
||||||
unifiController: {
|
unifiController: {
|
||||||
name: "Unifi Controller",
|
name: "Unifi Controller",
|
||||||
@@ -226,6 +265,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/unifi.png",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/unifi.png",
|
||||||
category: ["networkController"],
|
category: ["networkController"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/unifi-controller"),
|
documentationUrl: createDocumentationLink("/docs/integrations/unifi-controller"),
|
||||||
|
defaultPort: 8443,
|
||||||
},
|
},
|
||||||
opnsense: {
|
opnsense: {
|
||||||
name: "OPNsense",
|
name: "OPNsense",
|
||||||
@@ -233,6 +273,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/opnsense.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/opnsense.svg",
|
||||||
category: ["firewall"],
|
category: ["firewall"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/opnsense"),
|
documentationUrl: createDocumentationLink("/docs/integrations/opnsense"),
|
||||||
|
defaultPort: 443,
|
||||||
},
|
},
|
||||||
github: {
|
github: {
|
||||||
name: "Github",
|
name: "Github",
|
||||||
@@ -304,6 +345,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/ntfy.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/ntfy.svg",
|
||||||
category: ["notifications"],
|
category: ["notifications"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/ntfy"),
|
documentationUrl: createDocumentationLink("/docs/integrations/ntfy"),
|
||||||
|
defaultPort: 80,
|
||||||
},
|
},
|
||||||
ical: {
|
ical: {
|
||||||
name: "iCal",
|
name: "iCal",
|
||||||
@@ -318,6 +360,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/anchor.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/anchor.svg",
|
||||||
category: ["notes"],
|
category: ["notes"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/anchor"),
|
documentationUrl: createDocumentationLink("/docs/integrations/anchor"),
|
||||||
|
defaultPort: 8080,
|
||||||
},
|
},
|
||||||
truenas: {
|
truenas: {
|
||||||
name: "TrueNAS",
|
name: "TrueNAS",
|
||||||
@@ -325,6 +368,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/truenas.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/truenas.svg",
|
||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/truenas"),
|
documentationUrl: createDocumentationLink("/docs/integrations/truenas"),
|
||||||
|
defaultPort: 80,
|
||||||
},
|
},
|
||||||
unraid: {
|
unraid: {
|
||||||
name: "Unraid",
|
name: "Unraid",
|
||||||
@@ -332,6 +376,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/unraid.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/unraid.svg",
|
||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/unraid"),
|
documentationUrl: createDocumentationLink("/docs/integrations/unraid"),
|
||||||
|
defaultPort: 80,
|
||||||
},
|
},
|
||||||
coolify: {
|
coolify: {
|
||||||
name: "Coolify",
|
name: "Coolify",
|
||||||
@@ -340,12 +385,12 @@ export const integrationDefs = {
|
|||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
// @ts-expect-error - docs page will be created when integration is merged
|
// @ts-expect-error - docs page will be created when integration is merged
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/coolify"),
|
documentationUrl: createDocumentationLink("/docs/integrations/coolify"),
|
||||||
|
defaultPort: 8000,
|
||||||
},
|
},
|
||||||
searchCh: {
|
searchCh: {
|
||||||
name: "Search.ch",
|
name: "Search.ch",
|
||||||
secretKinds: [[]],
|
secretKinds: [[]],
|
||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/search-ch.png",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/search-ch.png",
|
||||||
defaultUrl: "https://search.ch",
|
|
||||||
category: ["timetable"],
|
category: ["timetable"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/search-ch"),
|
documentationUrl: createDocumentationLink("/docs/integrations/search-ch"),
|
||||||
},
|
},
|
||||||
@@ -355,6 +400,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/immich.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/immich.svg",
|
||||||
category: ["photoService"],
|
category: ["photoService"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/immich"),
|
documentationUrl: createDocumentationLink("/docs/integrations/immich"),
|
||||||
|
defaultPort: 2283,
|
||||||
},
|
},
|
||||||
tracearr: {
|
tracearr: {
|
||||||
name: "Tracearr",
|
name: "Tracearr",
|
||||||
@@ -362,6 +408,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/tracearr.svg",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/tracearr.svg",
|
||||||
category: ["mediaMonitoring"],
|
category: ["mediaMonitoring"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/tracearr"),
|
documentationUrl: createDocumentationLink("/docs/integrations/tracearr"),
|
||||||
|
defaultPort: 7040,
|
||||||
},
|
},
|
||||||
speedtestTracker: {
|
speedtestTracker: {
|
||||||
name: "Speedtest Tracker",
|
name: "Speedtest Tracker",
|
||||||
@@ -369,6 +416,7 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/speedtest-tracker.png",
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/speedtest-tracker.png",
|
||||||
category: ["speedtest"],
|
category: ["speedtest"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/speedtest-tracker"),
|
documentationUrl: createDocumentationLink("/docs/integrations/speedtest-tracker"),
|
||||||
|
defaultPort: 80,
|
||||||
},
|
},
|
||||||
umami: {
|
umami: {
|
||||||
name: "Umami",
|
name: "Umami",
|
||||||
@@ -377,6 +425,7 @@ export const integrationDefs = {
|
|||||||
category: ["analytics"],
|
category: ["analytics"],
|
||||||
defaultUrl: "https://api.umami.is/v1",
|
defaultUrl: "https://api.umami.is/v1",
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/umami"),
|
documentationUrl: createDocumentationLink("/docs/integrations/umami"),
|
||||||
|
defaultPort: 3000,
|
||||||
},
|
},
|
||||||
// This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
|
// This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
|
||||||
mock: {
|
mock: {
|
||||||
@@ -418,6 +467,19 @@ export const getIntegrationDefaultUrl = (integration: IntegrationKind) => {
|
|||||||
return "defaultUrl" in definition ? definition.defaultUrl : undefined;
|
return "defaultUrl" in definition ? definition.defaultUrl : undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getIntegrationDefaultPort = (kind: IntegrationKind): number | undefined => {
|
||||||
|
const definition = integrationDefs[kind];
|
||||||
|
return "defaultPort" in definition ? definition.defaultPort : undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getIntegrationApiKeyUrl = (integrationUrl: string, kind: IntegrationKind): string | null => {
|
||||||
|
const definition = integrationDefs[kind];
|
||||||
|
if (!("apiKeySettingsPath" in definition)) return null;
|
||||||
|
const base = removeTrailingSlash(integrationUrl);
|
||||||
|
if (!base) return null;
|
||||||
|
return `${base}${definition.apiKeySettingsPath}`;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all integration kinds that share a category, typed only by the kinds belonging to the category
|
* Get all integration kinds that share a category, typed only by the kinds belonging to the category
|
||||||
* @param category Category to filter by, belonging to IntegrationCategory
|
* @param category Category to filter by, belonging to IntegrationCategory
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
export const onboardingSteps = ["start", "import", "user", "group", "settings", "finish"] as const;
|
export const onboardingSteps = ["start", "import", "user", "group", "settings", "integrations", "finish"] as const;
|
||||||
export type OnboardingStep = (typeof onboardingSteps)[number];
|
export type OnboardingStep = (typeof onboardingSteps)[number];
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { getIntegrationApiKeyUrl } from "../integration";
|
||||||
|
|
||||||
|
describe("getIntegrationApiKeyUrl", () => {
|
||||||
|
it("builds URL for sonarr", () => {
|
||||||
|
expect(getIntegrationApiKeyUrl("http://192.168.1.10:8989", "sonarr")).toBe(
|
||||||
|
"http://192.168.1.10:8989/settings/general",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("builds URL for jellyfin", () => {
|
||||||
|
expect(getIntegrationApiKeyUrl("http://media.local:8096", "jellyfin")).toBe(
|
||||||
|
"http://media.local:8096/web/index.html#!/dashboard/keys",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null for integrations without apiKeySettingsPath", () => {
|
||||||
|
expect(getIntegrationApiKeyUrl("http://localhost", "plex")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null for empty URL", () => {
|
||||||
|
expect(getIntegrationApiKeyUrl("", "sonarr")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("strips trailing slash from base URL", () => {
|
||||||
|
expect(getIntegrationApiKeyUrl("http://sonarr.local/", "sonarr")).toBe("http://sonarr.local/settings/general");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import {
|
||||||
|
extractContainerImageName,
|
||||||
|
matchIntegrationKind,
|
||||||
|
matchIntegrationKindFromContainer,
|
||||||
|
} from "../docker-integration-match";
|
||||||
|
|
||||||
|
describe("extractContainerImageName", () => {
|
||||||
|
it("extracts name from full image reference", () => {
|
||||||
|
expect(extractContainerImageName("linuxserver/sonarr:latest")).toBe("sonarr");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("extracts name from ghcr image", () => {
|
||||||
|
expect(extractContainerImageName("ghcr.io/org/radarr:v5")).toBe("radarr");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("handles plain image name", () => {
|
||||||
|
expect(extractContainerImageName("jellyfin")).toBe("jellyfin");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("handles empty string", () => {
|
||||||
|
expect(extractContainerImageName("")).toBe("");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("matchIntegrationKind", () => {
|
||||||
|
it("matches exact kind name", () => {
|
||||||
|
expect(matchIntegrationKind("sonarr")).toBe("sonarr");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches case-insensitively", () => {
|
||||||
|
expect(matchIntegrationKind("Sonarr")).toBe("sonarr");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches icon slug for pi-hole", () => {
|
||||||
|
expect(matchIntegrationKind("pi-hole")).toBe("piHole");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches alias pihole", () => {
|
||||||
|
expect(matchIntegrationKind("pihole")).toBe("piHole");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches alias adguardhome", () => {
|
||||||
|
expect(matchIntegrationKind("adguardhome")).toBe("adGuardHome");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches alias homeassistant", () => {
|
||||||
|
expect(matchIntegrationKind("homeassistant")).toBe("homeAssistant");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches substring in image name", () => {
|
||||||
|
expect(matchIntegrationKind("hotio-sonarr")).toBe("sonarr");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null for unknown", () => {
|
||||||
|
expect(matchIntegrationKind("nginx")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null for empty string", () => {
|
||||||
|
expect(matchIntegrationKind("")).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("matchIntegrationKindFromContainer", () => {
|
||||||
|
it("matches from image name first", () => {
|
||||||
|
expect(
|
||||||
|
matchIntegrationKindFromContainer({
|
||||||
|
image: "linuxserver/sonarr:latest",
|
||||||
|
name: "my-sonarr",
|
||||||
|
}),
|
||||||
|
).toBe("sonarr");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("falls back to container name", () => {
|
||||||
|
expect(
|
||||||
|
matchIntegrationKindFromContainer({
|
||||||
|
image: "custom/myapp:latest",
|
||||||
|
name: "radarr",
|
||||||
|
}),
|
||||||
|
).toBe("radarr");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null when neither matches", () => {
|
||||||
|
expect(
|
||||||
|
matchIntegrationKindFromContainer({
|
||||||
|
image: "nginx:latest",
|
||||||
|
name: "web-proxy",
|
||||||
|
}),
|
||||||
|
).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("excludes dockerHub even when image contains docker", () => {
|
||||||
|
expect(
|
||||||
|
matchIntegrationKindFromContainer({
|
||||||
|
image: "portainer/portainer-ce:latest",
|
||||||
|
name: "docker-proxy",
|
||||||
|
}),
|
||||||
|
).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("excludes ical from container matching", () => {
|
||||||
|
expect(
|
||||||
|
matchIntegrationKindFromContainer({
|
||||||
|
image: "ical-relay:latest",
|
||||||
|
name: "ical",
|
||||||
|
}),
|
||||||
|
).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("excludes github from container matching", () => {
|
||||||
|
expect(
|
||||||
|
matchIntegrationKindFromContainer({
|
||||||
|
image: "github-runner:latest",
|
||||||
|
name: "github-actions",
|
||||||
|
}),
|
||||||
|
).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { getIntegrationDefaultPort } from "../integration";
|
||||||
|
import { buildIntegrationUrl } from "../integration-url-template";
|
||||||
|
|
||||||
|
describe("buildIntegrationUrl", () => {
|
||||||
|
it("builds subdomain URL", () => {
|
||||||
|
expect(buildIntegrationUrl("sonarr", "homelab.local", "subdomain")).toBe("https://sonarr.homelab.local");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("builds hostPort URL with default port", () => {
|
||||||
|
expect(buildIntegrationUrl("sonarr", "192.168.1.1", "hostPort")).toBe("http://192.168.1.1:8989");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses docker port over default port", () => {
|
||||||
|
expect(buildIntegrationUrl("sonarr", "192.168.1.1", "hostPort", 9999)).toBe("http://192.168.1.1:9999");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("builds hostPort URL without port when none known", () => {
|
||||||
|
expect(buildIntegrationUrl("mock", "192.168.1.1", "hostPort")).toBe("http://192.168.1.1");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("strips trailing slashes from host", () => {
|
||||||
|
expect(buildIntegrationUrl("sonarr", "homelab.local/", "subdomain")).toBe("https://sonarr.homelab.local");
|
||||||
|
expect(buildIntegrationUrl("sonarr", "homelab.local///", "subdomain")).toBe("https://sonarr.homelab.local");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns empty string for empty host", () => {
|
||||||
|
expect(buildIntegrationUrl("sonarr", "", "subdomain")).toBe("");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses pi-hole slug for subdomain mode", () => {
|
||||||
|
expect(buildIntegrationUrl("piHole", "example.com", "subdomain")).toBe("https://pi-hole.example.com");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("reads default ports from integration definitions", () => {
|
||||||
|
expect(getIntegrationDefaultPort("radarr")).toBe(7878);
|
||||||
|
expect(getIntegrationDefaultPort("prowlarr")).toBe(9696);
|
||||||
|
expect(getIntegrationDefaultPort("jellyfin")).toBe(8096);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
import { createDocumentationLink } from "./docs";
|
||||||
|
import type { IntegrationKind } from "./integration";
|
||||||
|
import { getIntegrationKindsByCategory } from "./integration";
|
||||||
|
import type { WidgetKind } from "./widget";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Static mapping of widget kinds to the integration kinds they support.
|
||||||
|
* Mirrors the supportedIntegrations declared in each widget definition
|
||||||
|
* but lives in @homarr/definitions so server-side code (API layer)
|
||||||
|
* can use it without importing @homarr/widgets.
|
||||||
|
*/
|
||||||
|
export const widgetIntegrationSupport: Partial<Record<WidgetKind, readonly IntegrationKind[]>> = {
|
||||||
|
dnsHoleSummary: getIntegrationKindsByCategory("dnsHole"),
|
||||||
|
dnsHoleControls: getIntegrationKindsByCategory("dnsHole"),
|
||||||
|
"smartHome-entityState": getIntegrationKindsByCategory("smartHomeServer"),
|
||||||
|
"smartHome-executeAutomation": getIntegrationKindsByCategory("smartHomeServer"),
|
||||||
|
mediaServer: getIntegrationKindsByCategory("mediaService"),
|
||||||
|
calendar: getIntegrationKindsByCategory("calendar"),
|
||||||
|
downloads: getIntegrationKindsByCategory("downloadClient"),
|
||||||
|
"mediaRequests-requestList": getIntegrationKindsByCategory("mediaRequest"),
|
||||||
|
"mediaRequests-requestStats": getIntegrationKindsByCategory("mediaRequest"),
|
||||||
|
mediaTranscoding: getIntegrationKindsByCategory("mediaTranscoding"),
|
||||||
|
networkControllerSummary: getIntegrationKindsByCategory("networkController"),
|
||||||
|
networkControllerStatus: getIntegrationKindsByCategory("networkController"),
|
||||||
|
indexerManager: getIntegrationKindsByCategory("indexerManager"),
|
||||||
|
healthMonitoring: getIntegrationKindsByCategory("healthMonitoring"),
|
||||||
|
firewall: getIntegrationKindsByCategory("firewall"),
|
||||||
|
notifications: getIntegrationKindsByCategory("notifications"),
|
||||||
|
mediaReleases: ["emby", "jellyfin", "plex"],
|
||||||
|
systemResources: ["dashDot", "openmediavault", "truenas", "unraid", "glances"],
|
||||||
|
systemDisks: ["dashDot", "openmediavault", "truenas", "unraid"],
|
||||||
|
coolify: ["coolify"],
|
||||||
|
timetable: ["searchCh"],
|
||||||
|
"immich-serverStats": ["immich"],
|
||||||
|
"immich-albumCarousel": ["immich"],
|
||||||
|
tracearr: ["tracearr"],
|
||||||
|
speedtestTracker: ["speedtestTracker"],
|
||||||
|
anchorNote: ["anchor"],
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getWidgetKindsForIntegration = (integrationKind: IntegrationKind): WidgetKind[] => {
|
||||||
|
const result: WidgetKind[] = [];
|
||||||
|
for (const [widgetKind, supportedIntegrations] of Object.entries(widgetIntegrationSupport)) {
|
||||||
|
if (supportedIntegrations.includes(integrationKind)) {
|
||||||
|
result.push(widgetKind as WidgetKind);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
};
|
||||||
|
|
||||||
|
export interface DefaultWidgetConfig {
|
||||||
|
kind: WidgetKind;
|
||||||
|
width: number;
|
||||||
|
height: number;
|
||||||
|
options?: Record<string, unknown>;
|
||||||
|
skip?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const defaultWidgetConfigs: DefaultWidgetConfig[] = [
|
||||||
|
{ kind: "clock", width: 2, height: 1 },
|
||||||
|
{ kind: "weather", width: 2, height: 1, options: { showCity: true, hasForecast: true, forecastDayCount: 3 } },
|
||||||
|
{ kind: "bookmarks", width: 2, height: 2, options: { title: "Useful Links", layout: "grid", openNewTab: true } },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const generalWidgets: WidgetKind[] = defaultWidgetConfigs
|
||||||
|
.filter((config) => !config.skip)
|
||||||
|
.map((config) => config.kind);
|
||||||
|
|
||||||
|
export const featuredIntegrations: readonly IntegrationKind[] = [
|
||||||
|
"sonarr",
|
||||||
|
"radarr",
|
||||||
|
"prowlarr",
|
||||||
|
"sabNzbd",
|
||||||
|
"qBittorrent",
|
||||||
|
"seerr",
|
||||||
|
"jellyfin",
|
||||||
|
];
|
||||||
|
|
||||||
|
export const hiddenFromOnboarding = new Set<IntegrationKind>([
|
||||||
|
"searchCh",
|
||||||
|
"github",
|
||||||
|
"dockerHub",
|
||||||
|
"gitlab",
|
||||||
|
"npm",
|
||||||
|
"codeberg",
|
||||||
|
"linuxServerIO",
|
||||||
|
"gitHubContainerRegistry",
|
||||||
|
"quay",
|
||||||
|
"mock",
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const defaultBookmarkApps = [
|
||||||
|
{
|
||||||
|
name: "Homarr Docs",
|
||||||
|
href: createDocumentationLink("/docs/getting-started"),
|
||||||
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/homarr.svg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Homarr GitHub",
|
||||||
|
href: "https://github.com/homarr-labs/homarr",
|
||||||
|
iconUrl: "https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/svg/github.svg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Help Translate",
|
||||||
|
href: createDocumentationLink("/docs/community/translations"),
|
||||||
|
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/homarr.svg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Support Homarr",
|
||||||
|
href: "https://opencollective.com/homarr",
|
||||||
|
iconUrl: "https://cdn.jsdelivr.net/gh/loganmarchione/homelab-svg-assets@latest/assets/opencollective.svg",
|
||||||
|
},
|
||||||
|
];
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
import { useMemo, useState } from "react";
|
import { useMemo, useState } from "react";
|
||||||
import { Button, Card, Center, Grid, Input, Stack, Text } from "@mantine/core";
|
import { Box, Button, Card, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
|
||||||
import { IconPlus, IconSearch } from "@tabler/icons-react";
|
import { IconPlus } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { createModal, useModalAction } from "@homarr/modals";
|
import { createModal, modalSizeSelect, useModalAction } from "@homarr/modals";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
import { SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
|
||||||
|
|
||||||
import { QuickAddAppModal } from "./quick-add-app/quick-add-app-modal";
|
import { QuickAddAppModal } from "./quick-add-app/quick-add-app-modal";
|
||||||
|
|
||||||
@@ -29,96 +30,119 @@ export const AppSelectModal = createModal<AppSelectModalProps>(({ actions, inner
|
|||||||
);
|
);
|
||||||
|
|
||||||
const handleSelect = (app: RouterOutputs["app"]["selectable"][number]) => {
|
const handleSelect = (app: RouterOutputs["app"]["selectable"][number]) => {
|
||||||
if (innerProps.onSelect) {
|
innerProps.onSelect?.(app);
|
||||||
innerProps.onSelect(app);
|
|
||||||
}
|
|
||||||
actions.closeModal();
|
actions.closeModal();
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleAddNewApp = () => {
|
const handleAddNewApp = () => {
|
||||||
openQuickAddAppModal({
|
openQuickAddAppModal({
|
||||||
onClose(app) {
|
onClose(app) {
|
||||||
if (innerProps.onSelect) {
|
innerProps.onSelect?.(app);
|
||||||
innerProps.onSelect(app);
|
|
||||||
}
|
|
||||||
actions.closeModal();
|
actions.closeModal();
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack>
|
<SelectGridLayout
|
||||||
<Input
|
search={search}
|
||||||
value={search}
|
onSearchChange={setSearch}
|
||||||
onChange={(event) => setSearch(event.currentTarget.value)}
|
placeholder={`${t("app.action.select.search")}...`}
|
||||||
leftSection={<IconSearch />}
|
onSearchKeyDown={(event) => {
|
||||||
placeholder={`${t("app.action.select.search")}...`}
|
if (event.key === "Enter" && filteredApps.length === 1 && filteredApps[0]) {
|
||||||
data-autofocus
|
handleSelect(filteredApps[0]);
|
||||||
onKeyDown={(event) => {
|
}
|
||||||
if (event.key === "Enter" && filteredApps.length === 1 && filteredApps[0]) {
|
}}
|
||||||
handleSelect(filteredApps[0]);
|
>
|
||||||
}
|
{innerProps.withCreate && (
|
||||||
}}
|
<Card
|
||||||
/>
|
h={selectGridCardHeight}
|
||||||
|
withBorder
|
||||||
|
pos="relative"
|
||||||
|
style={{ overflow: "hidden", "--_hover-opacity": "0" }}
|
||||||
|
onMouseEnter={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "1")}
|
||||||
|
onMouseLeave={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "0")}
|
||||||
|
>
|
||||||
|
<Stack h="100%" gap="xs">
|
||||||
|
<Group gap="sm" wrap="nowrap" align="flex-start">
|
||||||
|
<IconPlus size={22} style={{ flexShrink: 0, marginTop: 2 }} />
|
||||||
|
<Text lh={1.2} style={{ whiteSpace: "normal" }} fw={500} size="sm" lineClamp={2}>
|
||||||
|
{t("app.action.create.title")}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
<Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" c="dimmed" lineClamp={1}>
|
||||||
|
{t("app.action.create.description")}
|
||||||
|
</Text>
|
||||||
|
</Stack>
|
||||||
|
<Box
|
||||||
|
pos="absolute"
|
||||||
|
bottom={0}
|
||||||
|
left={0}
|
||||||
|
right={0}
|
||||||
|
p="xs"
|
||||||
|
style={{
|
||||||
|
opacity: "var(--_hover-opacity)",
|
||||||
|
transition: "opacity 150ms ease",
|
||||||
|
background: "linear-gradient(transparent, var(--mantine-color-body) 30%)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button onClick={handleAddNewApp} variant="light" size="xs" fullWidth>
|
||||||
|
{t("app.action.create.action")}
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
</Card>
|
||||||
|
)}
|
||||||
|
|
||||||
<Grid>
|
{filteredApps.map((app) => (
|
||||||
{innerProps.withCreate && (
|
<Card
|
||||||
<Grid.Col span={{ xs: 12, sm: 4, md: 3 }}>
|
key={app.id}
|
||||||
<Card h="100%">
|
h={selectGridCardHeight}
|
||||||
<Stack justify="space-between" h="100%">
|
withBorder
|
||||||
<Stack gap="xs">
|
pos="relative"
|
||||||
<Center>
|
style={{ overflow: "hidden", "--_hover-opacity": "0" }}
|
||||||
<IconPlus size={24} />
|
onMouseEnter={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "1")}
|
||||||
</Center>
|
onMouseLeave={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "0")}
|
||||||
<Text lh={1.2} style={{ whiteSpace: "normal" }} ta="center">
|
>
|
||||||
{t("app.action.create.title")}
|
<Stack h="100%" gap="xs">
|
||||||
</Text>
|
<Group gap="sm" wrap="nowrap" align="flex-start">
|
||||||
<Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" ta="center" c="dimmed">
|
<img src={app.iconUrl} alt={app.name} width={22} height={22} style={{ flexShrink: 0, marginTop: 2 }} />
|
||||||
{t("app.action.create.description")}
|
<Text lh={1.2} style={{ whiteSpace: "normal" }} fw={500} size="sm" lineClamp={2}>
|
||||||
</Text>
|
{app.name}
|
||||||
</Stack>
|
</Text>
|
||||||
<Button onClick={handleAddNewApp} variant="light" size="xs" mt="auto" fullWidth>
|
</Group>
|
||||||
{t("app.action.create.action")}
|
<Tooltip label={app.description} multiline w={250} disabled={!app.description}>
|
||||||
</Button>
|
<Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" c="dimmed" lineClamp={1}>
|
||||||
</Stack>
|
{app.description ?? ""}
|
||||||
</Card>
|
</Text>
|
||||||
</Grid.Col>
|
</Tooltip>
|
||||||
)}
|
</Stack>
|
||||||
|
<Box
|
||||||
|
pos="absolute"
|
||||||
|
bottom={0}
|
||||||
|
left={0}
|
||||||
|
right={0}
|
||||||
|
p="xs"
|
||||||
|
style={{
|
||||||
|
opacity: "var(--_hover-opacity)",
|
||||||
|
transition: "opacity 150ms ease",
|
||||||
|
background: "linear-gradient(transparent, var(--mantine-color-body) 30%)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button onClick={() => handleSelect(app)} variant="light" size="xs" fullWidth>
|
||||||
|
{t("app.action.select.action", { app: app.name })}
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
</Card>
|
||||||
|
))}
|
||||||
|
|
||||||
{filteredApps.map((app) => (
|
{filteredApps.length === 0 && !isPending && (
|
||||||
<Grid.Col key={app.id} span={{ xs: 12, sm: 4, md: 3 }}>
|
<Center p="xl">
|
||||||
<Card h="100%">
|
<Text c="dimmed">{t("app.action.select.noResults")}</Text>
|
||||||
<Stack justify="space-between" h="100%">
|
</Center>
|
||||||
<Stack gap="xs">
|
)}
|
||||||
<Center>
|
</SelectGridLayout>
|
||||||
<img src={app.iconUrl} alt={app.name} width={24} height={24} />
|
|
||||||
</Center>
|
|
||||||
<Text lh={1.2} style={{ whiteSpace: "normal" }} ta="center">
|
|
||||||
{app.name}
|
|
||||||
</Text>
|
|
||||||
<Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" ta="center" c="dimmed">
|
|
||||||
{app.description ?? ""}
|
|
||||||
</Text>
|
|
||||||
</Stack>
|
|
||||||
<Button onClick={() => handleSelect(app)} variant="light" size="xs" mt="auto" fullWidth>
|
|
||||||
{t("app.action.select.action", { app: app.name })}
|
|
||||||
</Button>
|
|
||||||
</Stack>
|
|
||||||
</Card>
|
|
||||||
</Grid.Col>
|
|
||||||
))}
|
|
||||||
|
|
||||||
{filteredApps.length === 0 && !isPending && (
|
|
||||||
<Grid.Col span={12}>
|
|
||||||
<Center p="xl">
|
|
||||||
<Text c="dimmed">{t("app.action.select.noResults")}</Text>
|
|
||||||
</Center>
|
|
||||||
</Grid.Col>
|
|
||||||
)}
|
|
||||||
</Grid>
|
|
||||||
</Stack>
|
|
||||||
);
|
);
|
||||||
}).withOptions({
|
}).withOptions({
|
||||||
defaultTitle: (t) => t("app.action.select.title"),
|
defaultTitle: (t) => t("app.action.select.title"),
|
||||||
size: "xl",
|
size: modalSizeSelect,
|
||||||
});
|
});
|
||||||
@@ -3,7 +3,7 @@ import type { z } from "zod/v4";
|
|||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { AppForm } from "@homarr/forms-collection";
|
import { AppForm } from "@homarr/forms-collection";
|
||||||
import { createModal } from "@homarr/modals";
|
import { createModal, modalSizeForm } from "@homarr/modals";
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
||||||
import type { appManageSchema } from "@homarr/validation/app";
|
import type { appManageSchema } from "@homarr/validation/app";
|
||||||
@@ -54,4 +54,5 @@ export const QuickAddAppModal = createModal<QuickAddAppModalProps>(({ actions, i
|
|||||||
defaultTitle(t) {
|
defaultTitle(t) {
|
||||||
return t("board.action.quickCreateApp.modal.title");
|
return t("board.action.quickCreateApp.modal.title");
|
||||||
},
|
},
|
||||||
|
size: modalSizeForm,
|
||||||
});
|
});
|
||||||
@@ -1,2 +1,4 @@
|
|||||||
export { ModalProvider, useModalAction, useConfirmModal } from "./src";
|
export { ModalProvider, useModalAction, useConfirmModal } from "./src";
|
||||||
export { createModal } from "./src/creator";
|
export { createModal } from "./src/creator";
|
||||||
|
export { ModalFormFooter } from "./src/modal-form-footer";
|
||||||
|
export { modalSizeForm, modalSizeSelect } from "./src/modal-sizes";
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import type { ReactNode } from "react";
|
||||||
|
import { Button, Group } from "@mantine/core";
|
||||||
|
|
||||||
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
|
interface ModalFormFooterProps {
|
||||||
|
onCancel: () => void;
|
||||||
|
submitLabel?: string;
|
||||||
|
cancelLabel?: string;
|
||||||
|
loading?: boolean;
|
||||||
|
leftSection?: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ActionButtons = ({
|
||||||
|
onCancel,
|
||||||
|
submitLabel,
|
||||||
|
cancelLabel,
|
||||||
|
loading,
|
||||||
|
}: Pick<ModalFormFooterProps, "onCancel" | "submitLabel" | "cancelLabel" | "loading">) => {
|
||||||
|
const t = useI18n();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Button onClick={onCancel} variant="subtle" color="gray">
|
||||||
|
{cancelLabel ?? t("common.action.cancel")}
|
||||||
|
</Button>
|
||||||
|
<Button type="submit" loading={loading}>
|
||||||
|
{submitLabel ?? t("common.action.saveChanges")}
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const ModalFormFooter = ({ onCancel, submitLabel, cancelLabel, loading, leftSection }: ModalFormFooterProps) => {
|
||||||
|
const actionButtons = (
|
||||||
|
<ActionButtons onCancel={onCancel} submitLabel={submitLabel} cancelLabel={cancelLabel} loading={loading} />
|
||||||
|
);
|
||||||
|
|
||||||
|
if (leftSection) {
|
||||||
|
return (
|
||||||
|
<Group justify="space-between">
|
||||||
|
{leftSection}
|
||||||
|
<Group justify="end" w={{ base: "100%", xs: "auto" }}>
|
||||||
|
{actionButtons}
|
||||||
|
</Group>
|
||||||
|
</Group>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return <Group justify="end">{actionButtons}</Group>;
|
||||||
|
};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export { modalSizeForm, modalSizeSelect } from "@homarr/ui";
|
||||||
@@ -69,7 +69,7 @@ export const InitialOldmarrImport = ({ file, analyseResult }: InitialOldmarrImpo
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack mb="sm">
|
<Stack w="100%" mb="sm">
|
||||||
<ImportSettingsCard
|
<ImportSettingsCard
|
||||||
settings={settings}
|
settings={settings}
|
||||||
updateSetting={(setting, value) => {
|
updateSetting={(setting, value) => {
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ export const BoardSelectionCard = ({ selections, updateSelections }: BoardSelect
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
<Card w="100%" withBorder={false}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Group justify="space-between" align="center">
|
<Group justify="space-between" align="center">
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ interface ImportSettingsCardProps {
|
|||||||
export const ImportSettingsCard = ({ settings, updateSetting }: ImportSettingsCardProps) => {
|
export const ImportSettingsCard = ({ settings, updateSetting }: ImportSettingsCardProps) => {
|
||||||
const tImportSettings = useScopedI18n("init.step.import.importSettings");
|
const tImportSettings = useScopedI18n("init.step.import.importSettings");
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
<Card w="100%" withBorder={false}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Text fw={500}>{tImportSettings("title")}</Text>
|
<Text fw={500}>{tImportSettings("title")}</Text>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ interface ImportSummaryCardProps {
|
|||||||
export const ImportSummaryCard = ({ counts, onSubmit, loading }: ImportSummaryCardProps) => {
|
export const ImportSummaryCard = ({ counts, onSubmit, loading }: ImportSummaryCardProps) => {
|
||||||
const tSummary = useScopedI18n("init.step.import.summary");
|
const tSummary = useScopedI18n("init.step.import.summary");
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
<Card w="100%" withBorder={false}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Text fw={500}>{tSummary("title")}</Text>
|
<Text fw={500}>{tSummary("title")}</Text>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
|
|||||||
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
import { db, like, or } from "@homarr/db";
|
import { db, like, or } from "@homarr/db";
|
||||||
import { icons } from "@homarr/db/schema";
|
import { icons } from "@homarr/db/schema";
|
||||||
|
import { extractContainerImageName } from "@homarr/definitions";
|
||||||
import type { ContainerState, Port } from "@homarr/docker";
|
import type { ContainerState, Port } from "@homarr/docker";
|
||||||
import { dockerLabels, DockerSingleton } from "@homarr/docker";
|
import { dockerLabels, DockerSingleton } from "@homarr/docker";
|
||||||
|
|
||||||
@@ -180,7 +181,7 @@ export const dockerContainersRequestHandler = createCachedWidgetRequestHandler({
|
|||||||
cacheDuration: dayjs.duration(20, "seconds"),
|
cacheDuration: dayjs.duration(20, "seconds"),
|
||||||
});
|
});
|
||||||
|
|
||||||
const extractImage = (container: ContainerInfo) => container.Image.split("/").at(-1)?.split(":").at(0) ?? "";
|
const extractImage = (container: ContainerInfo) => extractContainerImageName(container.Image);
|
||||||
|
|
||||||
async function getContainersWithStatsAsync() {
|
async function getContainersWithStatsAsync() {
|
||||||
const dockerInstances = DockerSingleton.getInstances();
|
const dockerInstances = DockerSingleton.getInstances();
|
||||||
|
|||||||
@@ -90,6 +90,48 @@
|
|||||||
"title": "Settings",
|
"title": "Settings",
|
||||||
"subtitle": "Configure server settings."
|
"subtitle": "Configure server settings."
|
||||||
},
|
},
|
||||||
|
"integrations": {
|
||||||
|
"title": "Integrations",
|
||||||
|
"subtitle": "Select the services you use.",
|
||||||
|
"description": "Choose the integrations you'd like to connect. We'll set up your dashboard with matching widgets automatically.",
|
||||||
|
"action": {
|
||||||
|
"continue": "Continue",
|
||||||
|
"skip": "Skip for now"
|
||||||
|
},
|
||||||
|
"configure": {
|
||||||
|
"progress": "{current} of {total}",
|
||||||
|
"skip": "Skip this integration",
|
||||||
|
"finishing": "Setting up your dashboard...",
|
||||||
|
"error": {
|
||||||
|
"title": "Setup failed",
|
||||||
|
"message": "Something went wrong while setting up your dashboard. Please try again."
|
||||||
|
},
|
||||||
|
"helpers": {
|
||||||
|
"tooltip": "URL helpers",
|
||||||
|
"description": "These helpers try to guess the URL for your services. If it doesn't work, just type the address manually."
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"urlTemplate": {
|
||||||
|
"label": "Base URL",
|
||||||
|
"placeholder": "homelab.local or 192.168.1.1",
|
||||||
|
"hint": "Enter your base domain or IP to auto-fill integration URLs",
|
||||||
|
"warning": "Setting your base URL now will auto-fill all integration URLs, saving you time during setup",
|
||||||
|
"preview": "e.g. {example}",
|
||||||
|
"mode": {
|
||||||
|
"subdomain": "Subdomain",
|
||||||
|
"hostPort": "Host:Port"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"docker": {
|
||||||
|
"detected": "Docker detected {count} services",
|
||||||
|
"detectedBreakdown": "{integrations} integrations · {apps} apps",
|
||||||
|
"summary": "Homarr detected {apps} apps, {integrations} of which have integrations built-in",
|
||||||
|
"appBadge": "App",
|
||||||
|
"appSectionLabel": "Apps to add to dashboard ({count} selected)",
|
||||||
|
"scanning": "Scanning Docker...",
|
||||||
|
"scanningDescription": "Looking for running containers on your system"
|
||||||
|
}
|
||||||
|
},
|
||||||
"finish": {
|
"finish": {
|
||||||
"title": "Finish setup",
|
"title": "Finish setup",
|
||||||
"subtitle": "You are ready to go!",
|
"subtitle": "You are ready to go!",
|
||||||
@@ -731,11 +773,46 @@
|
|||||||
},
|
},
|
||||||
"appHref": {
|
"appHref": {
|
||||||
"placeholder": "Custom app URL"
|
"placeholder": "Custom app URL"
|
||||||
|
},
|
||||||
|
"apiKeySettings": {
|
||||||
|
"label": "Get API key"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"action": {
|
"action": {
|
||||||
"create": "New integration"
|
"create": "New integration"
|
||||||
},
|
},
|
||||||
|
"grid": {
|
||||||
|
"widgetCount": "{count} widgets",
|
||||||
|
"noWidgets": "No widgets",
|
||||||
|
"detected": "Detected via Docker"
|
||||||
|
},
|
||||||
|
"category": {
|
||||||
|
"dnsHole": "DNS",
|
||||||
|
"mediaService": "Media",
|
||||||
|
"calendar": "Calendar",
|
||||||
|
"mediaSearch": "Search",
|
||||||
|
"mediaRelease": "Releases",
|
||||||
|
"mediaRequest": "Requests",
|
||||||
|
"downloadClient": "Downloads",
|
||||||
|
"usenet": "Usenet",
|
||||||
|
"torrent": "Torrent",
|
||||||
|
"miscellaneous": "Misc",
|
||||||
|
"smartHomeServer": "Smart Home",
|
||||||
|
"indexerManager": "Indexer",
|
||||||
|
"healthMonitoring": "Health",
|
||||||
|
"search": "Search",
|
||||||
|
"mediaTranscoding": "Transcoding",
|
||||||
|
"networkController": "Network",
|
||||||
|
"releasesProvider": "Releases",
|
||||||
|
"notifications": "Notifications",
|
||||||
|
"firewall": "Firewall",
|
||||||
|
"timetable": "Timetable",
|
||||||
|
"photoService": "Photos",
|
||||||
|
"notes": "Notes",
|
||||||
|
"mediaMonitoring": "Monitoring",
|
||||||
|
"speedtest": "Speed Test",
|
||||||
|
"analytics": "Analytics"
|
||||||
|
},
|
||||||
"testConnection": {
|
"testConnection": {
|
||||||
"action": {
|
"action": {
|
||||||
"create": "Test connection and create",
|
"create": "Test connection and create",
|
||||||
@@ -1068,6 +1145,7 @@
|
|||||||
"add": "Add",
|
"add": "Add",
|
||||||
"apply": "Apply",
|
"apply": "Apply",
|
||||||
"backToOverview": "Back to overview",
|
"backToOverview": "Back to overview",
|
||||||
|
"skip": "Skip",
|
||||||
"change": "Change",
|
"change": "Change",
|
||||||
"create": "Create",
|
"create": "Create",
|
||||||
"createAnother": "Create and start over",
|
"createAnother": "Create and start over",
|
||||||
|
|||||||
@@ -16,3 +16,9 @@ export { MaskedImage } from "./masked-image";
|
|||||||
export { MaskedOrNormalImage } from "./masked-or-normal-image";
|
export { MaskedOrNormalImage } from "./masked-or-normal-image";
|
||||||
export { LanguageIcon } from "./language-icon";
|
export { LanguageIcon } from "./language-icon";
|
||||||
export { Link } from "./link";
|
export { Link } from "./link";
|
||||||
|
export {
|
||||||
|
SelectGridLayout,
|
||||||
|
selectGridCardHeight,
|
||||||
|
selectGridCols,
|
||||||
|
selectGridScrollMaxHeight,
|
||||||
|
} from "../select-grid-layout";
|
||||||
@@ -3,6 +3,7 @@ import type { MantineProviderProps } from "@mantine/core";
|
|||||||
import { theme } from "./theme";
|
import { theme } from "./theme";
|
||||||
|
|
||||||
export { theme } from "./theme";
|
export { theme } from "./theme";
|
||||||
|
export { modalSizeForm, modalSizeSelect } from "./theme/modal";
|
||||||
export * from "./components";
|
export * from "./components";
|
||||||
|
|
||||||
export const uiConfiguration = {
|
export const uiConfiguration = {
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import type { KeyboardEvent, ReactNode } from "react";
|
||||||
|
import { Input, ScrollArea, SimpleGrid, Stack } from "@mantine/core";
|
||||||
|
import { IconSearch } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
export const selectGridCols = { base: 2, xs: 3, sm: 4, md: 5 };
|
||||||
|
export const selectGridCardHeight = 140;
|
||||||
|
export const selectGridScrollMaxHeight = "70vh";
|
||||||
|
|
||||||
|
interface SelectGridLayoutProps {
|
||||||
|
search: string;
|
||||||
|
onSearchChange: (value: string) => void;
|
||||||
|
placeholder: string;
|
||||||
|
onSearchKeyDown?: (event: KeyboardEvent<HTMLInputElement>) => void;
|
||||||
|
disableScroll?: boolean;
|
||||||
|
disableAutoFocus?: boolean;
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const SelectGridLayout = ({
|
||||||
|
search,
|
||||||
|
onSearchChange,
|
||||||
|
placeholder,
|
||||||
|
onSearchKeyDown,
|
||||||
|
disableScroll = false,
|
||||||
|
disableAutoFocus = false,
|
||||||
|
children,
|
||||||
|
}: SelectGridLayoutProps) => {
|
||||||
|
const grid = (
|
||||||
|
<SimpleGrid cols={selectGridCols} spacing="sm">
|
||||||
|
{children}
|
||||||
|
</SimpleGrid>
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack>
|
||||||
|
<Input
|
||||||
|
value={search}
|
||||||
|
onChange={(event) => onSearchChange(event.currentTarget.value)}
|
||||||
|
leftSection={<IconSearch />}
|
||||||
|
placeholder={placeholder}
|
||||||
|
data-autofocus={disableAutoFocus ? undefined : true}
|
||||||
|
onKeyDown={onSearchKeyDown}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{disableScroll ? grid : <ScrollArea.Autosize mah={selectGridScrollMaxHeight}>{grid}</ScrollArea.Autosize>}
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
import { createTheme, rem } from "@mantine/core";
|
import { createTheme, rem } from "@mantine/core";
|
||||||
|
|
||||||
|
import { modalComponent } from "./theme/modal";
|
||||||
|
|
||||||
export const theme = createTheme({
|
export const theme = createTheme({
|
||||||
primaryColor: "red",
|
primaryColor: "red",
|
||||||
autoContrast: true,
|
autoContrast: true,
|
||||||
@@ -99,5 +101,6 @@ export const theme = createTheme({
|
|||||||
overlayProps: { radius: "sm", blur: 2 },
|
overlayProps: { radius: "sm", blur: 2 },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Modal: modalComponent,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import type { MantineTheme, MantineThemeComponent, ModalProps } from "@mantine/core";
|
||||||
|
|
||||||
|
export const modalSizeSelect = "xxl";
|
||||||
|
export const modalSizeForm = "lg";
|
||||||
|
|
||||||
|
const fixedModalSizes = new Set([modalSizeSelect, modalSizeForm]);
|
||||||
|
|
||||||
|
const modalWidth = "min(var(--modal-size), calc(100vw - 2 * var(--mantine-spacing-md)))";
|
||||||
|
|
||||||
|
export const modalComponent: MantineThemeComponent = {
|
||||||
|
vars: (_theme: MantineTheme, props: Partial<ModalProps>) => {
|
||||||
|
if (props.size === modalSizeSelect) {
|
||||||
|
return { root: { "--modal-size": "75rem" } };
|
||||||
|
}
|
||||||
|
return { root: {} };
|
||||||
|
},
|
||||||
|
styles: (_theme: MantineTheme, props: Partial<ModalProps>) => {
|
||||||
|
const isFixedSize = typeof props.size === "string" && fixedModalSizes.has(props.size);
|
||||||
|
if (!isFixedSize) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
content: {
|
||||||
|
width: modalWidth,
|
||||||
|
minWidth: modalWidth,
|
||||||
|
},
|
||||||
|
body: {
|
||||||
|
width: "100%",
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
import { memo, useState } from "react";
|
import { memo, useState } from "react";
|
||||||
import type { SelectProps } from "@mantine/core";
|
import type { SelectProps } from "@mantine/core";
|
||||||
import { Button, Group, Loader, Select, Stack } from "@mantine/core";
|
import { Group, Loader, Select, Stack } from "@mantine/core";
|
||||||
import { IconCheck } from "@tabler/icons-react";
|
import { IconCheck } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { useForm } from "@homarr/form";
|
import { useForm } from "@homarr/form";
|
||||||
import { createModal } from "@homarr/modals";
|
import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
interface InnerProps {
|
interface InnerProps {
|
||||||
@@ -47,6 +47,7 @@ export const AppSelectModal = createModal<InnerProps>(({ actions, innerProps })
|
|||||||
label={t("app.action.select.label")}
|
label={t("app.action.select.label")}
|
||||||
searchable
|
searchable
|
||||||
clearable
|
clearable
|
||||||
|
data-autofocus
|
||||||
leftSection={<MemoizedLeftSection isPending={isPending} currentApp={currentApp} />}
|
leftSection={<MemoizedLeftSection isPending={isPending} currentApp={currentApp} />}
|
||||||
nothingFoundMessage={t("app.action.select.notFound")}
|
nothingFoundMessage={t("app.action.select.notFound")}
|
||||||
renderOption={renderSelectOption}
|
renderOption={renderSelectOption}
|
||||||
@@ -61,19 +62,13 @@ export const AppSelectModal = createModal<InnerProps>(({ actions, innerProps })
|
|||||||
})) ?? []
|
})) ?? []
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<Group justify="end">
|
<ModalFormFooter onCancel={actions.closeModal} submitLabel={confirmLabel} loading={loading} />
|
||||||
<Button variant="default" onClick={actions.closeModal}>
|
|
||||||
{t("common.action.cancel")}
|
|
||||||
</Button>
|
|
||||||
<Button type="submit" loading={loading}>
|
|
||||||
{confirmLabel}
|
|
||||||
</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
}).withOptions({
|
}).withOptions({
|
||||||
defaultTitle: (t) => t("app.action.select.label"),
|
defaultTitle: (t) => t("app.action.select.label"),
|
||||||
|
size: modalSizeForm,
|
||||||
});
|
});
|
||||||
|
|
||||||
const iconProps = {
|
const iconProps = {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Button, CloseButton, ColorInput, Group, Input, Stack, TextInput, useMantineTheme } from "@mantine/core";
|
import { CloseButton, ColorInput, Input, Stack, TextInput, useMantineTheme } from "@mantine/core";
|
||||||
|
|
||||||
import { useForm } from "@homarr/form";
|
import { useForm } from "@homarr/form";
|
||||||
import { createModal } from "@homarr/modals";
|
import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
import { TextMultiSelect } from "@homarr/ui";
|
import { TextMultiSelect } from "@homarr/ui";
|
||||||
import type { BoardItemAdvancedOptions } from "@homarr/validation/shared";
|
import type { BoardItemAdvancedOptions } from "@homarr/validation/shared";
|
||||||
@@ -34,6 +34,7 @@ export const WidgetAdvancedOptionsModal = createModal<InnerProps>(({ actions, in
|
|||||||
<Stack>
|
<Stack>
|
||||||
<TextInput
|
<TextInput
|
||||||
label={t("item.edit.field.title.label")}
|
label={t("item.edit.field.title.label")}
|
||||||
|
data-autofocus
|
||||||
{...form.getInputProps("title")}
|
{...form.getInputProps("title")}
|
||||||
rightSection={<Input.ClearButton onClick={() => form.setFieldValue("title", "")} />}
|
rightSection={<Input.ClearButton onClick={() => form.setFieldValue("title", "")} />}
|
||||||
/>
|
/>
|
||||||
@@ -53,12 +54,7 @@ export const WidgetAdvancedOptionsModal = createModal<InnerProps>(({ actions, in
|
|||||||
}
|
}
|
||||||
{...form.getInputProps("borderColor")}
|
{...form.getInputProps("borderColor")}
|
||||||
/>
|
/>
|
||||||
<Group justify="end">
|
<ModalFormFooter onCancel={actions.closeModal} />
|
||||||
<Button onClick={actions.closeModal} variant="subtle" color="gray">
|
|
||||||
{t("common.action.cancel")}
|
|
||||||
</Button>
|
|
||||||
<Button type="submit">{t("common.action.saveChanges")}</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
@@ -66,7 +62,7 @@ export const WidgetAdvancedOptionsModal = createModal<InnerProps>(({ actions, in
|
|||||||
defaultTitle(t) {
|
defaultTitle(t) {
|
||||||
return t("item.edit.advancedOptions.title");
|
return t("item.edit.advancedOptions.title");
|
||||||
},
|
},
|
||||||
size: "lg",
|
size: modalSizeForm,
|
||||||
transitionProps: {
|
transitionProps: {
|
||||||
duration: 0,
|
duration: 0,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { z } from "zod/v4";
|
|||||||
import { objectEntries } from "@homarr/common";
|
import { objectEntries } from "@homarr/common";
|
||||||
import { useSession } from "@homarr/auth/client";
|
import { useSession } from "@homarr/auth/client";
|
||||||
import type { WidgetKind } from "@homarr/definitions";
|
import type { WidgetKind } from "@homarr/definitions";
|
||||||
import { createModal, useModalAction } from "@homarr/modals";
|
import { createModal, ModalFormFooter, modalSizeForm, useModalAction } from "@homarr/modals";
|
||||||
import type { SettingsContextProps } from "@homarr/settings/creator";
|
import type { SettingsContextProps } from "@homarr/settings/creator";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
import { zodErrorMap } from "@homarr/validation/form/i18n";
|
import { zodErrorMap } from "@homarr/validation/form/i18n";
|
||||||
@@ -145,9 +145,10 @@ export const WidgetEditModal = createModal<ModalProps<WidgetKind>>(({ actions, i
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
<Group justify="space-between">
|
{showAppTab ? (
|
||||||
<Button
|
<Button
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
|
type="button"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
openModal({
|
openModal({
|
||||||
advancedOptions,
|
advancedOptions,
|
||||||
@@ -163,17 +164,31 @@ export const WidgetEditModal = createModal<ModalProps<WidgetKind>>(({ actions, i
|
|||||||
>
|
>
|
||||||
{t("item.edit.advancedOptions.label")}
|
{t("item.edit.advancedOptions.label")}
|
||||||
</Button>
|
</Button>
|
||||||
{!showAppTab && (
|
) : (
|
||||||
<Group justify="end" w={{ base: "100%", xs: "auto" }}>
|
<ModalFormFooter
|
||||||
<Button onClick={actions.closeModal} variant="subtle" color="gray">
|
onCancel={actions.closeModal}
|
||||||
{t("common.action.cancel")}
|
leftSection={
|
||||||
|
<Button
|
||||||
|
variant="subtle"
|
||||||
|
type="button"
|
||||||
|
onClick={() =>
|
||||||
|
openModal({
|
||||||
|
advancedOptions,
|
||||||
|
onSuccess(options) {
|
||||||
|
setAdvancedOptions(options);
|
||||||
|
innerProps.onSuccessfulEdit({
|
||||||
|
...innerProps.value,
|
||||||
|
advancedOptions: options,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{t("item.edit.advancedOptions.label")}
|
||||||
</Button>
|
</Button>
|
||||||
<Button type="submit" loading={isSubmitting}>
|
}
|
||||||
{t("common.action.saveChanges")}
|
/>
|
||||||
</Button>
|
)}
|
||||||
</Group>
|
|
||||||
)}
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -214,5 +229,5 @@ export const WidgetEditModal = createModal<ModalProps<WidgetKind>>(({ actions, i
|
|||||||
defaultTitle(t) {
|
defaultTitle(t) {
|
||||||
return t("item.edit.title");
|
return t("item.edit.title");
|
||||||
},
|
},
|
||||||
size: "lg",
|
size: modalSizeForm,
|
||||||
});
|
});
|
||||||
Reference in new issue
Block a user