Compare commits
67
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
53fcc6997c | ||
|
|
69e64356bb | ||
|
|
f2705eeb57 | ||
|
|
ac37d2c73f | ||
|
|
e00ea624cd | ||
|
|
20b62c42e3 | ||
|
|
59971991c7 | ||
|
|
a629681ae5 | ||
|
|
572d5fb5ec | ||
|
|
91a1858743 | ||
|
|
f00d3627c9 | ||
|
|
7760e01ccb | ||
|
|
efd37dca93 | ||
|
|
796c679140 | ||
|
|
76fd4c5fb1 | ||
|
|
68f24e34d5 | ||
|
|
22d7ebab50 | ||
|
|
4f5f3e14a1 | ||
|
|
dbf021e04a | ||
|
|
cc24f070db | ||
|
|
0b663a7fc6 | ||
|
|
0dc2558faf | ||
|
|
dd7a4908a3 | ||
|
|
0a6467979a | ||
|
|
25d964a197 | ||
|
|
3d3e3059a9 | ||
|
|
9ae8cb2768 | ||
|
|
99346f288b | ||
|
|
41fe5928f1 | ||
|
|
6eb59d6f53 | ||
|
|
2c6b7a818e | ||
|
|
fd10788838 | ||
|
|
fe4598f722 | ||
|
|
a755692d81 | ||
|
|
3ff0d72ba1 | ||
|
|
a63a191203 | ||
|
|
1be906a0cd | ||
|
|
63d8fa8c26 | ||
|
|
b5dd6ae8ef | ||
|
|
d540ad374a | ||
|
|
6a971c1986 | ||
|
|
d86fe3ddf0 | ||
|
|
06db8960a7 | ||
|
|
a5719acf34 | ||
|
|
d1d597c8e1 | ||
|
|
657e42e4bb | ||
|
|
256ebcb864 | ||
|
|
72e86dee01 | ||
|
|
b7910b16e0 | ||
|
|
5a83bb6e39 | ||
|
|
433b66582d | ||
|
|
acbcb6818b | ||
|
|
07d991a0a1 | ||
|
|
92364e9574 | ||
|
|
ff1e4c1381 | ||
|
|
21bb20ce0c | ||
|
|
2991777b0a | ||
|
|
6cc2ac56a9 | ||
|
|
92086e060f | ||
|
|
2aa5ab95e6 | ||
|
|
650f761325 | ||
|
|
be61602576 | ||
|
|
d01834d975 | ||
|
|
4a67bf0ef3 | ||
|
|
4454e3fb7a | ||
|
|
92b75cb924 | ||
|
|
1ea008b71c |
No files matched your search
@@ -33,6 +33,7 @@ body:
|
|||||||
options:
|
options:
|
||||||
# The below comment is used to insert a new version with on-release.yml
|
# The below comment is used to insert a new version with on-release.yml
|
||||||
#NEXT_VERSION#
|
#NEXT_VERSION#
|
||||||
|
- 1.64.0
|
||||||
- 1.62.0
|
- 1.62.0
|
||||||
- 1.61.0
|
- 1.61.0
|
||||||
- 1.60.1-beta.1
|
- 1.60.1-beta.1
|
||||||
|
|||||||
@@ -1,3 +1,67 @@
|
|||||||
|
## [1.64.0](https://github.com/homarr-labs/homarr/compare/v1.63.0...v1.64.0) (2026-06-05)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add comprehensive demo mode with mock integrations ([#5870](https://github.com/homarr-labs/homarr/issues/5870)) ([0a64679](https://github.com/homarr-labs/homarr/commit/0a6467979a5e3b3e3eae6252c31fca1d9af54dc1))
|
||||||
|
* add PeaNUT integration and UPS monitoring widget ([#5862](https://github.com/homarr-labs/homarr/issues/5862)) ([0dc2558](https://github.com/homarr-labs/homarr/commit/0dc2558fafedcbba246c2e968d00cc541ab9f84e))
|
||||||
|
* **docker:** add container logs modal and stats columns ([#4807](https://github.com/homarr-labs/homarr/issues/4807)) ([dbf021e](https://github.com/homarr-labs/homarr/commit/dbf021e04a785b44ad0e2ce45634de371d76de6d))
|
||||||
|
* media request search as first-class spotlight mode ([#5823](https://github.com/homarr-labs/homarr/issues/5823)) ([3d3e305](https://github.com/homarr-labs/homarr/commit/3d3e3059a98b36b6e64e3aad90f715e334baff3e))
|
||||||
|
* **onboarding:** enhance integration setup with Docker discovery and URL templating ([#5607](https://github.com/homarr-labs/homarr/issues/5607)) ([dd7a490](https://github.com/homarr-labs/homarr/commit/dd7a4908a36a71c1d0d1e41524eb8fd9bf53ca4d))
|
||||||
|
* **onboarding:** guided management and board tours ([#5756](https://github.com/homarr-labs/homarr/issues/5756)) ([0b663a7](https://github.com/homarr-labs/homarr/commit/0b663a7fc6c017b9fbe78c019f06d46ee95f165f))
|
||||||
|
* **widgets:** add in-place app editing in widget edit modal ([#5809](https://github.com/homarr-labs/homarr/issues/5809)) ([99346f2](https://github.com/homarr-labs/homarr/commit/99346f288bcfc701c41fecaab6f7bc0438d80563))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add bookmark widget option to toggle card borders ([#5854](https://github.com/homarr-labs/homarr/issues/5854)) ([41fe592](https://github.com/homarr-labs/homarr/commit/41fe5928f19207d02b04e64c2caac49d896f72ce))
|
||||||
|
* **auth:** relax password complexity requirements to suggestions-only ([#5764](https://github.com/homarr-labs/homarr/issues/5764)) ([fd10788](https://github.com/homarr-labs/homarr/commit/fd107888385557ededcf51576c6320a1960690f2))
|
||||||
|
* **db:** log when UNSAFE_ENABLE_MOCK_INTEGRATION is enabled during seeding ([efd37dc](https://github.com/homarr-labs/homarr/commit/efd37dca93be7f5f362331e9b5c2a95a87e24379))
|
||||||
|
* disable onboarding tours when demo mode is enabled ([68f24e3](https://github.com/homarr-labs/homarr/commit/68f24e34d580e3a155c37ca37c3ffd61f296bd0c))
|
||||||
|
* **docker:** restore container selection toolbar broken by Mantine v9 ([#5855](https://github.com/homarr-labs/homarr/issues/5855)) ([fe4598f](https://github.com/homarr-labs/homarr/commit/fe4598f7221a2861b8c5ae0cfd267e8c4fbf48df))
|
||||||
|
* **immich:** respect app color scheme in server-stats widget ([#5859](https://github.com/homarr-labs/homarr/issues/5859)) ([2c6b7a8](https://github.com/homarr-labs/homarr/commit/2c6b7a818e9d32b414b024d711a3b64533e61cb9))
|
||||||
|
* redirect to login after credentials logout instead of crashing on current page ([#5819](https://github.com/homarr-labs/homarr/issues/5819)) ([cc24f07](https://github.com/homarr-labs/homarr/commit/cc24f070db26337a4a2d87d68c7f142ed1118584))
|
||||||
|
* sync docs sitemap and remove stale coolify ts-expect-error ([4f5f3e1](https://github.com/homarr-labs/homarr/commit/4f5f3e14a129a94295d4b8ffb7d3702fdb4f6a74))
|
||||||
|
* **ui:** restore pre-v9 light variant colors ([#5856](https://github.com/homarr-labs/homarr/issues/5856)) ([a755692](https://github.com/homarr-labs/homarr/commit/a755692d81b80b5ff83051a3b7261c01ac10321b))
|
||||||
|
|
||||||
|
## [1.63.0](https://github.com/homarr-labs/homarr/compare/v1.62.0...v1.63.0) (2026-05-29)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **auth:** support custom token endpoint auth methods ([#5806](https://github.com/homarr-labs/homarr/issues/5806)) ([be61602](https://github.com/homarr-labs/homarr/commit/be61602576a8bec4bb7e4928d36e0854e926264d))
|
||||||
|
* auto-open widget settings on add with all integrations pre-selected ([#5767](https://github.com/homarr-labs/homarr/issues/5767)) ([f10bb3a](https://github.com/homarr-labs/homarr/commit/f10bb3ae23fefc9779332733706aa567cc40ba48))
|
||||||
|
* **board:** persist category collapse state in localStorage for guests ([#5714](https://github.com/homarr-labs/homarr/issues/5714)) ([66212b4](https://github.com/homarr-labs/homarr/commit/66212b4e475738e61d2ea78f3a7e72d7a610bf12)), closes [#3355](https://github.com/homarr-labs/homarr/issues/3355)
|
||||||
|
* **manage:** unified management page layout ([#5758](https://github.com/homarr-labs/homarr/issues/5758)) ([c252b4f](https://github.com/homarr-labs/homarr/commit/c252b4f9accc4523f222354c73f687714640701f))
|
||||||
|
* **users:** rework general settings ([#4915](https://github.com/homarr-labs/homarr/issues/4915)) ([2991777](https://github.com/homarr-labs/homarr/commit/2991777b0a0ae72522d0769a86a91250d618dbe6))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* matine ui fixes for concistency ([#5733](https://github.com/homarr-labs/homarr/issues/5733)) ([4454e3f](https://github.com/homarr-labs/homarr/commit/4454e3fb7afa624ee2f1eaec015f2725e664ac46))
|
||||||
|
* parse Speedtest Tracker created_at as local time ([#5751](https://github.com/homarr-labs/homarr/issues/5751)) ([b19549b](https://github.com/homarr-labs/homarr/commit/b19549b601636bcbc2fadaa270a77a9fdb48b77a))
|
||||||
|
* prevent GitHub releases check from blocking app on API failure ([#5807](https://github.com/homarr-labs/homarr/issues/5807)) ([6cc2ac5](https://github.com/homarr-labs/homarr/commit/6cc2ac56a920563c47aaaab1b33b19a9b6d5ecee))
|
||||||
|
* **ui:** use imported theme instead of undefined createTheme ([4a67bf0](https://github.com/homarr-labs/homarr/commit/4a67bf0ef30ff8d10b06d2d3719ccab792395669))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* **boards:** parallelize board page data fetching ([#5736](https://github.com/homarr-labs/homarr/issues/5736)) ([8f03a38](https://github.com/homarr-labs/homarr/commit/8f03a38de5b9b385da7ffcc9a963be00710acb5e))
|
||||||
|
|
||||||
|
## [1.62.0](https://github.com/homarr-labs/homarr/compare/v1.61.1...v1.62.0) (2026-05-22)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **seed:** add demo mode with pre-seeded user ([#5739](https://github.com/homarr-labs/homarr/issues/5739)) ([dade477](https://github.com/homarr-labs/homarr/commit/dade477b3226765eb614e66588ebee84c45cb688))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **deps:** update dependency better-sqlite3 to ^12.10.0 ([#5727](https://github.com/homarr-labs/homarr/issues/5727)) ([044ad9e](https://github.com/homarr-labs/homarr/commit/044ad9edf9c1dc9b50b9591dea0b5f0cce4be01a))
|
||||||
|
* **docker:** improve icon matching ([#5693](https://github.com/homarr-labs/homarr/issues/5693)) ([7cd30b6](https://github.com/homarr-labs/homarr/commit/7cd30b640cbf47e4678abda18f83c0924f039b1b))
|
||||||
|
* exclude .env files from Docker build context ([#5738](https://github.com/homarr-labs/homarr/issues/5738)) ([fa73763](https://github.com/homarr-labs/homarr/commit/fa737638a812372d904207fe7af5bd7c6f53d159))
|
||||||
|
* **tracearr:** support absolute image urls ([#5654](https://github.com/homarr-labs/homarr/issues/5654)) ([7a12721](https://github.com/homarr-labs/homarr/commit/7a1272146c597c1f9df89d74b8389f70e7cdd61a))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* (next branch) reduce idle memory on startup ([#5637](https://github.com/homarr-labs/homarr/issues/5637)) ([5ee84f8](https://github.com/homarr-labs/homarr/commit/5ee84f8cf464c308729281cb4db572950ba85a82))
|
||||||
|
* **boards:** remove loading overlay and show board immediately ([#5735](https://github.com/homarr-labs/homarr/issues/5735)) ([df4b57b](https://github.com/homarr-labs/homarr/commit/df4b57bd414d4402522f9210b1470d0561c37274))
|
||||||
|
* **memory:** combine 3 node processes into one ([#5600](https://github.com/homarr-labs/homarr/issues/5600)) ([a1aa550](https://github.com/homarr-labs/homarr/commit/a1aa5505a365688b456090a882770e561479833e))
|
||||||
|
|
||||||
## [1.61.1](https://github.com/homarr-labs/homarr/compare/v1.61.0...v1.61.1) (2026-05-18)
|
## [1.61.1](https://github.com/homarr-labs/homarr/compare/v1.61.0...v1.61.1) (2026-05-18)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"build": "pnpm with-env next build",
|
"build": "pnpm with-env next build",
|
||||||
"clean": "git clean -xdf .next .turbo node_modules",
|
"clean": "git clean -xdf .next .turbo node_modules",
|
||||||
"dev": "pnpm with-env next dev",
|
"dev": "pnpm with-env next dev",
|
||||||
"format": "oxfmt --check .",
|
"format": "oxfmt .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"start": "pnpm with-env next start",
|
"start": "pnpm with-env next start",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
"@dnd-kit/modifiers": "catalog:",
|
"@dnd-kit/modifiers": "catalog:",
|
||||||
"@dnd-kit/sortable": "catalog:",
|
"@dnd-kit/sortable": "catalog:",
|
||||||
"@dnd-kit/utilities": "catalog:",
|
"@dnd-kit/utilities": "catalog:",
|
||||||
|
"@gfazioli/mantine-onboarding-tour": "catalog:",
|
||||||
"@homarr/analytics": "workspace:^0.1.0",
|
"@homarr/analytics": "workspace:^0.1.0",
|
||||||
"@homarr/api": "workspace:^0.1.0",
|
"@homarr/api": "workspace:^0.1.0",
|
||||||
"@homarr/auth": "workspace:^0.1.0",
|
"@homarr/auth": "workspace:^0.1.0",
|
||||||
|
|||||||
@@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
import type { PropsWithChildren } from "react";
|
import type { PropsWithChildren } from "react";
|
||||||
import type { MantineColorScheme, MantineColorSchemeManager } from "@mantine/core";
|
import type { MantineColorScheme, MantineColorSchemeManager } from "@mantine/core";
|
||||||
import { createTheme, DirectionProvider, MantineProvider } from "@mantine/core";
|
import { DirectionProvider, MantineProvider, v8CssVariablesResolver } from "@mantine/core";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { useSession } from "@homarr/auth/client";
|
import { useSession } from "@homarr/auth/client";
|
||||||
import { parseCookies, setClientCookie } from "@homarr/common";
|
import { parseCookies, setClientCookie } from "@homarr/common";
|
||||||
import { colorSchemeCookieKey } from "@homarr/definitions";
|
import { colorSchemeCookieKey } from "@homarr/definitions";
|
||||||
|
import { theme } from "@homarr/ui";
|
||||||
|
|
||||||
export const CustomMantineProvider = ({
|
export const CustomMantineProvider = ({
|
||||||
children,
|
children,
|
||||||
@@ -20,11 +21,8 @@ export const CustomMantineProvider = ({
|
|||||||
<MantineProvider
|
<MantineProvider
|
||||||
defaultColorScheme={defaultColorScheme}
|
defaultColorScheme={defaultColorScheme}
|
||||||
colorSchemeManager={manager}
|
colorSchemeManager={manager}
|
||||||
theme={createTheme({
|
theme={theme}
|
||||||
primaryColor: "red",
|
cssVariablesResolver={v8CssVariablesResolver}
|
||||||
autoContrast: true,
|
|
||||||
defaultRadius: "sm",
|
|
||||||
})}
|
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
</MantineProvider>
|
</MantineProvider>
|
||||||
|
|||||||
@@ -17,10 +17,13 @@ import {
|
|||||||
import superjson from "superjson";
|
import superjson from "superjson";
|
||||||
import type { SuperJSONResult } from "superjson";
|
import type { SuperJSONResult } from "superjson";
|
||||||
|
|
||||||
|
import { TRPCClientError } from "@trpc/client";
|
||||||
|
|
||||||
import type { AppRouter } from "@homarr/api";
|
import type { AppRouter } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
|
import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
|
||||||
import { env } from "@homarr/common/env";
|
import { env } from "@homarr/common/env";
|
||||||
|
import { showWarningNotification } from "@homarr/notifications";
|
||||||
|
|
||||||
const getWebSocketProtocol = () => {
|
const getWebSocketProtocol = () => {
|
||||||
// window is not defined on server side
|
// window is not defined on server side
|
||||||
@@ -56,6 +59,20 @@ export function TRPCReactProvider(props: PropsWithChildren) {
|
|||||||
queries: {
|
queries: {
|
||||||
staleTime: 5 * 1000,
|
staleTime: 5 * 1000,
|
||||||
},
|
},
|
||||||
|
mutations: {
|
||||||
|
onError(error) {
|
||||||
|
if (
|
||||||
|
error instanceof TRPCClientError &&
|
||||||
|
error.data?.code === "FORBIDDEN" &&
|
||||||
|
error.message === "Mutations are disabled in demo mode"
|
||||||
|
) {
|
||||||
|
showWarningNotification({
|
||||||
|
title: "Demo mode",
|
||||||
|
message: "This action is disabled in demo mode.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export default async function InviteUsagePage(props: InviteUsagePageProps) {
|
|||||||
{t("subtitle")}
|
{t("subtitle")}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Card withBorder w={64 * 6} maw="90vw">
|
<Card w={64 * 6} maw="90vw">
|
||||||
<RegistrationForm invite={invite} />
|
<RegistrationForm invite={invite} />
|
||||||
</Card>
|
</Card>
|
||||||
<Text size="xs" c="gray.5" ta="center">
|
<Text size="xs" c="gray.5" ta="center">
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
import { Card, Center, Stack, Text, Title } from "@mantine/core";
|
import { Alert, Card, Center, Code, Stack, Text, Title } from "@mantine/core";
|
||||||
|
import { IconLogin } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { env } from "@homarr/auth/env";
|
import { env } from "@homarr/auth/env";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";
|
import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";
|
||||||
|
|
||||||
|
import { env as appEnv } from "~/env";
|
||||||
|
|
||||||
import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo";
|
import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo";
|
||||||
import { LoginForm } from "./_login-form";
|
import { LoginForm } from "./_login-form";
|
||||||
|
|
||||||
@@ -37,7 +40,14 @@ export default async function Login(props: LoginProps) {
|
|||||||
{t("subtitle")}
|
{t("subtitle")}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Card withBorder w={64 * 6} maw="90vw">
|
{appEnv.DEMO_MODE && (
|
||||||
|
<Alert icon={<IconLogin size={18} />} color="blue" variant="light" w={64 * 6} maw="90vw">
|
||||||
|
<Text size="sm" fw={500}>
|
||||||
|
Demo mode is enabled. Sign in with username <Code>demo</Code> and password <Code>demo</Code>
|
||||||
|
</Text>
|
||||||
|
</Alert>
|
||||||
|
)}
|
||||||
|
<Card w={64 * 6} maw="90vw">
|
||||||
<LoginForm
|
<LoginForm
|
||||||
providers={env.AUTH_PROVIDERS}
|
providers={env.AUTH_PROVIDERS}
|
||||||
oidcClientName={env.AUTH_OIDC_CLIENT_NAME}
|
oidcClientName={env.AUTH_OIDC_CLIENT_NAME}
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
|
|||||||
layout: createBoardLayout({
|
layout: createBoardLayout({
|
||||||
headerActions: <BoardContentHeaderActions />,
|
headerActions: <BoardContentHeaderActions />,
|
||||||
getInitialBoardAsync: getInitialBoard,
|
getInitialBoardAsync: getInitialBoard,
|
||||||
|
withTour: true,
|
||||||
}),
|
}),
|
||||||
// eslint-disable-next-line no-restricted-syntax
|
// eslint-disable-next-line no-restricted-syntax
|
||||||
page: async ({ params }: { params: Promise<TParams> }) => {
|
page: async ({ params }: { params: Promise<TParams> }) => {
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
import { useCallback, useEffect } from "react";
|
import { useCallback, useEffect } from "react";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import { Group, Menu, ScrollArea } from "@mantine/core";
|
import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
|
||||||
|
import { Box, Group, Menu, ScrollArea } from "@mantine/core";
|
||||||
import { useHotkeys } from "@mantine/hooks";
|
import { useHotkeys } from "@mantine/hooks";
|
||||||
import {
|
import {
|
||||||
IconBox,
|
IconBox,
|
||||||
@@ -11,6 +12,7 @@ import {
|
|||||||
IconLayoutBoard,
|
IconLayoutBoard,
|
||||||
IconPencil,
|
IconPencil,
|
||||||
IconPencilOff,
|
IconPencilOff,
|
||||||
|
IconPlug,
|
||||||
IconPlus,
|
IconPlus,
|
||||||
IconReplace,
|
IconReplace,
|
||||||
IconResize,
|
IconResize,
|
||||||
@@ -36,14 +38,16 @@ 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 = () => {
|
||||||
const [isEditMode] = useEditMode();
|
const [isEditMode] = useEditMode();
|
||||||
const board = useRequiredBoard();
|
const board = useRequiredBoard();
|
||||||
const { hasChangeAccess } = useBoardPermissions(board);
|
const { hasChangeAccess } = useBoardPermissions(board);
|
||||||
|
const { data: demoMode, isLoading } = clientApi.info.isDemoMode.useQuery();
|
||||||
|
|
||||||
if (!hasChangeAccess) {
|
if (!hasChangeAccess || isLoading) {
|
||||||
return <SelectBoardsMenu />;
|
return <SelectBoardsMenu />;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,11 +55,15 @@ export const BoardContentHeaderActions = () => {
|
|||||||
<>
|
<>
|
||||||
{isEditMode && <AddMenu />}
|
{isEditMode && <AddMenu />}
|
||||||
|
|
||||||
<EditModeMenu />
|
<EditModeMenu demoMode={demoMode ?? false} />
|
||||||
|
|
||||||
<HeaderButton href={`/boards/${board.name}/settings`}>
|
{!demoMode && (
|
||||||
<IconSettings stroke={1.5} />
|
<OnboardingTour.Target id="board-settings">
|
||||||
</HeaderButton>
|
<HeaderButton href={`/boards/${board.name}/settings`}>
|
||||||
|
<IconSettings stroke={1.5} />
|
||||||
|
</HeaderButton>
|
||||||
|
</OnboardingTour.Target>
|
||||||
|
)}
|
||||||
|
|
||||||
<SelectBoardsMenu />
|
<SelectBoardsMenu />
|
||||||
</>
|
</>
|
||||||
@@ -67,6 +75,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();
|
||||||
@@ -108,8 +117,12 @@ const AddMenu = () => {
|
|||||||
});
|
});
|
||||||
}, [openAppSelectModal, createItem]);
|
}, [openAppSelectModal, createItem]);
|
||||||
|
|
||||||
|
const handleAddIntegration = useCallback(() => {
|
||||||
|
openIntegrationSelectModal({});
|
||||||
|
}, [openIntegrationSelectModal]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu position="bottom-end" withArrow>
|
<Menu position="bottom-end">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<HeaderButton w="auto" px={4}>
|
<HeaderButton w="auto" px={4}>
|
||||||
<Group gap={4} wrap="nowrap">
|
<Group gap={4} wrap="nowrap">
|
||||||
@@ -127,6 +140,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}>
|
||||||
@@ -141,7 +158,7 @@ const AddMenu = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const EditModeMenu = () => {
|
const EditModeMenu = ({ demoMode }: { demoMode: boolean }) => {
|
||||||
const [isEditMode, { open, close }] = useEditMode();
|
const [isEditMode, { open, close }] = useEditMode();
|
||||||
const board = useRequiredBoard();
|
const board = useRequiredBoard();
|
||||||
const utils = clientApi.useUtils();
|
const utils = clientApi.useUtils();
|
||||||
@@ -164,18 +181,28 @@ const EditModeMenu = () => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const discardDemoChanges = useCallback(() => {
|
||||||
|
void utils.board.getBoardByName.invalidate({ name: board.name });
|
||||||
|
close();
|
||||||
|
}, [utils, board.name, close]);
|
||||||
|
|
||||||
const toggle = useCallback(() => {
|
const toggle = useCallback(() => {
|
||||||
if (isEditMode) return saveBoard(board);
|
if (isEditMode) {
|
||||||
|
if (demoMode) return discardDemoChanges();
|
||||||
|
return saveBoard(board);
|
||||||
|
}
|
||||||
open();
|
open();
|
||||||
}, [board, isEditMode, saveBoard, open]);
|
}, [board, isEditMode, demoMode, saveBoard, open, discardDemoChanges]);
|
||||||
|
|
||||||
useHotkeys([[hotkeys.toggleBoardEdit, toggle]]);
|
useHotkeys([[hotkeys.toggleBoardEdit, toggle]]);
|
||||||
usePreventLeaveWithDirty(isEditMode);
|
usePreventLeaveWithDirty(isEditMode);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<HeaderButton onClick={toggle} loading={isPending}>
|
<OnboardingTour.Target id="board-edit-mode">
|
||||||
{isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
|
<HeaderButton onClick={toggle} loading={isPending}>
|
||||||
</HeaderButton>
|
{isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
|
||||||
|
</HeaderButton>
|
||||||
|
</OnboardingTour.Target>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -183,27 +210,31 @@ const SelectBoardsMenu = () => {
|
|||||||
const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
|
const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu position="bottom-end" withArrow>
|
<OnboardingTour.Target id="board-switcher">
|
||||||
<Menu.Target>
|
<Box>
|
||||||
<HeaderButton w="auto" px={4}>
|
<Menu position="bottom-end">
|
||||||
<IconReplace stroke={1.5} />
|
<Menu.Target>
|
||||||
</HeaderButton>
|
<HeaderButton w="auto" px={4}>
|
||||||
</Menu.Target>
|
<IconReplace stroke={1.5} />
|
||||||
<Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
|
</HeaderButton>
|
||||||
<ScrollArea.Autosize mah={300}>
|
</Menu.Target>
|
||||||
{boards.map((board) => (
|
<Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
|
||||||
<Menu.Item
|
<ScrollArea.Autosize mah={300}>
|
||||||
key={board.id}
|
{boards.map((board) => (
|
||||||
component={Link}
|
<Menu.Item
|
||||||
href={`/boards/${board.name}`}
|
key={board.id}
|
||||||
leftSection={<IconLayoutBoard size={20} />}
|
component={Link}
|
||||||
>
|
href={`/boards/${board.name}`}
|
||||||
{board.name}
|
leftSection={<IconLayoutBoard size={20} />}
|
||||||
</Menu.Item>
|
>
|
||||||
))}
|
{board.name}
|
||||||
</ScrollArea.Autosize>
|
</Menu.Item>
|
||||||
</Menu.Dropdown>
|
))}
|
||||||
</Menu>
|
</ScrollArea.Autosize>
|
||||||
|
</Menu.Dropdown>
|
||||||
|
</Menu>
|
||||||
|
</Box>
|
||||||
|
</OnboardingTour.Target>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -244,7 +275,7 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleBeforeUnload = (event: BeforeUnloadEvent) => {
|
const handleBeforeUnload = (event: BeforeUnloadEvent) => {
|
||||||
if (env.NODE_ENV === "development") return; // Allow to reload in development
|
if (env.NODE_ENV === "development") return;
|
||||||
|
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
event.returnValue = true;
|
event.returnValue = true;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import type { PropsWithChildren } from "react";
|
import type { PropsWithChildren } from "react";
|
||||||
import type { MantineColorsTuple } from "@mantine/core";
|
import type { MantineColorsTuple } from "@mantine/core";
|
||||||
import { colorsTuple, createTheme, darken, lighten, MantineProvider, rem } from "@mantine/core";
|
import { colorsTuple, createTheme, darken, lighten, MantineProvider, rem, v8CssVariablesResolver } from "@mantine/core";
|
||||||
|
|
||||||
import { useRequiredBoard } from "@homarr/boards/context";
|
import { useRequiredBoard } from "@homarr/boards/context";
|
||||||
import type { ColorScheme } from "@homarr/definitions";
|
import type { ColorScheme } from "@homarr/definitions";
|
||||||
@@ -33,7 +33,12 @@ export const BoardMantineProvider = ({
|
|||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MantineProvider defaultColorScheme={defaultColorScheme} theme={theme} colorSchemeManager={colorSchemeManager}>
|
<MantineProvider
|
||||||
|
defaultColorScheme={defaultColorScheme}
|
||||||
|
theme={theme}
|
||||||
|
colorSchemeManager={colorSchemeManager}
|
||||||
|
cssVariablesResolver={v8CssVariablesResolver}
|
||||||
|
>
|
||||||
{children}
|
{children}
|
||||||
</MantineProvider>
|
</MantineProvider>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
|
|||||||
import { MainHeader } from "~/components/layout/header";
|
import { MainHeader } from "~/components/layout/header";
|
||||||
import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
|
import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
|
||||||
import { ClientShell } from "~/components/layout/shell";
|
import { ClientShell } from "~/components/layout/shell";
|
||||||
|
import { BoardTourProvider } from "~/components/onboarding/board-tour";
|
||||||
import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
|
import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
|
||||||
import type { Board } from "./_types";
|
import type { Board } from "./_types";
|
||||||
import type { Params } from "./(content)/_creator";
|
import type { Params } from "./(content)/_creator";
|
||||||
@@ -20,14 +21,21 @@ import { BoardMantineProvider } from "./(content)/_theme";
|
|||||||
|
|
||||||
const logger = createLogger({ module: "createBoardLayout" });
|
const logger = createLogger({ module: "createBoardLayout" });
|
||||||
|
|
||||||
|
const BoardTourWrapper = ({ hasSession, children }: PropsWithChildren<{ hasSession: boolean }>) => {
|
||||||
|
if (!hasSession) return <>{children}</>;
|
||||||
|
return <BoardTourProvider>{children}</BoardTourProvider>;
|
||||||
|
};
|
||||||
|
|
||||||
interface CreateBoardLayoutProps<TParams extends Params> {
|
interface CreateBoardLayoutProps<TParams extends Params> {
|
||||||
headerActions: JSX.Element;
|
headerActions: JSX.Element;
|
||||||
getInitialBoardAsync: (params: TParams) => Promise<Board>;
|
getInitialBoardAsync: (params: TParams) => Promise<Board>;
|
||||||
|
withTour?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createBoardLayout = <TParams extends Params>({
|
export const createBoardLayout = <TParams extends Params>({
|
||||||
headerActions,
|
headerActions,
|
||||||
getInitialBoardAsync: getInitialBoard,
|
getInitialBoardAsync: getInitialBoard,
|
||||||
|
withTour = false,
|
||||||
}: CreateBoardLayoutProps<TParams>) => {
|
}: CreateBoardLayoutProps<TParams>) => {
|
||||||
const Layout = async ({
|
const Layout = async ({
|
||||||
params,
|
params,
|
||||||
@@ -61,14 +69,16 @@ export const createBoardLayout = <TParams extends Params>({
|
|||||||
<EditModeProvider>
|
<EditModeProvider>
|
||||||
<BoardMantineProvider defaultColorScheme={colorScheme}>
|
<BoardMantineProvider defaultColorScheme={colorScheme}>
|
||||||
<CustomCss />
|
<CustomCss />
|
||||||
<ClientShell hasNavigation={false}>
|
<BoardTourWrapper hasSession={withTour && !!session}>
|
||||||
<MainHeader
|
<ClientShell hasNavigation={false}>
|
||||||
logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
|
<MainHeader
|
||||||
actions={headerActions}
|
logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
|
||||||
hasNavigation={false}
|
actions={headerActions}
|
||||||
/>
|
hasNavigation={false}
|
||||||
<AppShellMain>{children}</AppShellMain>
|
/>
|
||||||
</ClientShell>
|
<AppShellMain>{children}</AppShellMain>
|
||||||
|
</ClientShell>
|
||||||
|
</BoardTourWrapper>
|
||||||
</BoardMantineProvider>
|
</BoardMantineProvider>
|
||||||
</EditModeProvider>
|
</EditModeProvider>
|
||||||
</BoardReadyProvider>
|
</BoardReadyProvider>
|
||||||
|
|||||||
@@ -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" withBorder>
|
<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" withBorder>
|
<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">
|
<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" withBorder>
|
<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" withBorder>
|
<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" withBorder>
|
<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" withBorder>
|
<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,15 +1,15 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Button, PasswordInput, Stack, TextInput } from "@mantine/core";
|
import { Button, Stack, TextInput } from "@mantine/core";
|
||||||
import type { z } from "zod/v4";
|
import type { z } from "zod/v4";
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { signIn } from "@homarr/auth/client";
|
import { signIn } from "@homarr/auth/client";
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
import { revalidatePathActionAsync } from "@homarr/common/client";
|
||||||
import { useZodForm } from "@homarr/form";
|
import { useZodForm } from "@homarr/form";
|
||||||
|
import { UserCreatePasswordFields } from "@homarr/forms-collection";
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
import { CustomPasswordInput } from "@homarr/ui";
|
|
||||||
import { userInitSchema } from "@homarr/validation/user";
|
import { userInitSchema } from "@homarr/validation/user";
|
||||||
|
|
||||||
export const InitUserForm = () => {
|
export const InitUserForm = () => {
|
||||||
@@ -59,12 +59,10 @@ export const InitUserForm = () => {
|
|||||||
>
|
>
|
||||||
<Stack gap="lg">
|
<Stack gap="lg">
|
||||||
<TextInput label={t("field.username.label")} {...form.getInputProps("username")} />
|
<TextInput label={t("field.username.label")} {...form.getInputProps("username")} />
|
||||||
<CustomPasswordInput
|
<UserCreatePasswordFields
|
||||||
withPasswordRequirements
|
passwordInputProps={form.getInputProps("password")}
|
||||||
label={t("field.password.label")}
|
confirmPasswordInputProps={form.getInputProps("confirmPassword")}
|
||||||
{...form.getInputProps("password")}
|
|
||||||
/>
|
/>
|
||||||
<PasswordInput label={t("field.passwordConfirm.label")} {...form.getInputProps("confirmPassword")} />
|
|
||||||
<Button type="submit" fullWidth loading={isPending}>
|
<Button type="submit" fullWidth loading={isPending}>
|
||||||
{t("action.create")}
|
{t("action.create")}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -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" withBorder>
|
<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,6 +1,7 @@
|
|||||||
import type { Metadata, Viewport } from "next";
|
import type { Metadata, Viewport } from "next";
|
||||||
import { Inter } from "next/font/google";
|
import { Inter } from "next/font/google";
|
||||||
|
|
||||||
|
import "@gfazioli/mantine-onboarding-tour/styles.css";
|
||||||
import "@homarr/notifications/styles.css";
|
import "@homarr/notifications/styles.css";
|
||||||
import "@homarr/spotlight/styles.css";
|
import "@homarr/spotlight/styles.css";
|
||||||
import "@homarr/ui/styles.css";
|
import "@homarr/ui/styles.css";
|
||||||
@@ -25,6 +26,7 @@ import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";
|
|||||||
|
|
||||||
import { Analytics } from "~/components/layout/analytics";
|
import { Analytics } from "~/components/layout/analytics";
|
||||||
import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-translation";
|
import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-translation";
|
||||||
|
|
||||||
import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
|
import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
|
||||||
import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
|
import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
|
||||||
import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
|
import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
|
||||||
@@ -44,13 +46,13 @@ const fontSans = Inter({
|
|||||||
export const generateMetadata = async (): Promise<Metadata> => ({
|
export const generateMetadata = async (): Promise<Metadata> => ({
|
||||||
title: "Homarr",
|
title: "Homarr",
|
||||||
description:
|
description:
|
||||||
"Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
|
"A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
|
||||||
openGraph: {
|
openGraph: {
|
||||||
title: "Homarr Dashboard",
|
title: "Homarr Dashboard",
|
||||||
description:
|
description:
|
||||||
"Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
|
"A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
|
||||||
url: "https://homarr.dev",
|
url: "https://homarr.dev",
|
||||||
siteName: "Homarr Documentation",
|
siteName: "Homarr",
|
||||||
},
|
},
|
||||||
icons: {
|
icons: {
|
||||||
icon: "/logo/logo.png",
|
icon: "/logo/logo.png",
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ export const HeroBanner = async () => {
|
|||||||
<Image
|
<Image
|
||||||
key={`grid-column-${columnIndex}-scroll-1-${index}`}
|
key={`grid-column-${columnIndex}-scroll-1-${index}`}
|
||||||
src={icon}
|
src={icon}
|
||||||
radius="md"
|
|
||||||
fit={"contain"}
|
fit={"contain"}
|
||||||
w={50}
|
w={50}
|
||||||
h={50}
|
h={50}
|
||||||
@@ -57,7 +56,6 @@ export const HeroBanner = async () => {
|
|||||||
<Image
|
<Image
|
||||||
key={`grid-column-${columnIndex}-scroll-2-${index}`}
|
key={`grid-column-${columnIndex}-scroll-2-${index}`}
|
||||||
src={icon}
|
src={icon}
|
||||||
radius="md"
|
|
||||||
fit={"contain"}
|
fit={"contain"}
|
||||||
w={50}
|
w={50}
|
||||||
h={50}
|
h={50}
|
||||||
|
|||||||
@@ -90,9 +90,7 @@ export default async function AboutPage() {
|
|||||||
<Group py="lg">
|
<Group py="lg">
|
||||||
<Image src={homarrLogoPath} width={100} height={100} alt="" />
|
<Image src={homarrLogoPath} width={100} height={100} alt="" />
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Title order={1} tt="uppercase">
|
<Title order={1}>Homarr</Title>
|
||||||
Homarr
|
|
||||||
</Title>
|
|
||||||
<Title order={2}>{t("version", { version })}</Title>
|
<Title order={2}>{t("version", { version })}</Title>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -195,9 +193,9 @@ export default async function AboutPage() {
|
|||||||
href={`https://www.npmjs.com/package/${name}`}
|
href={`https://www.npmjs.com/package/${name}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
>
|
>
|
||||||
<Card withBorder radius="md" p="xs" className={classes.dependencyCard}>
|
<Card radius="md" p="xs" className={classes.dependencyCard}>
|
||||||
<Group gap="sm" wrap="nowrap">
|
<Group gap="sm" wrap="nowrap">
|
||||||
<ThemeIcon variant="light" size="lg" radius="md">
|
<ThemeIcon variant="light" size="lg">
|
||||||
<IconPackage size="1.5rem" stroke={1.5} />
|
<IconPackage size="1.5rem" stroke={1.5} />
|
||||||
</ThemeIcon>
|
</ThemeIcon>
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import type { inferSearchParamsFromSchema } from "@homarr/common/types";
|
|||||||
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
||||||
import { Link, SearchInput, TablePagination } from "@homarr/ui";
|
import { Link, SearchInput, TablePagination } from "@homarr/ui";
|
||||||
|
|
||||||
|
import { TourTarget } from "~/components/layout/header/tour-target";
|
||||||
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 { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
||||||
import { NoResults } from "~/components/no-results";
|
import { NoResults } from "~/components/no-results";
|
||||||
@@ -45,9 +46,11 @@ export default async function AppsPage(props: AppsPageProps) {
|
|||||||
title={t("page.list.title")}
|
title={t("page.list.title")}
|
||||||
primaryAction={
|
primaryAction={
|
||||||
canCreate ? (
|
canCreate ? (
|
||||||
<MobileAffixButton component={Link} href="/manage/apps/new">
|
<TourTarget id="manage-apps-create">
|
||||||
{t("page.create.title")}
|
<MobileAffixButton component={Link} href="/manage/apps/new">
|
||||||
</MobileAffixButton>
|
{t("page.create.title")}
|
||||||
|
</MobileAffixButton>
|
||||||
|
</TourTarget>
|
||||||
) : undefined
|
) : undefined
|
||||||
}
|
}
|
||||||
toolbar={<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />}
|
toolbar={<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />}
|
||||||
@@ -56,11 +59,13 @@ export default async function AppsPage(props: AppsPageProps) {
|
|||||||
>
|
>
|
||||||
{apps.length === 0 && <AppNoResults />}
|
{apps.length === 0 && <AppNoResults />}
|
||||||
{apps.length > 0 && (
|
{apps.length > 0 && (
|
||||||
<Stack gap="sm">
|
<TourTarget id="manage-apps-list">
|
||||||
{apps.map((app) => (
|
<Stack gap="sm">
|
||||||
<AppCard key={app.id} app={app} />
|
{apps.map((app) => (
|
||||||
))}
|
<AppCard key={app.id} app={app} />
|
||||||
</Stack>
|
))}
|
||||||
|
</Stack>
|
||||||
|
</TourTarget>
|
||||||
)}
|
)}
|
||||||
</ManagePageLayout>
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
@@ -75,7 +80,7 @@ const AppCard = async ({ app }: AppCardProps) => {
|
|||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Group align="top" justify="start" wrap="nowrap" style={{ flex: "1" }}>
|
<Group align="top" justify="start" wrap="nowrap" style={{ flex: "1" }}>
|
||||||
<Avatar
|
<Avatar
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import { getScopedI18n } from "@homarr/translation/server";
|
|||||||
import { Link, UserAvatar } from "@homarr/ui";
|
import { Link, UserAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
|
import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
|
||||||
|
import { TourTarget } from "~/components/layout/header/tour-target";
|
||||||
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
import { NoResults } from "~/components/no-results";
|
import { NoResults } from "~/components/no-results";
|
||||||
import { BoardCardMenuDropdown } from "./_components/board-card-menu-dropdown";
|
import { BoardCardMenuDropdown } from "./_components/board-card-menu-dropdown";
|
||||||
@@ -42,18 +43,26 @@ export default async function ManageBoardsPage() {
|
|||||||
return (
|
return (
|
||||||
<ManagePageLayout
|
<ManagePageLayout
|
||||||
title={t("title")}
|
title={t("title")}
|
||||||
primaryAction={canCreateBoards ? <CreateBoardButton /> : undefined}
|
primaryAction={
|
||||||
|
canCreateBoards ? (
|
||||||
|
<TourTarget id="manage-boards-create">
|
||||||
|
<CreateBoardButton />
|
||||||
|
</TourTarget>
|
||||||
|
) : undefined
|
||||||
|
}
|
||||||
floatingPrimaryAction={canCreateBoards}
|
floatingPrimaryAction={canCreateBoards}
|
||||||
>
|
>
|
||||||
{boards.length === 0 && <NoResults icon={IconLayoutDashboard} title={t("noResults.title")} />}
|
{boards.length === 0 && <NoResults icon={IconLayoutDashboard} title={t("noResults.title")} />}
|
||||||
{boards.length > 0 && (
|
{boards.length > 0 && (
|
||||||
<Grid>
|
<TourTarget id="manage-boards-list">
|
||||||
{boards.map((board) => (
|
<Grid>
|
||||||
<GridCol span={{ base: 12, md: 6 }} key={board.id}>
|
{boards.map((board) => (
|
||||||
<BoardCard board={board} />
|
<GridCol span={{ base: 12, md: 6 }} key={board.id}>
|
||||||
</GridCol>
|
<BoardCard board={board} />
|
||||||
))}
|
</GridCol>
|
||||||
</Grid>
|
))}
|
||||||
|
</Grid>
|
||||||
|
</TourTarget>
|
||||||
)}
|
)}
|
||||||
</ManagePageLayout>
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
@@ -70,16 +79,14 @@ const BoardCard = async ({ board }: BoardCardProps) => {
|
|||||||
const VisibilityIcon = board.isPublic ? IconWorld : IconLock;
|
const VisibilityIcon = board.isPublic ? IconWorld : IconLock;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card radius="lg" withBorder>
|
<Card>
|
||||||
<CardSection p="sm" withBorder>
|
<CardSection p="sm" withBorder>
|
||||||
<Group justify="space-between" align="center">
|
<Group justify="space-between" align="center">
|
||||||
<Group gap="sm">
|
<Group gap="sm">
|
||||||
<Tooltip label={t(`visibility.${visibility}`)}>
|
<Tooltip label={t(`visibility.${visibility}`)}>
|
||||||
<VisibilityIcon size={20} stroke={1.5} />
|
<VisibilityIcon size={20} stroke={1.5} />
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Text fw="bolder" tt="uppercase">
|
<Text fw={700}>{board.name}</Text>
|
||||||
{board.name}
|
|
||||||
</Text>
|
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
@@ -127,6 +134,7 @@ const BoardCard = async ({ board }: BoardCardProps) => {
|
|||||||
style={{ borderTop: "none", borderBottom: "none", borderRight: "none", borderRadius: 0 }}
|
style={{ borderTop: "none", borderBottom: "none", borderRight: "none", borderRadius: 0 }}
|
||||||
variant="default"
|
variant="default"
|
||||||
size="lg"
|
size="lg"
|
||||||
|
aria-label={t("action.settings.label")}
|
||||||
>
|
>
|
||||||
<IconDotsVertical size={16} stroke={1.5} />
|
<IconDotsVertical size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
+7
-2
@@ -33,7 +33,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
|
|||||||
const KindIcon = integrationSecretIcons[secret.kind];
|
const KindIcon = integrationSecretIcons[secret.kind];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Group>
|
<Group>
|
||||||
@@ -58,7 +58,12 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
{isPublic ? (
|
{isPublic ? (
|
||||||
<ActionIcon color="gray" variant="subtle" onClick={togglePublicSecretDisplay}>
|
<ActionIcon
|
||||||
|
color="gray"
|
||||||
|
variant="subtle"
|
||||||
|
onClick={togglePublicSecretDisplay}
|
||||||
|
aria-label={t(publicSecretDisplayOpened ? "common.action.hide" : "common.action.show")}
|
||||||
|
>
|
||||||
<DisplayIcon size={16} stroke={1.5} />
|
<DisplayIcon size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
) : null}
|
) : null}
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ export const IntegrationTestConnectionError = ({ error, url }: IntegrationTestCo
|
|||||||
const causeArray = useMemo(() => toCauseArray(error.cause), [error.cause]);
|
const causeArray = useMemo(() => toCauseArray(error.cause), [error.cause]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder style={{ borderColor: getMantineColor("red", 8) }}>
|
<Card style={{ borderColor: getMantineColor("red", 8) }}>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Text size="lg" fw={500} c="red.8">
|
<Text size="lg" fw={500} c="red.8">
|
||||||
|
|||||||
+1
-1
@@ -216,7 +216,7 @@ export const CertificateDetailsCard = ({ certificate }: CertificateDetailsProps)
|
|||||||
const tCertificateField = useScopedI18n("certificate.field");
|
const tCertificateField = useScopedI18n("certificate.field");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Text fw={500}>{tDetails("title")}</Text>
|
<Text fw={500}>{tDetails("title")}</Text>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Text size="sm" c="dimmed">
|
<Text size="sm" c="dimmed">
|
||||||
|
|||||||
@@ -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,21 @@ 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 supportsSearchEngine = integrationDefs[searchParams.kind].category.flat().includes("search");
|
const integrationCategories = integrationDefs[kind].category.flat();
|
||||||
|
const supportsSearchEngine =
|
||||||
|
integrationCategories.includes("search") && !integrationCategories.includes("mediaSearch");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit((value) => void handleSubmitAsync(value))}>
|
<form onSubmit={form.onSubmit((value) => void handleSubmitAsync(value))}>
|
||||||
@@ -175,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>
|
||||||
@@ -266,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>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
transition: transform 150ms ease;
|
transition: background-color 150ms ease;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
&[data-first="true"] {
|
&[data-first="true"] {
|
||||||
@@ -20,11 +20,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&[data-active] {
|
&[data-active] {
|
||||||
transform: scale(1.01);
|
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
background-color: var(--mantine-color-body);
|
background-color: var(--mantine-color-body);
|
||||||
border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
|
border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
|
||||||
box-shadow: var(--mantine-shadow-md);
|
|
||||||
border-radius: var(--mantine-radius-lg);
|
border-radius: var(--mantine-radius-lg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,12 @@ 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 { TourTarget } from "~/components/layout/header/tour-target";
|
||||||
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,41 +61,22 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
|
|||||||
title={t("page.list.title")}
|
title={t("page.list.title")}
|
||||||
primaryAction={
|
primaryAction={
|
||||||
canCreateIntegrations ? (
|
canCreateIntegrations ? (
|
||||||
<ManageMobilePrimaryAction>
|
<TourTarget id="manage-integrations-create">
|
||||||
<IntegrationSelectMenu>
|
<MobileAffixButton component={Link} href="/manage/integrations/new">
|
||||||
<MenuTarget>
|
{t("action.create")}
|
||||||
<Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
|
</MobileAffixButton>
|
||||||
</MenuTarget>
|
</TourTarget>
|
||||||
</IntegrationSelectMenu>
|
|
||||||
</ManageMobilePrimaryAction>
|
|
||||||
) : undefined
|
) : undefined
|
||||||
}
|
}
|
||||||
floatingPrimaryAction={canCreateIntegrations}
|
floatingPrimaryAction={canCreateIntegrations}
|
||||||
>
|
>
|
||||||
<IntegrationList integrations={integrations} activeTab={searchParams.tab} />
|
<TourTarget id="manage-integrations-list">
|
||||||
|
<IntegrationList integrations={integrations} activeTab={searchParams.tab} />
|
||||||
|
</TourTarget>
|
||||||
</ManagePageLayout>
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
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} />
|
|
||||||
</MenuDropdown>
|
|
||||||
</Menu>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
interface IntegrationListProps {
|
interface IntegrationListProps {
|
||||||
integrations: RouterOutputs["integration"]["all"];
|
integrations: RouterOutputs["integration"]["all"];
|
||||||
activeTab?: IntegrationKind;
|
activeTab?: IntegrationKind;
|
||||||
@@ -134,12 +109,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 +127,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 +148,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 +159,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 +176,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>
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
|
|||||||
import type { NavigationLink } from "~/components/layout/navigation";
|
import type { NavigationLink } from "~/components/layout/navigation";
|
||||||
import { MainNavigation } from "~/components/layout/navigation";
|
import { MainNavigation } from "~/components/layout/navigation";
|
||||||
import { ClientShell } from "~/components/layout/shell";
|
import { ClientShell } from "~/components/layout/shell";
|
||||||
|
import { ManageTourProvider } from "~/components/onboarding/manage-tour";
|
||||||
|
|
||||||
export default async function ManageLayout({ children }: PropsWithChildren) {
|
export default async function ManageLayout({ children }: PropsWithChildren) {
|
||||||
const t = await getScopedI18n("management.navbar");
|
const t = await getScopedI18n("management.navbar");
|
||||||
@@ -45,11 +46,13 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
label: t("items.home"),
|
label: t("items.home"),
|
||||||
icon: IconHomeFilled,
|
icon: IconHomeFilled,
|
||||||
href: "/manage",
|
href: "/manage",
|
||||||
|
"data-onboarding-tour-id": "manage-welcome",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: IconLayoutDashboardFilled,
|
icon: IconLayoutDashboardFilled,
|
||||||
href: "/manage/boards",
|
href: "/manage/boards",
|
||||||
label: t("items.boards"),
|
label: t("items.boards"),
|
||||||
|
"data-onboarding-tour-id": "manage-boards",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: IconBox,
|
icon: IconBox,
|
||||||
@@ -59,12 +62,14 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
iconProps: {
|
iconProps: {
|
||||||
strokeWidth: 2.5,
|
strokeWidth: 2.5,
|
||||||
},
|
},
|
||||||
|
"data-onboarding-tour-id": "manage-apps",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: IconAffiliateFilled,
|
icon: IconAffiliateFilled,
|
||||||
href: "/manage/integrations",
|
href: "/manage/integrations",
|
||||||
label: t("items.integrations"),
|
label: t("items.integrations"),
|
||||||
hidden: !session,
|
hidden: !session,
|
||||||
|
"data-onboarding-tour-id": "manage-integrations",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: IconSearch,
|
icon: IconSearch,
|
||||||
@@ -74,17 +79,20 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
iconProps: {
|
iconProps: {
|
||||||
strokeWidth: 2.5,
|
strokeWidth: 2.5,
|
||||||
},
|
},
|
||||||
|
"data-onboarding-tour-id": "manage-search-engines",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: IconPhotoFilled,
|
icon: IconPhotoFilled,
|
||||||
href: "/manage/medias",
|
href: "/manage/medias",
|
||||||
label: t("items.medias"),
|
label: t("items.medias"),
|
||||||
hidden: !session,
|
hidden: !session,
|
||||||
|
"data-onboarding-tour-id": "manage-medias",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: IconUserFilled,
|
icon: IconUserFilled,
|
||||||
label: t("items.users.label"),
|
label: t("items.users.label"),
|
||||||
hidden: !session?.user.permissions.includes("admin"),
|
hidden: !session?.user.permissions.includes("admin"),
|
||||||
|
"data-onboarding-tour-id": "manage-users",
|
||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
label: t("items.users.items.manage"),
|
label: t("items.users.items.manage"),
|
||||||
@@ -153,6 +161,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
href: "/manage/settings",
|
href: "/manage/settings",
|
||||||
icon: IconSettingsFilled,
|
icon: IconSettingsFilled,
|
||||||
hidden: !session?.user.permissions.includes("admin"),
|
hidden: !session?.user.permissions.includes("admin"),
|
||||||
|
"data-onboarding-tour-id": "manage-settings",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t("items.help.label"),
|
label: t("items.help.label"),
|
||||||
@@ -191,11 +200,17 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
return (
|
const isAdmin = session?.user.permissions.includes("admin") ?? false;
|
||||||
|
|
||||||
|
const shell = (
|
||||||
<ClientShell hasNavigation>
|
<ClientShell hasNavigation>
|
||||||
<MainHeader></MainHeader>
|
<MainHeader></MainHeader>
|
||||||
<MainNavigation links={navigationLinks}></MainNavigation>
|
<MainNavigation links={navigationLinks}></MainNavigation>
|
||||||
<AppShellMain>{children}</AppShellMain>
|
<AppShellMain>{children}</AppShellMain>
|
||||||
</ClientShell>
|
</ClientShell>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (!session) return shell;
|
||||||
|
|
||||||
|
return <ManageTourProvider isAdmin={isAdmin}>{shell}</ManageTourProvider>;
|
||||||
}
|
}
|
||||||
@@ -7,9 +7,7 @@ export default async function NotFound() {
|
|||||||
return (
|
return (
|
||||||
<Center h="100%">
|
<Center h="100%">
|
||||||
<Stack align="center">
|
<Stack align="center">
|
||||||
<Title order={1} tt="uppercase">
|
<Title order={1}>{t("title")}</Title>
|
||||||
{t("title")}
|
|
||||||
</Title>
|
|
||||||
<Text>{t("text")}</Text>
|
<Text>{t("text")}</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Center>
|
</Center>
|
||||||
|
|||||||
@@ -29,20 +29,20 @@ export default async function ManagementPage() {
|
|||||||
<Space h="md" />
|
<Space h="md" />
|
||||||
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
|
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
|
||||||
{statistics.map((statistic) => (
|
{statistics.map((statistic) => (
|
||||||
<Card component={Link} href={statistic.path} key={statistic.path} radius="lg">
|
<Card component={Link} href={statistic.path} key={statistic.path}>
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
<Text size="2.4rem" fw="bolder">
|
<Text size="xl" fw={700}>
|
||||||
{statistic.count}
|
{statistic.count}
|
||||||
</Text>
|
</Text>
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Text c="red" size="xs">
|
<Text c="dimmed" size="xs">
|
||||||
{t(`statisticLabel.${statistic.subtitleKey}`)}
|
{t(`statisticLabel.${statistic.subtitleKey}`)}
|
||||||
</Text>
|
</Text>
|
||||||
<Text fw="bold">{t(`statistic.${statistic.titleKey}`)}</Text>
|
<Text fw={600}>{t(`statistic.${statistic.titleKey}`)}</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Group>
|
</Group>
|
||||||
<IconArrowRight />
|
<IconArrowRight size={16} stroke={1.5} color="var(--mantine-color-dimmed)" />
|
||||||
</Group>
|
</Group>
|
||||||
</Card>
|
</Card>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ const SearchEngineCard = async ({ searchEngine }: SearchEngineCardProps) => {
|
|||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Group align="top" justify="start" wrap="nowrap" style={{ flex: 1 }}>
|
<Group align="top" justify="start" wrap="nowrap" style={{ flex: 1 }}>
|
||||||
<Avatar
|
<Avatar
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
|
|||||||
<>
|
<>
|
||||||
<Title order={2}>{t("title")}</Title>
|
<Title order={2}>{t("title")}</Title>
|
||||||
|
|
||||||
<Card pos="relative" withBorder>
|
<Card pos="relative">
|
||||||
<LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
|
<LoadingOverlay visible={isPending} />
|
||||||
<Stack>
|
<Stack>
|
||||||
<SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
|
<SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
+2
-2
@@ -41,11 +41,11 @@ export const CrawlingAndIndexingSettings = ({ initialData }: CrawlingAndIndexing
|
|||||||
<>
|
<>
|
||||||
<Title order={2}>{t("title")}</Title>
|
<Title order={2}>{t("title")}</Title>
|
||||||
|
|
||||||
<Card pos="relative" withBorder>
|
<Card pos="relative">
|
||||||
<Text c={"dimmed"} mb={"lg"}>
|
<Text c={"dimmed"} mb={"lg"}>
|
||||||
{t("warning")}
|
{t("warning")}
|
||||||
</Text>
|
</Text>
|
||||||
<LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
|
<LoadingOverlay visible={isPending} />
|
||||||
<Stack>
|
<Stack>
|
||||||
<SwitchSetting form={form} formKey="noIndex" title={t("noIndex.title")} text={t("noIndex.text")} />
|
<SwitchSetting form={form} formKey="noIndex" title={t("noIndex.title")} text={t("noIndex.text")} />
|
||||||
<SwitchSetting form={form} formKey="noFollow" title={t("noFollow.title")} text={t("noFollow.text")} />
|
<SwitchSetting form={form} formKey="noFollow" title={t("noFollow.title")} text={t("noFollow.text")} />
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps
|
|||||||
|
|
||||||
<SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
|
<SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
|
||||||
{x509Certificates.map((cert) => (
|
{x509Certificates.map((cert) => (
|
||||||
<Card key={cert.fileName} withBorder>
|
<Card key={cert.fileName}>
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
{cert.isError ? (
|
{cert.isError ? (
|
||||||
<IconAlertTriangle
|
<IconAlertTriangle
|
||||||
|
|||||||
@@ -1,23 +1,26 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
import type { MantineColor } from "@mantine/core";
|
import type { MantineColor } from "@mantine/core";
|
||||||
import { Avatar, Badge, Box, Button, Group, Text } from "@mantine/core";
|
import { ActionIcon, Avatar, Badge, Box, Button, Group, Menu, Text, Tooltip } from "@mantine/core";
|
||||||
import {
|
import {
|
||||||
IconCategoryPlus,
|
IconCategoryPlus,
|
||||||
|
IconDots,
|
||||||
|
IconFileText,
|
||||||
IconPlayerPlay,
|
IconPlayerPlay,
|
||||||
IconPlayerStop,
|
IconPlayerStop,
|
||||||
IconRefresh,
|
IconRefresh,
|
||||||
IconRotateClockwise,
|
IconRotateClockwise,
|
||||||
IconTrash,
|
IconTrash,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
import type { MRT_ColumnDef } from "mantine-react-table";
|
import type { MRT_ColumnDef, MRT_Row } from "mantine-react-table";
|
||||||
import { MantineReactTable } from "mantine-react-table";
|
import { MantineReactTable } from "mantine-react-table";
|
||||||
|
|
||||||
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 { useTimeAgo } from "@homarr/common";
|
import { humanFileSize, useTimeAgo } from "@homarr/common";
|
||||||
import type { ContainerState } from "@homarr/docker";
|
import type { ContainerState } from "@homarr/docker";
|
||||||
import { containerStateColorMap } from "@homarr/docker/shared";
|
import { containerStateColorMap, cpuUsageColor, memoryUsageColor, safeValue } from "@homarr/docker/shared";
|
||||||
import { useModalAction } from "@homarr/modals";
|
import { useModalAction } from "@homarr/modals";
|
||||||
import { AddDockerAppToHomarr } from "@homarr/modals-collection";
|
import { AddDockerAppToHomarr } from "@homarr/modals-collection";
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
@@ -27,25 +30,30 @@ import type { TablerIcon } from "@homarr/ui";
|
|||||||
import { OverflowBadge } from "@homarr/ui";
|
import { OverflowBadge } from "@homarr/ui";
|
||||||
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
||||||
|
|
||||||
const createColumns = (
|
type DockerContainer = RouterOutputs["docker"]["getContainers"]["containers"][number];
|
||||||
t: TranslationFunction,
|
|
||||||
): MRT_ColumnDef<RouterOutputs["docker"]["getContainers"]["containers"][number]>[] => [
|
const createContainerLogsPath = (container: Pick<DockerContainer, "id" | "name">) =>
|
||||||
|
`/manage/tools/docker/logs/${container.id}?name=${encodeURIComponent(container.name)}`;
|
||||||
|
|
||||||
|
const createColumns = (t: TranslationFunction): MRT_ColumnDef<DockerContainer>[] => [
|
||||||
{
|
{
|
||||||
accessorKey: "name",
|
accessorKey: "name",
|
||||||
header: t("docker.field.name.label"),
|
header: t("docker.field.name.label"),
|
||||||
Cell({ renderedCellValue, row }) {
|
Cell({ renderedCellValue, row }) {
|
||||||
return (
|
return (
|
||||||
<Group gap="xs">
|
<Group gap="xs" wrap="nowrap">
|
||||||
<Avatar
|
<Avatar
|
||||||
variant="outline"
|
variant="outline"
|
||||||
radius="lg"
|
radius="sm"
|
||||||
size="md"
|
size="md"
|
||||||
styles={{ image: { objectFit: "contain" } }}
|
styles={{ image: { objectFit: "contain" } }}
|
||||||
src={row.original.iconUrl}
|
src={row.original.iconUrl}
|
||||||
>
|
>
|
||||||
{row.original.name.at(0)?.toUpperCase()}
|
{row.original.name.at(0)?.toUpperCase()}
|
||||||
</Avatar>
|
</Avatar>
|
||||||
<Text>{renderedCellValue}</Text>
|
<Text truncate="end" maw={500}>
|
||||||
|
{renderedCellValue}
|
||||||
|
</Text>
|
||||||
</Group>
|
</Group>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -76,11 +84,11 @@ const createColumns = (
|
|||||||
maxSize: 200,
|
maxSize: 200,
|
||||||
Cell({ renderedCellValue, cell }) {
|
Cell({ renderedCellValue, cell }) {
|
||||||
return (
|
return (
|
||||||
<Box maw={200}>
|
<Tooltip label={cell.row.original.image} multiline maw={400}>
|
||||||
<Text truncate="end" title={cell.row.original.image}>
|
<Box maw={200}>
|
||||||
{renderedCellValue}
|
<Text truncate="end">{renderedCellValue}</Text>
|
||||||
</Text>
|
</Box>
|
||||||
</Box>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -95,18 +103,79 @@ const createColumns = (
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: "cpuUsage",
|
||||||
|
accessorKey: "cpuUsage",
|
||||||
|
size: 120,
|
||||||
|
header: t("docker.field.stats.cpu.label"),
|
||||||
|
enableHiding: true,
|
||||||
|
sortingFn: (rowA, rowB) => {
|
||||||
|
const cpuUsageA = safeValue(rowA.original.cpuUsage);
|
||||||
|
const cpuUsageB = safeValue(rowB.original.cpuUsage);
|
||||||
|
|
||||||
|
return cpuUsageA - cpuUsageB;
|
||||||
|
},
|
||||||
|
Cell({ row }) {
|
||||||
|
const cpuUsage = safeValue(row.original.cpuUsage);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Text size="sm" c={cpuUsageColor(cpuUsage, row.original.state)}>
|
||||||
|
{cpuUsage.toFixed(2)}%
|
||||||
|
</Text>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "memoryUsage",
|
||||||
|
accessorKey: "memoryUsage",
|
||||||
|
size: 140,
|
||||||
|
header: t("docker.field.stats.memory.label"),
|
||||||
|
enableHiding: true,
|
||||||
|
sortingFn: (rowA, rowB) => {
|
||||||
|
const memoryUsageA = safeValue(rowA.original.memoryUsage);
|
||||||
|
const memoryUsageB = safeValue(rowB.original.memoryUsage);
|
||||||
|
|
||||||
|
return memoryUsageA - memoryUsageB;
|
||||||
|
},
|
||||||
|
Cell({ row }) {
|
||||||
|
const bytesUsage = safeValue(row.original.memoryUsage);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Text size="sm" c={memoryUsageColor(bytesUsage, row.original.state)}>
|
||||||
|
{humanFileSize(bytesUsage)}
|
||||||
|
</Text>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"]) {
|
export function DockerTable({ containers, timestamp }: RouterOutputs["docker"]["getContainers"]) {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const tDocker = useScopedI18n("docker");
|
const tDocker = useScopedI18n("docker");
|
||||||
const { data } = clientApi.docker.getContainers.useQuery(undefined, {
|
const { data } = clientApi.docker.getContainers.useQuery(undefined, {
|
||||||
initialData,
|
initialData: { containers, timestamp },
|
||||||
refetchOnMount: false,
|
refetchOnMount: false,
|
||||||
refetchOnWindowFocus: false,
|
refetchOnWindowFocus: false,
|
||||||
refetchOnReconnect: false,
|
refetchOnReconnect: false,
|
||||||
});
|
});
|
||||||
const relativeTime = useTimeAgo(data.timestamp);
|
const relativeTime = useTimeAgo(data.timestamp);
|
||||||
|
const utils = clientApi.useUtils();
|
||||||
|
const { mutate, isPending } = clientApi.docker.invalidate.useMutation({
|
||||||
|
async onSuccess() {
|
||||||
|
await utils.docker.getContainers.invalidate();
|
||||||
|
showSuccessNotification({
|
||||||
|
title: tDocker("action.refresh.notification.success.title"),
|
||||||
|
message: tDocker("action.refresh.notification.success.message"),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onError() {
|
||||||
|
showErrorNotification({
|
||||||
|
title: tDocker("action.refresh.notification.error.title"),
|
||||||
|
message: tDocker("action.refresh.notification.error.message"),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const table = useTranslatedMantineReactTable({
|
const table = useTranslatedMantineReactTable({
|
||||||
data: data.containers,
|
data: data.containers,
|
||||||
enableDensityToggle: false,
|
enableDensityToggle: false,
|
||||||
@@ -114,6 +183,8 @@ export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"
|
|||||||
enableColumnFilters: false,
|
enableColumnFilters: false,
|
||||||
enablePagination: false,
|
enablePagination: false,
|
||||||
enableRowSelection: true,
|
enableRowSelection: true,
|
||||||
|
enableRowActions: true,
|
||||||
|
positionActionsColumn: "last",
|
||||||
positionToolbarAlertBanner: "top",
|
positionToolbarAlertBanner: "top",
|
||||||
enableTableFooter: false,
|
enableTableFooter: false,
|
||||||
enableBottomToolbar: false,
|
enableBottomToolbar: false,
|
||||||
@@ -124,36 +195,15 @@ export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"
|
|||||||
autoFocus: true,
|
autoFocus: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
initialState: { density: "xs", showGlobalFilter: true },
|
initialState: { density: "xs", showGlobalFilter: true, columnVisibility: { cpuUsage: false, memoryUsage: false } },
|
||||||
renderTopToolbarCustomActions: () => {
|
mantineTableBodyCellProps: { style: { padding: "4px 8px" } },
|
||||||
const utils = clientApi.useUtils();
|
mantineTableHeadCellProps: { style: { padding: "4px 8px" } },
|
||||||
const { mutate, isPending } = clientApi.docker.invalidate.useMutation({
|
renderRowActions: ({ row }: { row: MRT_Row<DockerContainer> }) => <ContainerRowMenu container={row.original} />,
|
||||||
async onSuccess() {
|
renderTopToolbarCustomActions: () => (
|
||||||
await utils.docker.getContainers.invalidate();
|
<Button variant="default" rightSection={<IconRefresh size="1rem" />} onClick={() => mutate()} loading={isPending}>
|
||||||
showSuccessNotification({
|
{tDocker("action.refresh.label")}
|
||||||
title: tDocker("action.refresh.notification.success.title"),
|
</Button>
|
||||||
message: tDocker("action.refresh.notification.success.message"),
|
),
|
||||||
});
|
|
||||||
},
|
|
||||||
onError() {
|
|
||||||
showErrorNotification({
|
|
||||||
title: tDocker("action.refresh.notification.error.title"),
|
|
||||||
message: tDocker("action.refresh.notification.error.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
variant="default"
|
|
||||||
rightSection={<IconRefresh size="1rem" />}
|
|
||||||
onClick={() => mutate()}
|
|
||||||
loading={isPending}
|
|
||||||
>
|
|
||||||
{tDocker("action.refresh.label")}
|
|
||||||
</Button>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
renderToolbarAlertBannerContent: ({ groupedAlert, table }) => {
|
renderToolbarAlertBannerContent: ({ groupedAlert, table }) => {
|
||||||
const dockerContainers = table.getSelectedRowModel().rows.map((row) => row.original);
|
const dockerContainers = table.getSelectedRowModel().rows.map((row) => row.original);
|
||||||
return (
|
return (
|
||||||
@@ -181,28 +231,104 @@ export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const containerActions: { action: "start" | "stop" | "restart" | "remove"; icon: TablerIcon; color: MantineColor }[] = [
|
||||||
|
{ action: "start", icon: IconPlayerPlay, color: "green" },
|
||||||
|
{ action: "stop", icon: IconPlayerStop, color: "red" },
|
||||||
|
{ action: "restart", icon: IconRotateClockwise, color: "orange" },
|
||||||
|
{ action: "remove", icon: IconTrash, color: "red" },
|
||||||
|
];
|
||||||
|
|
||||||
|
const ContainerRowMenu = ({ container }: { container: DockerContainer }) => {
|
||||||
|
const t = useScopedI18n("docker.action");
|
||||||
|
const router = useRouter();
|
||||||
|
const utils = clientApi.useUtils();
|
||||||
|
const { openModal } = useModalAction(AddDockerAppToHomarr);
|
||||||
|
|
||||||
|
const useContainerAction = (action: "start" | "stop" | "restart" | "remove") =>
|
||||||
|
clientApi.docker[`${action}All`].useMutation({
|
||||||
|
async onSettled() {
|
||||||
|
await utils.docker.getContainers.invalidate();
|
||||||
|
},
|
||||||
|
onSuccess() {
|
||||||
|
showSuccessNotification({
|
||||||
|
title: t(`${action}.notification.success.title`),
|
||||||
|
message: t(`${action}.notification.success.message`),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onError() {
|
||||||
|
showErrorNotification({
|
||||||
|
title: t(`${action}.notification.error.title`),
|
||||||
|
message: t(`${action}.notification.error.message`),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const mutations = {
|
||||||
|
start: useContainerAction("start"),
|
||||||
|
stop: useContainerAction("stop"),
|
||||||
|
restart: useContainerAction("restart"),
|
||||||
|
remove: useContainerAction("remove"),
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Menu withinPortal position="bottom-end" shadow="sm">
|
||||||
|
<Menu.Target>
|
||||||
|
<ActionIcon variant="subtle" color="gray" onClick={(e) => e.stopPropagation()}>
|
||||||
|
<IconDots size="1rem" />
|
||||||
|
</ActionIcon>
|
||||||
|
</Menu.Target>
|
||||||
|
<Menu.Dropdown>
|
||||||
|
<Menu.Item
|
||||||
|
leftSection={<IconFileText size="1rem" />}
|
||||||
|
onClick={() => router.push(createContainerLogsPath(container))}
|
||||||
|
>
|
||||||
|
{t("logs.label")}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Divider />
|
||||||
|
{containerActions.map(({ action, icon: Icon, color }) => (
|
||||||
|
<Menu.Item
|
||||||
|
key={action}
|
||||||
|
leftSection={<Icon size="1rem" />}
|
||||||
|
color={color}
|
||||||
|
onClick={() => mutations[action].mutate({ ids: [container.id] })}
|
||||||
|
>
|
||||||
|
{t(`${action}.label`)}
|
||||||
|
</Menu.Item>
|
||||||
|
))}
|
||||||
|
<Menu.Divider />
|
||||||
|
<Menu.Item
|
||||||
|
leftSection={<IconCategoryPlus size="1rem" />}
|
||||||
|
color="red"
|
||||||
|
onClick={() => openModal({ selectedContainers: [container] })}
|
||||||
|
>
|
||||||
|
{t("addToHomarr.label")}
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu.Dropdown>
|
||||||
|
</Menu>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
interface ContainerActionBarProps {
|
interface ContainerActionBarProps {
|
||||||
selectedContainers: RouterOutputs["docker"]["getContainers"]["containers"];
|
selectedContainers: DockerContainer[];
|
||||||
}
|
}
|
||||||
|
|
||||||
const ContainerActionBar = ({ selectedContainers }: ContainerActionBarProps) => {
|
const ContainerActionBar = ({ selectedContainers }: ContainerActionBarProps) => {
|
||||||
const t = useScopedI18n("docker.action");
|
const t = useScopedI18n("docker.action");
|
||||||
const { openModal } = useModalAction(AddDockerAppToHomarr);
|
const { openModal } = useModalAction(AddDockerAppToHomarr);
|
||||||
const handleClick = () => {
|
|
||||||
openModal({
|
|
||||||
selectedContainers,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const selectedIds = selectedContainers.map((container) => container.id);
|
const selectedIds = selectedContainers.map((container) => container.id);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Group gap="xs">
|
<Group gap="xs">
|
||||||
<ContainerActionBarButton icon={IconPlayerPlay} color="green" action="start" selectedIds={selectedIds} />
|
{containerActions.map(({ action, icon, color }) => (
|
||||||
<ContainerActionBarButton icon={IconPlayerStop} color="red" action="stop" selectedIds={selectedIds} />
|
<ContainerActionBarButton key={action} icon={icon} color={color} action={action} selectedIds={selectedIds} />
|
||||||
<ContainerActionBarButton icon={IconRotateClockwise} color="orange" action="restart" selectedIds={selectedIds} />
|
))}
|
||||||
<ContainerActionBarButton icon={IconTrash} color="red" action="remove" selectedIds={selectedIds} />
|
<Button
|
||||||
<Button leftSection={<IconCategoryPlus />} color={"red"} onClick={handleClick} variant="light" radius="md">
|
leftSection={<IconCategoryPlus />}
|
||||||
|
color="red"
|
||||||
|
onClick={() => openModal({ selectedContainers })}
|
||||||
|
variant="light"
|
||||||
|
>
|
||||||
{t("addToHomarr.label")}
|
{t("addToHomarr.label")}
|
||||||
</Button>
|
</Button>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -253,7 +379,6 @@ const ContainerActionBarButton = (props: ContainerActionBarButtonProps) => {
|
|||||||
onClick={handleClickAsync}
|
onClick={handleClickAsync}
|
||||||
loading={isPending}
|
loading={isPending}
|
||||||
variant="light"
|
variant="light"
|
||||||
radius="md"
|
|
||||||
>
|
>
|
||||||
{t(`${props.action}.label`)}
|
{t(`${props.action}.label`)}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import dynamic from "next/dynamic";
|
||||||
|
|
||||||
|
export const ClientSideDockerLogsTerminal = dynamic(
|
||||||
|
() => import("./terminal").then(({ DockerLogsTerminal }) => DockerLogsTerminal),
|
||||||
|
{
|
||||||
|
ssr: false,
|
||||||
|
},
|
||||||
|
);
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { notFound } from "next/navigation";
|
||||||
|
import { Box, Group } from "@mantine/core";
|
||||||
|
|
||||||
|
import { api } from "@homarr/api/server";
|
||||||
|
import { auth } from "@homarr/auth/next";
|
||||||
|
import { env } from "@homarr/docker/env";
|
||||||
|
|
||||||
|
import "@xterm/xterm/css/xterm.css";
|
||||||
|
|
||||||
|
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
||||||
|
import { fullHeightWithoutHeaderAndFooter } from "~/constants";
|
||||||
|
import { ClientSideDockerLogsTerminal } from "./client";
|
||||||
|
|
||||||
|
interface DockerContainerLogsPageProps {
|
||||||
|
params: Promise<{ containerId: string }>;
|
||||||
|
searchParams: Promise<{ name?: string }>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function DockerContainerLogsPage({ params, searchParams }: DockerContainerLogsPageProps) {
|
||||||
|
const session = await auth();
|
||||||
|
if (!(session?.user.permissions.includes("admin") && env.ENABLE_DOCKER)) {
|
||||||
|
notFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
const { containerId } = await params;
|
||||||
|
const { name } = await searchParams;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await api.docker.logs({ id: containerId, tail: 1 });
|
||||||
|
} catch {
|
||||||
|
notFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Group justify="space-between" align="center" wrap="nowrap">
|
||||||
|
<DynamicBreadcrumb
|
||||||
|
dynamicMappings={new Map([[containerId, name ?? containerId]])}
|
||||||
|
nonInteractable={[containerId]}
|
||||||
|
/>
|
||||||
|
</Group>
|
||||||
|
<Box style={{ borderRadius: 6 }} h={fullHeightWithoutHeaderAndFooter} p="md" bg="black">
|
||||||
|
<ClientSideDockerLogsTerminal containerId={containerId} />
|
||||||
|
</Box>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
.outerTerminal > div {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useRef } from "react";
|
||||||
|
import { Box } from "@mantine/core";
|
||||||
|
import { CanvasAddon } from "@xterm/addon-canvas";
|
||||||
|
import { FitAddon } from "@xterm/addon-fit";
|
||||||
|
import { Terminal } from "@xterm/xterm";
|
||||||
|
|
||||||
|
import { clientApi } from "@homarr/api/client";
|
||||||
|
|
||||||
|
import classes from "./terminal.module.css";
|
||||||
|
|
||||||
|
interface DockerLogsTerminalProps {
|
||||||
|
containerId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DockerLogsTerminal = ({ containerId }: DockerLogsTerminalProps) => {
|
||||||
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
const terminalRef = useRef<Terminal | null>(null);
|
||||||
|
const pendingLogsRef = useRef<string[]>([]);
|
||||||
|
const isTerminalReadyRef = useRef(false);
|
||||||
|
|
||||||
|
const writeToTerminal = useCallback((data: string) => {
|
||||||
|
if (!isTerminalReadyRef.current || !terminalRef.current) {
|
||||||
|
pendingLogsRef.current.push(data);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
terminalRef.current.write(data);
|
||||||
|
terminalRef.current.refresh(0, terminalRef.current.rows - 1);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
clientApi.docker.subscribeLogs.useSubscription(
|
||||||
|
{ id: containerId, tail: 200 },
|
||||||
|
{
|
||||||
|
onData: writeToTerminal,
|
||||||
|
onError(err) {
|
||||||
|
writeToTerminal(`\r\n\x1b[31m${err.message}\x1b[0m`);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!ref.current) {
|
||||||
|
return () => undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const canvasAddon = new CanvasAddon();
|
||||||
|
|
||||||
|
terminalRef.current = new Terminal({
|
||||||
|
cursorBlink: false,
|
||||||
|
disableStdin: true,
|
||||||
|
convertEol: true,
|
||||||
|
fontSize: 14,
|
||||||
|
});
|
||||||
|
terminalRef.current.open(ref.current);
|
||||||
|
terminalRef.current.loadAddon(canvasAddon);
|
||||||
|
|
||||||
|
isTerminalReadyRef.current = true;
|
||||||
|
const terminal = terminalRef.current;
|
||||||
|
pendingLogsRef.current.forEach((data) => terminal.write(data));
|
||||||
|
pendingLogsRef.current = [];
|
||||||
|
terminal.refresh(0, terminal.rows - 1);
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
const fitAddon = new FitAddon();
|
||||||
|
terminalRef.current?.loadAddon(fitAddon);
|
||||||
|
fitAddon.fit();
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
isTerminalReadyRef.current = false;
|
||||||
|
pendingLogsRef.current = [];
|
||||||
|
canvasAddon.dispose();
|
||||||
|
terminalRef.current?.dispose();
|
||||||
|
terminalRef.current = null;
|
||||||
|
};
|
||||||
|
}, [writeToTerminal]);
|
||||||
|
|
||||||
|
return <Box ref={ref} className={classes.outerTerminal} h="100%" />;
|
||||||
|
};
|
||||||
+7
-19
@@ -4,28 +4,16 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
padding: var(--mantine-spacing-xs);
|
padding: var(--mantine-spacing-xs);
|
||||||
padding-left: calc(var(--mantine-spacing-xs) * 2);
|
padding-left: calc(var(--mantine-spacing-xs) * 2);
|
||||||
|
border-left: 1px solid var(--mantine-color-blue-6);
|
||||||
@mixin hover {
|
background-color: light-dark(
|
||||||
box-shadow: var(--mantine-shadow-md);
|
var(--mantine-color-blue-0),
|
||||||
}
|
color-mix(in oklch, var(--mantine-color-blue-9), transparent 85%)
|
||||||
|
);
|
||||||
&::before {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 6px;
|
|
||||||
background-image: linear-gradient(0, var(--mantine-color-blue-4), var(--mantine-color-blue-9));
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin rtl {
|
@mixin rtl {
|
||||||
padding-left: var(--mantine-spacing-xs);
|
padding-left: var(--mantine-spacing-xs);
|
||||||
padding-right: calc(var(--mantine-spacing-xs) * 2);
|
padding-right: calc(var(--mantine-spacing-xs) * 2);
|
||||||
|
border-left: none;
|
||||||
&::before {
|
border-right: 1px solid var(--mantine-color-blue-6);
|
||||||
left: unset;
|
|
||||||
right: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-1
@@ -23,7 +23,6 @@ export function HeaderCard(props: HeaderCardProps) {
|
|||||||
<Flex align="center" justify={isRTL ? "space-between" : "flex-start"} gap="md" direction={"row"}>
|
<Flex align="center" justify={isRTL ? "space-between" : "flex-start"} gap="md" direction={"row"}>
|
||||||
<ThemeIcon
|
<ThemeIcon
|
||||||
size="xl"
|
size="xl"
|
||||||
radius="md"
|
|
||||||
variant="gradient"
|
variant="gradient"
|
||||||
gradient={{
|
gradient={{
|
||||||
deg: 0,
|
deg: 0,
|
||||||
|
|||||||
+4
-2
@@ -8,6 +8,8 @@ import { useCurrentLocale, useI18n } from "@homarr/translation/client";
|
|||||||
import { ResourceIcon } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-icon";
|
import { ResourceIcon } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-icon";
|
||||||
import classes from "./resource-gauge.module.css";
|
import classes from "./resource-gauge.module.css";
|
||||||
|
|
||||||
|
const KUBERNETES_BRAND_COLOR = "#326ce5";
|
||||||
|
|
||||||
interface KubernetesResourceGaugeProps {
|
interface KubernetesResourceGaugeProps {
|
||||||
kubernetesCapacity: KubernetesCapacity;
|
kubernetesCapacity: KubernetesCapacity;
|
||||||
}
|
}
|
||||||
@@ -18,8 +20,8 @@ export function ResourceGauge(props: KubernetesResourceGaugeProps) {
|
|||||||
const isRTL = Boolean(isLocaleRTL(currentLocale));
|
const isRTL = Boolean(isLocaleRTL(currentLocale));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Paper radius="md" withBorder className={classes.paper} mt={20}>
|
<Paper className={classes.paper} mt={20}>
|
||||||
<ThemeIcon className={classes.icon} size={60} radius={60} bg={"#326ce5"}>
|
<ThemeIcon className={classes.icon} size={60} radius={60} bg={KUBERNETES_BRAND_COLOR}>
|
||||||
<ResourceIcon type={props.kubernetesCapacity.type} />
|
<ResourceIcon type={props.kubernetesCapacity.type} />
|
||||||
</ThemeIcon>
|
</ThemeIcon>
|
||||||
|
|
||||||
|
|||||||
+1
-6
@@ -17,12 +17,7 @@ interface ResourceTileProps {
|
|||||||
export function ResourceTile(props: ResourceTileProps) {
|
export function ResourceTile(props: ResourceTileProps) {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
return (
|
return (
|
||||||
<Card
|
<Card component={Link} href={`/manage/tools/kubernetes/${props.label}`} className={classes.cardContainer}>
|
||||||
withBorder
|
|
||||||
component={Link}
|
|
||||||
href={`/manage/tools/kubernetes/${props.label}`}
|
|
||||||
className={classes.cardContainer}
|
|
||||||
>
|
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Image src={`/images/kubernetes/${props.label}.svg`} alt={props.label} width={64} height={64} />
|
<Image src={`/images/kubernetes/${props.label}.svg`} alt={props.label} width={64} height={64} />
|
||||||
<Group gap="xs">
|
<Group gap="xs">
|
||||||
|
|||||||
@@ -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,22 +44,30 @@ 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();
|
||||||
});
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
terminalRef.current?.dispose();
|
|
||||||
canvasAddon.dispose();
|
canvasAddon.dispose();
|
||||||
|
terminalRef.current?.dispose();
|
||||||
|
terminalRef.current = null;
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
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>;
|
||||||
};
|
};
|
||||||
-85
@@ -1,85 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { Button, Group, Stack } from "@mantine/core";
|
|
||||||
import type { z } from "zod/v4";
|
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
|
||||||
import { useZodForm } from "@homarr/form";
|
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
|
||||||
import { useI18n } from "@homarr/translation/client";
|
|
||||||
import { userChangeHomeBoardsSchema } from "@homarr/validation/user";
|
|
||||||
|
|
||||||
import type { Board } from "~/app/[locale]/boards/_types";
|
|
||||||
import { BoardSelect } from "~/components/board/board-select";
|
|
||||||
|
|
||||||
interface ChangeHomeBoardFormProps {
|
|
||||||
user: RouterOutputs["user"]["getById"];
|
|
||||||
boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormProps) => {
|
|
||||||
const t = useI18n();
|
|
||||||
const { mutate, isPending } = clientApi.user.changeHomeBoards.useMutation({
|
|
||||||
async onSettled() {
|
|
||||||
await revalidatePathActionAsync(`/manage/users/${user.id}`);
|
|
||||||
},
|
|
||||||
onSuccess(_, variables) {
|
|
||||||
form.setInitialValues({
|
|
||||||
homeBoardId: variables.homeBoardId,
|
|
||||||
mobileHomeBoardId: variables.mobileHomeBoardId,
|
|
||||||
});
|
|
||||||
showSuccessNotification({
|
|
||||||
message: t("user.action.changeHomeBoard.notification.success.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError() {
|
|
||||||
showErrorNotification({
|
|
||||||
message: t("user.action.changeHomeBoard.notification.error.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const form = useZodForm(userChangeHomeBoardsSchema, {
|
|
||||||
initialValues: {
|
|
||||||
homeBoardId: user.homeBoardId,
|
|
||||||
mobileHomeBoardId: user.mobileHomeBoardId,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const handleSubmit = (values: FormType) => {
|
|
||||||
mutate({
|
|
||||||
userId: user.id,
|
|
||||||
...values,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
|
||||||
<Stack gap="md">
|
|
||||||
<BoardSelect
|
|
||||||
label={t("management.page.user.setting.general.item.board.type.general")}
|
|
||||||
clearable
|
|
||||||
boards={boardsData}
|
|
||||||
w="100%"
|
|
||||||
{...form.getInputProps("homeBoardId")}
|
|
||||||
/>
|
|
||||||
<BoardSelect
|
|
||||||
label={t("management.page.user.setting.general.item.board.type.mobile")}
|
|
||||||
clearable
|
|
||||||
boards={boardsData}
|
|
||||||
w="100%"
|
|
||||||
{...form.getInputProps("mobileHomeBoardId")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Group justify="end">
|
|
||||||
<Button type="submit" loading={isPending}>
|
|
||||||
{t("common.action.save")}
|
|
||||||
</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
type FormType = z.infer<typeof userChangeHomeBoardsSchema>;
|
|
||||||
-84
@@ -1,84 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { Button, Group, Select, Stack, Switch } from "@mantine/core";
|
|
||||||
import type { z } from "zod/v4";
|
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
|
||||||
import { useZodForm } from "@homarr/form";
|
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
|
||||||
import { useI18n } from "@homarr/translation/client";
|
|
||||||
import { userChangeSearchPreferencesSchema } from "@homarr/validation/user";
|
|
||||||
|
|
||||||
interface ChangeSearchPreferencesFormProps {
|
|
||||||
user: RouterOutputs["user"]["getById"];
|
|
||||||
searchEnginesData: { value: string; label: string }[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeSearchPreferencesFormProps) => {
|
|
||||||
const t = useI18n();
|
|
||||||
const { mutate, isPending } = clientApi.user.changeSearchPreferences.useMutation({
|
|
||||||
async onSettled() {
|
|
||||||
await revalidatePathActionAsync(`/manage/users/${user.id}`);
|
|
||||||
},
|
|
||||||
onSuccess(_, variables) {
|
|
||||||
form.setInitialValues({
|
|
||||||
defaultSearchEngineId: variables.defaultSearchEngineId,
|
|
||||||
openInNewTab: variables.openInNewTab,
|
|
||||||
ddgBangsEnabled: variables.ddgBangsEnabled,
|
|
||||||
});
|
|
||||||
showSuccessNotification({
|
|
||||||
message: t("user.action.changeSearchPreferences.notification.success.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError() {
|
|
||||||
showErrorNotification({
|
|
||||||
message: t("user.action.changeSearchPreferences.notification.error.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const form = useZodForm(userChangeSearchPreferencesSchema, {
|
|
||||||
initialValues: {
|
|
||||||
defaultSearchEngineId: user.defaultSearchEngineId,
|
|
||||||
openInNewTab: user.openSearchInNewTab,
|
|
||||||
ddgBangsEnabled: user.ddgBangs,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const handleSubmit = (values: FormType) => {
|
|
||||||
mutate({
|
|
||||||
userId: user.id,
|
|
||||||
...values,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
|
||||||
<Stack gap="md">
|
|
||||||
<Select
|
|
||||||
label={t("user.field.defaultSearchEngine.label")}
|
|
||||||
w="100%"
|
|
||||||
data={searchEnginesData}
|
|
||||||
{...form.getInputProps("defaultSearchEngineId")}
|
|
||||||
/>
|
|
||||||
<Switch
|
|
||||||
label={t("user.field.openSearchInNewTab.label")}
|
|
||||||
{...form.getInputProps("openInNewTab", { type: "checkbox" })}
|
|
||||||
/>
|
|
||||||
<Switch
|
|
||||||
label={t("user.field.ddgBangs.label")}
|
|
||||||
{...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Group justify="end">
|
|
||||||
<Button type="submit" loading={isPending}>
|
|
||||||
{t("common.action.save")}
|
|
||||||
</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
type FormType = z.infer<typeof userChangeSearchPreferencesSchema>;
|
|
||||||
-83
@@ -1,83 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { Button, Group, Radio, Stack } from "@mantine/core";
|
|
||||||
import type { DayOfWeek } from "@mantine/dates";
|
|
||||||
import dayjs from "dayjs";
|
|
||||||
import localeData from "dayjs/plugin/localeData";
|
|
||||||
import type { z } from "zod/v4";
|
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
|
||||||
import { useZodForm } from "@homarr/form";
|
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
|
||||||
import { useI18n } from "@homarr/translation/client";
|
|
||||||
import { userFirstDayOfWeekSchema } from "@homarr/validation/user";
|
|
||||||
|
|
||||||
dayjs.extend(localeData);
|
|
||||||
|
|
||||||
interface FirstDayOfWeekProps {
|
|
||||||
user: RouterOutputs["user"]["getById"];
|
|
||||||
}
|
|
||||||
|
|
||||||
const weekDays = dayjs.weekdays(false);
|
|
||||||
|
|
||||||
export const FirstDayOfWeek = ({ user }: FirstDayOfWeekProps) => {
|
|
||||||
const t = useI18n();
|
|
||||||
const { mutate, isPending } = clientApi.user.changeFirstDayOfWeek.useMutation({
|
|
||||||
async onSettled() {
|
|
||||||
await revalidatePathActionAsync(`/manage/users/${user.id}`);
|
|
||||||
},
|
|
||||||
onSuccess(_, variables) {
|
|
||||||
form.setInitialValues({
|
|
||||||
firstDayOfWeek: variables.firstDayOfWeek as DayOfWeek,
|
|
||||||
});
|
|
||||||
showSuccessNotification({
|
|
||||||
message: t("user.action.changeFirstDayOfWeek.notification.success.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError() {
|
|
||||||
showErrorNotification({
|
|
||||||
message: t("user.action.changeFirstDayOfWeek.notification.error.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const form = useZodForm(userFirstDayOfWeekSchema, {
|
|
||||||
initialValues: {
|
|
||||||
firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const handleSubmit = (values: FormType) => {
|
|
||||||
mutate({
|
|
||||||
id: user.id,
|
|
||||||
...values,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const inputProps = form.getInputProps("firstDayOfWeek");
|
|
||||||
const onChange = inputProps.onChange as (value: number) => void;
|
|
||||||
const value = (inputProps.value as number).toString();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
|
||||||
<Stack gap="md">
|
|
||||||
<Radio.Group {...inputProps} value={value} onChange={(nextValue: string) => onChange(parseInt(nextValue, 10))}>
|
|
||||||
<Group mt="xs">
|
|
||||||
<Radio value="1" label={weekDays[1]} />
|
|
||||||
<Radio value="6" label={weekDays[6]} />
|
|
||||||
<Radio value="0" label={weekDays[0]} />
|
|
||||||
</Group>
|
|
||||||
</Radio.Group>
|
|
||||||
|
|
||||||
<Group justify="end">
|
|
||||||
<Button type="submit" loading={isPending}>
|
|
||||||
{t("common.action.save")}
|
|
||||||
</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
type FormType = z.infer<typeof userFirstDayOfWeekSchema>;
|
|
||||||
+332
@@ -0,0 +1,332 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useMemo, useRef } from "react";
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
Card,
|
||||||
|
Divider,
|
||||||
|
Group,
|
||||||
|
Radio,
|
||||||
|
Select,
|
||||||
|
SimpleGrid,
|
||||||
|
Stack,
|
||||||
|
Switch,
|
||||||
|
Text,
|
||||||
|
TextInput,
|
||||||
|
Title,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import type { DayOfWeek } from "@mantine/dates";
|
||||||
|
import dayjs from "dayjs";
|
||||||
|
import localeData from "dayjs/plugin/localeData";
|
||||||
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
|
import { clientApi } from "@homarr/api/client";
|
||||||
|
import { revalidatePathActionAsync } from "@homarr/common/client";
|
||||||
|
import { env } from "@homarr/common/env";
|
||||||
|
import { useZodForm } from "@homarr/form";
|
||||||
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
|
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
||||||
|
import {
|
||||||
|
userChangeHomeBoardsSchema,
|
||||||
|
userChangeSearchPreferencesSchema,
|
||||||
|
userEditProfileSchema,
|
||||||
|
userFirstDayOfWeekSchema,
|
||||||
|
userPingIconsEnabledSchema,
|
||||||
|
} from "@homarr/validation/user";
|
||||||
|
|
||||||
|
import type { Board } from "~/app/[locale]/boards/_types";
|
||||||
|
import { BoardSelect } from "~/components/board/board-select";
|
||||||
|
import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
|
||||||
|
|
||||||
|
dayjs.extend(localeData);
|
||||||
|
|
||||||
|
const userGeneralSettingsSchema = z.object({
|
||||||
|
name: userEditProfileSchema.shape.name,
|
||||||
|
email: userEditProfileSchema.shape.email,
|
||||||
|
homeBoardId: userChangeHomeBoardsSchema.shape.homeBoardId,
|
||||||
|
mobileHomeBoardId: userChangeHomeBoardsSchema.shape.mobileHomeBoardId,
|
||||||
|
defaultSearchEngineId: userChangeSearchPreferencesSchema.shape.defaultSearchEngineId,
|
||||||
|
openInNewTab: userChangeSearchPreferencesSchema.shape.openInNewTab,
|
||||||
|
ddgBangsEnabled: userChangeSearchPreferencesSchema.shape.ddgBangsEnabled,
|
||||||
|
firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
|
||||||
|
pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
|
||||||
|
});
|
||||||
|
|
||||||
|
type FormValues = z.infer<typeof userGeneralSettingsSchema>;
|
||||||
|
|
||||||
|
const FIRST_DAY_OPTIONS: { value: DayOfWeek; labelKey: number }[] = [
|
||||||
|
{ value: 1, labelKey: 1 },
|
||||||
|
{ value: 6, labelKey: 6 },
|
||||||
|
{ value: 0, labelKey: 0 },
|
||||||
|
];
|
||||||
|
|
||||||
|
interface UserGeneralSettingsFormProps {
|
||||||
|
user: RouterOutputs["user"]["getById"];
|
||||||
|
boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
|
||||||
|
searchEnginesData: { value: string; label: string }[];
|
||||||
|
showLanguageSelector?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues => ({
|
||||||
|
name: user.name ?? "",
|
||||||
|
email: user.email ?? "",
|
||||||
|
homeBoardId: user.homeBoardId,
|
||||||
|
mobileHomeBoardId: user.mobileHomeBoardId,
|
||||||
|
defaultSearchEngineId: user.defaultSearchEngineId,
|
||||||
|
openInNewTab: user.openSearchInNewTab,
|
||||||
|
ddgBangsEnabled: user.ddgBangs,
|
||||||
|
firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
|
||||||
|
pingIconsEnabled: user.pingIconsEnabled,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const UserGeneralSettingsForm = ({
|
||||||
|
user,
|
||||||
|
boardsData,
|
||||||
|
searchEnginesData,
|
||||||
|
showLanguageSelector = false,
|
||||||
|
}: UserGeneralSettingsFormProps) => {
|
||||||
|
const t = useI18n();
|
||||||
|
const tGeneral = useScopedI18n("management.page.user.setting.general");
|
||||||
|
const isCredentialsUser = user.provider === "credentials";
|
||||||
|
|
||||||
|
const editProfileMutation = clientApi.user.editProfile.useMutation();
|
||||||
|
const changeHomeBoardsMutation = clientApi.user.changeHomeBoards.useMutation();
|
||||||
|
const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
|
||||||
|
const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
|
||||||
|
const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
|
||||||
|
|
||||||
|
const initialValues = buildInitialValues(user);
|
||||||
|
const initialValuesRef = useRef(initialValues);
|
||||||
|
|
||||||
|
const form = useZodForm(userGeneralSettingsSchema, {
|
||||||
|
initialValues,
|
||||||
|
});
|
||||||
|
|
||||||
|
const isDirtyRef = useRef(false);
|
||||||
|
isDirtyRef.current = form.isDirty();
|
||||||
|
|
||||||
|
const weekDays = useMemo(() => dayjs.weekdays(false), []);
|
||||||
|
|
||||||
|
const mutations = [
|
||||||
|
editProfileMutation,
|
||||||
|
changeHomeBoardsMutation,
|
||||||
|
changeSearchPreferencesMutation,
|
||||||
|
changeFirstDayOfWeekMutation,
|
||||||
|
changePingIconsEnabledMutation,
|
||||||
|
];
|
||||||
|
const isPending = mutations.some((m) => m.isPending);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const handler = (e: BeforeUnloadEvent) => {
|
||||||
|
if (env.NODE_ENV === "development") return;
|
||||||
|
if (isDirtyRef.current) e.preventDefault();
|
||||||
|
};
|
||||||
|
window.addEventListener("beforeunload", handler);
|
||||||
|
return () => window.removeEventListener("beforeunload", handler);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSubmitAsync = async (values: FormValues) => {
|
||||||
|
const parsed = userGeneralSettingsSchema.safeParse(values);
|
||||||
|
if (!parsed.success) return;
|
||||||
|
|
||||||
|
const defaults = initialValuesRef.current;
|
||||||
|
const changed = <K extends keyof FormValues>(...fields: K[]) =>
|
||||||
|
fields.some((f) => (f === "email" ? (values[f] || null) !== (defaults[f] || null) : values[f] !== defaults[f]));
|
||||||
|
|
||||||
|
const saveActions: { when: boolean; action: () => Promise<unknown> }[] = [
|
||||||
|
{
|
||||||
|
when: isCredentialsUser && changed("name", "email"),
|
||||||
|
action: () =>
|
||||||
|
editProfileMutation.mutateAsync({ id: user.id, name: parsed.data.name, email: parsed.data.email ?? "" }),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
when: changed("homeBoardId", "mobileHomeBoardId"),
|
||||||
|
action: () =>
|
||||||
|
changeHomeBoardsMutation.mutateAsync({
|
||||||
|
userId: user.id,
|
||||||
|
homeBoardId: parsed.data.homeBoardId,
|
||||||
|
mobileHomeBoardId: parsed.data.mobileHomeBoardId,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
when: changed("defaultSearchEngineId", "openInNewTab", "ddgBangsEnabled"),
|
||||||
|
action: () =>
|
||||||
|
changeSearchPreferencesMutation.mutateAsync({
|
||||||
|
userId: user.id,
|
||||||
|
defaultSearchEngineId: parsed.data.defaultSearchEngineId,
|
||||||
|
openInNewTab: parsed.data.openInNewTab,
|
||||||
|
ddgBangsEnabled: parsed.data.ddgBangsEnabled,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
when: changed("firstDayOfWeek"),
|
||||||
|
action: () =>
|
||||||
|
changeFirstDayOfWeekMutation.mutateAsync({ id: user.id, firstDayOfWeek: parsed.data.firstDayOfWeek }),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
when: changed("pingIconsEnabled"),
|
||||||
|
action: () =>
|
||||||
|
changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const promises = saveActions.filter((s) => s.when).map((s) => s.action());
|
||||||
|
if (promises.length === 0) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await Promise.all(promises);
|
||||||
|
const newValues = { ...parsed.data, email: parsed.data.email ?? "" };
|
||||||
|
initialValuesRef.current = newValues;
|
||||||
|
form.setInitialValues(newValues);
|
||||||
|
form.resetDirty();
|
||||||
|
await revalidatePathActionAsync(`/manage/users/${user.id}`);
|
||||||
|
showSuccessNotification({
|
||||||
|
title: t("common.notification.update.success"),
|
||||||
|
message: t("common.notification.update.success"),
|
||||||
|
});
|
||||||
|
} catch {
|
||||||
|
showErrorNotification({
|
||||||
|
title: t("common.notification.update.error"),
|
||||||
|
message: t("common.notification.update.error"),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDiscard = () => {
|
||||||
|
form.setValues(initialValuesRef.current);
|
||||||
|
form.resetDirty();
|
||||||
|
};
|
||||||
|
|
||||||
|
const firstDayOfWeekInputProps = form.getInputProps("firstDayOfWeek");
|
||||||
|
const firstDayOfWeekOnChange = firstDayOfWeekInputProps.onChange as (value: number) => void;
|
||||||
|
const firstDayOfWeekValue = (firstDayOfWeekInputProps.value as number).toString();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
||||||
|
<Stack gap="lg">
|
||||||
|
<SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg" verticalSpacing="lg">
|
||||||
|
<Card withBorder bg="transparent">
|
||||||
|
<Stack gap="md">
|
||||||
|
<Stack gap={2}>
|
||||||
|
<Title order={3}>{t("user.name")}</Title>
|
||||||
|
{!isCredentialsUser && (
|
||||||
|
<Text c="dimmed" size="sm">
|
||||||
|
{t("management.page.user.fieldsDisabledExternalProvider")}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
<Divider />
|
||||||
|
<TextInput
|
||||||
|
disabled={!isCredentialsUser}
|
||||||
|
label={t("user.field.username.label")}
|
||||||
|
withAsterisk
|
||||||
|
{...form.getInputProps("name")}
|
||||||
|
/>
|
||||||
|
<TextInput
|
||||||
|
disabled={!isCredentialsUser}
|
||||||
|
label={t("user.field.email.label")}
|
||||||
|
{...form.getInputProps("email")}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<Card withBorder bg="transparent">
|
||||||
|
<Stack gap="md">
|
||||||
|
<Stack gap={2}>
|
||||||
|
<Title order={3}>{tGeneral("item.board.title")}</Title>
|
||||||
|
</Stack>
|
||||||
|
<Divider />
|
||||||
|
<BoardSelect
|
||||||
|
label={tGeneral("item.board.type.general")}
|
||||||
|
clearable
|
||||||
|
boards={boardsData}
|
||||||
|
w="100%"
|
||||||
|
withinPortal
|
||||||
|
{...form.getInputProps("homeBoardId")}
|
||||||
|
/>
|
||||||
|
<BoardSelect
|
||||||
|
label={tGeneral("item.board.type.mobile")}
|
||||||
|
clearable
|
||||||
|
boards={boardsData}
|
||||||
|
w="100%"
|
||||||
|
withinPortal
|
||||||
|
{...form.getInputProps("mobileHomeBoardId")}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<Card withBorder bg="transparent">
|
||||||
|
<Stack gap="md">
|
||||||
|
<Stack gap={2}>
|
||||||
|
<Title order={3}>{tGeneral("item.search")}</Title>
|
||||||
|
</Stack>
|
||||||
|
<Divider />
|
||||||
|
<Select
|
||||||
|
label={t("user.field.defaultSearchEngine.label")}
|
||||||
|
w="100%"
|
||||||
|
data={searchEnginesData}
|
||||||
|
comboboxProps={{ withinPortal: true }}
|
||||||
|
{...form.getInputProps("defaultSearchEngineId")}
|
||||||
|
/>
|
||||||
|
<Switch
|
||||||
|
label={t("user.field.openSearchInNewTab.label")}
|
||||||
|
{...form.getInputProps("openInNewTab", { type: "checkbox" })}
|
||||||
|
/>
|
||||||
|
<Switch
|
||||||
|
label={t("user.field.ddgBangs.label")}
|
||||||
|
{...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<Card withBorder bg="transparent">
|
||||||
|
<Stack gap="md">
|
||||||
|
<Stack gap={2}>
|
||||||
|
<Title order={3}>{tGeneral("item.language")}</Title>
|
||||||
|
</Stack>
|
||||||
|
<Divider />
|
||||||
|
{showLanguageSelector && <CurrentLanguageCombobox withinPortal />}
|
||||||
|
<Title order={4}>{tGeneral("item.firstDayOfWeek")}</Title>
|
||||||
|
<Radio.Group
|
||||||
|
{...firstDayOfWeekInputProps}
|
||||||
|
value={firstDayOfWeekValue}
|
||||||
|
onChange={(nextValue: string) => firstDayOfWeekOnChange(parseInt(nextValue, 10))}
|
||||||
|
>
|
||||||
|
<Group mt="xs" wrap="wrap">
|
||||||
|
{FIRST_DAY_OPTIONS.map(({ value: dayValue, labelKey }) => (
|
||||||
|
<Radio key={dayValue} value={dayValue.toString()} label={weekDays[labelKey]} />
|
||||||
|
))}
|
||||||
|
</Group>
|
||||||
|
</Radio.Group>
|
||||||
|
<Divider my="xs" />
|
||||||
|
<Title order={4}>{tGeneral("item.accessibility")}</Title>
|
||||||
|
<Switch
|
||||||
|
label={t("user.field.pingIconsEnabled.label")}
|
||||||
|
{...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</Card>
|
||||||
|
</SimpleGrid>
|
||||||
|
|
||||||
|
<div style={{ position: "sticky", bottom: 20 }}>
|
||||||
|
{form.isDirty() && (
|
||||||
|
<Card withBorder>
|
||||||
|
<Group justify="space-between" wrap="wrap">
|
||||||
|
<Text fw={500}>{t("common.unsavedChanges")}</Text>
|
||||||
|
<Group>
|
||||||
|
<Button disabled={isPending} variant="default" onClick={handleDiscard}>
|
||||||
|
{t("common.action.discard")}
|
||||||
|
</Button>
|
||||||
|
<Button loading={isPending} type="submit" disabled={!form.isValid()}>
|
||||||
|
{t("common.action.saveChanges")}
|
||||||
|
</Button>
|
||||||
|
</Group>
|
||||||
|
</Group>
|
||||||
|
</Card>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</Stack>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
};
|
||||||
-69
@@ -1,69 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { Button, Group, Stack, Switch } from "@mantine/core";
|
|
||||||
import type { z } from "zod/v4";
|
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
|
||||||
import { useZodForm } from "@homarr/form";
|
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
|
||||||
import { useI18n } from "@homarr/translation/client";
|
|
||||||
import { userPingIconsEnabledSchema } from "@homarr/validation/user";
|
|
||||||
|
|
||||||
interface PingIconsEnabledProps {
|
|
||||||
user: RouterOutputs["user"]["getById"];
|
|
||||||
}
|
|
||||||
|
|
||||||
export const PingIconsEnabled = ({ user }: PingIconsEnabledProps) => {
|
|
||||||
const t = useI18n();
|
|
||||||
const { mutate, isPending } = clientApi.user.changePingIconsEnabled.useMutation({
|
|
||||||
async onSettled() {
|
|
||||||
await revalidatePathActionAsync(`/manage/users/${user.id}`);
|
|
||||||
},
|
|
||||||
onSuccess(_, variables) {
|
|
||||||
form.setInitialValues({
|
|
||||||
pingIconsEnabled: variables.pingIconsEnabled,
|
|
||||||
});
|
|
||||||
showSuccessNotification({
|
|
||||||
message: t("user.action.changePingIconsEnabled.notification.success.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError() {
|
|
||||||
showErrorNotification({
|
|
||||||
message: t("user.action.changePingIconsEnabled.notification.error.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const form = useZodForm(userPingIconsEnabledSchema, {
|
|
||||||
initialValues: {
|
|
||||||
pingIconsEnabled: user.pingIconsEnabled,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const handleSubmit = (values: FormType) => {
|
|
||||||
mutate({
|
|
||||||
id: user.id,
|
|
||||||
...values,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
|
||||||
<Stack gap="md">
|
|
||||||
<Switch
|
|
||||||
{...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
|
|
||||||
label={t("user.field.pingIconsEnabled.label")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Group justify="end">
|
|
||||||
<Button type="submit" loading={isPending}>
|
|
||||||
{t("common.action.save")}
|
|
||||||
</Button>
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
type FormType = z.infer<typeof userPingIconsEnabledSchema>;
|
|
||||||
+5
-4
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import { useCallback } from "react";
|
import { useCallback } from "react";
|
||||||
import { Box, Button, FileButton, Menu, UnstyledButton } from "@mantine/core";
|
import { Box, Button, FileButton, Menu, UnstyledButton } from "@mantine/core";
|
||||||
import { useDisclosure } from "@mantine/hooks";
|
import { useDisclosure, useMediaQuery } from "@mantine/hooks";
|
||||||
import { IconPencil, IconPhotoEdit, IconPhotoX } from "@tabler/icons-react";
|
import { IconPencil, IconPhotoEdit, IconPhotoX } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
@@ -25,6 +25,7 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
const [opened, { toggle }] = useDisclosure(false);
|
const [opened, { toggle }] = useDisclosure(false);
|
||||||
|
const isMobile = useMediaQuery("(max-width: 48em)");
|
||||||
const { openConfirmModal } = useConfirmModal();
|
const { openConfirmModal } = useConfirmModal();
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const tManageAvatar = useScopedI18n("user.action.manageAvatar");
|
const tManageAvatar = useScopedI18n("user.action.manageAvatar");
|
||||||
@@ -94,11 +95,11 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
|
|||||||
}, [mutate, user.id, openConfirmModal, tManageAvatar]);
|
}, [mutate, user.id, openConfirmModal, tManageAvatar]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box pos="relative">
|
<Box pos="relative" display="flex" style={{ justifyContent: isMobile ? "center" : undefined }}>
|
||||||
<Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow>
|
<Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow withinPortal>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<UnstyledButton onClick={toggle}>
|
<UnstyledButton onClick={toggle}>
|
||||||
<UserAvatar user={user} size={200} />
|
<UserAvatar user={user} size={isMobile ? 120 : 200} />
|
||||||
<Button
|
<Button
|
||||||
component="div"
|
component="div"
|
||||||
pos="absolute"
|
pos="absolute"
|
||||||
|
|||||||
-94
@@ -1,94 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { useCallback } from "react";
|
|
||||||
import { Button, Group, Stack, TextInput } from "@mantine/core";
|
|
||||||
|
|
||||||
import type { RouterInputs, RouterOutputs } from "@homarr/api";
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
|
||||||
import { useZodForm } from "@homarr/form";
|
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
|
||||||
import { useI18n } from "@homarr/translation/client";
|
|
||||||
import { userEditProfileSchema } from "@homarr/validation/user";
|
|
||||||
|
|
||||||
interface UserProfileFormProps {
|
|
||||||
user: RouterOutputs["user"]["getById"];
|
|
||||||
}
|
|
||||||
|
|
||||||
export const UserProfileForm = ({ user }: UserProfileFormProps) => {
|
|
||||||
const t = useI18n();
|
|
||||||
const { mutate, isPending } = clientApi.user.editProfile.useMutation({
|
|
||||||
async onSettled() {
|
|
||||||
await revalidatePathActionAsync("/manage/users");
|
|
||||||
},
|
|
||||||
onSuccess(_, variables) {
|
|
||||||
// Reset form initial values to reset dirty state
|
|
||||||
form.setInitialValues({
|
|
||||||
name: variables.name,
|
|
||||||
email: variables.email ?? "",
|
|
||||||
});
|
|
||||||
showSuccessNotification({
|
|
||||||
title: t("common.notification.update.success"),
|
|
||||||
message: t("user.action.editProfile.notification.success.message"),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError(error) {
|
|
||||||
const message =
|
|
||||||
error.data?.code === "CONFLICT"
|
|
||||||
? t("user.error.usernameTaken")
|
|
||||||
: t("user.action.editProfile.notification.error.message");
|
|
||||||
showErrorNotification({
|
|
||||||
title: t("common.notification.update.error"),
|
|
||||||
message,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const form = useZodForm(userEditProfileSchema.omit({ id: true }), {
|
|
||||||
initialValues: {
|
|
||||||
name: user.name ?? "",
|
|
||||||
email: user.email ?? "",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Only credentials users can edit their profile
|
|
||||||
const isProviderCredentials = user.provider === "credentials";
|
|
||||||
|
|
||||||
const handleSubmit = useCallback(
|
|
||||||
(values: FormType) => {
|
|
||||||
if (!isProviderCredentials) return;
|
|
||||||
mutate({
|
|
||||||
...values,
|
|
||||||
id: user.id,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
[isProviderCredentials, mutate, user.id],
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
|
||||||
<Stack>
|
|
||||||
<TextInput
|
|
||||||
disabled={!isProviderCredentials}
|
|
||||||
label={t("user.field.username.label")}
|
|
||||||
withAsterisk
|
|
||||||
{...form.getInputProps("name")}
|
|
||||||
/>
|
|
||||||
<TextInput
|
|
||||||
disabled={!isProviderCredentials}
|
|
||||||
label={t("user.field.email.label")}
|
|
||||||
{...form.getInputProps("email")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{isProviderCredentials && (
|
|
||||||
<Group justify="end">
|
|
||||||
<Button type="submit" disabled={!form.isDirty()} loading={isPending}>
|
|
||||||
{t("common.action.saveChanges")}
|
|
||||||
</Button>
|
|
||||||
</Group>
|
|
||||||
)}
|
|
||||||
</Stack>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
type FormType = Omit<RouterInputs["user"]["editProfile"], "id">;
|
|
||||||
+53
@@ -0,0 +1,53 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Badge, Button, Group, Stack, Text } from "@mantine/core";
|
||||||
|
import { IconRefresh } from "@tabler/icons-react";
|
||||||
|
|
||||||
|
import { clientApi } from "@homarr/api/client";
|
||||||
|
import { showSuccessNotification } from "@homarr/notifications";
|
||||||
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
|
export const ResetTours = () => {
|
||||||
|
const t = useScopedI18n("management.page.user.setting.general.item.onboardingTours");
|
||||||
|
const utils = clientApi.useUtils();
|
||||||
|
const { data: tourStatus } = clientApi.user.getTourStatus.useQuery();
|
||||||
|
const { mutate: resetTours, isPending } = clientApi.user.resetTours.useMutation({
|
||||||
|
onSuccess() {
|
||||||
|
showSuccessNotification({
|
||||||
|
title: t("resetSuccess.title"),
|
||||||
|
message: t("resetSuccess.message"),
|
||||||
|
});
|
||||||
|
void utils.user.getTourStatus.invalidate();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const tours = [
|
||||||
|
{ key: "management" as const, completed: tourStatus?.completedManageTour ?? false },
|
||||||
|
{ key: "dashboard" as const, completed: tourStatus?.completedBoardTour ?? false },
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack gap="xs">
|
||||||
|
<Group gap="xs">
|
||||||
|
{tours.map(({ key, completed }) => (
|
||||||
|
<Badge key={key} color={completed ? "green" : "gray"} variant="light">
|
||||||
|
{t(`name.${key}`)}: {completed ? t("status.completed") : t("status.notStarted")}
|
||||||
|
</Badge>
|
||||||
|
))}
|
||||||
|
</Group>
|
||||||
|
<Text size="sm" c="dimmed">
|
||||||
|
{t("description")}
|
||||||
|
</Text>
|
||||||
|
<Button
|
||||||
|
leftSection={<IconRefresh size={16} />}
|
||||||
|
variant="light"
|
||||||
|
size="sm"
|
||||||
|
w="fit-content"
|
||||||
|
onClick={() => resetTours()}
|
||||||
|
loading={isPending}
|
||||||
|
>
|
||||||
|
{t("reset")}
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -6,18 +6,14 @@ import { api } from "@homarr/api/server";
|
|||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
||||||
|
|
||||||
import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
|
|
||||||
import { DangerZoneItem, DangerZoneRoot } from "~/components/manage/danger-zone";
|
import { DangerZoneItem, DangerZoneRoot } from "~/components/manage/danger-zone";
|
||||||
import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
|
import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
|
||||||
import { createMetaTitle } from "~/metadata";
|
import { createMetaTitle } from "~/metadata";
|
||||||
import { canAccessUserEditPage } from "../access";
|
import { canAccessUserEditPage } from "../access";
|
||||||
import { ChangeHomeBoardForm } from "./_components/_change-home-board";
|
|
||||||
import { ChangeSearchPreferencesForm } from "./_components/_change-search-preferences";
|
|
||||||
import { DeleteUserButton } from "./_components/_delete-user-button";
|
import { DeleteUserButton } from "./_components/_delete-user-button";
|
||||||
import { FirstDayOfWeek } from "./_components/_first-day-of-week";
|
import { UserGeneralSettingsForm } from "./_components/_general-settings-form";
|
||||||
import { PingIconsEnabled } from "./_components/_ping-icons-enabled";
|
|
||||||
import { UserProfileAvatarForm } from "./_components/_profile-avatar-form";
|
import { UserProfileAvatarForm } from "./_components/_profile-avatar-form";
|
||||||
import { UserProfileForm } from "./_components/_profile-form";
|
import { ResetTours } from "./_components/_reset-tours";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
params: Promise<{
|
params: Promise<{
|
||||||
@@ -63,7 +59,7 @@ export default async function EditUserPage(props: Props) {
|
|||||||
|
|
||||||
const boards = await api.board.getAllBoards();
|
const boards = await api.board.getAllBoards();
|
||||||
const searchEngines = await api.searchEngine.getSelectable();
|
const searchEngines = await api.searchEngine.getSelectable();
|
||||||
|
const isSelf = session?.user.id === user.id;
|
||||||
const isCredentialsUser = user.provider === "credentials";
|
const isCredentialsUser = user.provider === "credentials";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -73,51 +69,32 @@ export default async function EditUserPage(props: Props) {
|
|||||||
{t("management.page.user.fieldsDisabledExternalProvider")}
|
{t("management.page.user.fieldsDisabledExternalProvider")}
|
||||||
</Alert>
|
</Alert>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Title>{tGeneral("title")}</Title>
|
<Title>{tGeneral("title")}</Title>
|
||||||
<Group gap="xl">
|
<Group gap="xl" align="flex-start" wrap="wrap">
|
||||||
<Box flex={1}>
|
<Box flex={1} miw={{ base: "100%", md: 540 }}>
|
||||||
<UserProfileForm user={user} />
|
<UserGeneralSettingsForm
|
||||||
|
user={user}
|
||||||
|
boardsData={boards.map((board) => ({
|
||||||
|
id: board.id,
|
||||||
|
name: board.name,
|
||||||
|
logoImageUrl: board.logoImageUrl,
|
||||||
|
}))}
|
||||||
|
searchEnginesData={searchEngines}
|
||||||
|
showLanguageSelector={isSelf}
|
||||||
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
<Box w={{ base: "100%", lg: 200 }}>
|
<Box w={{ base: "100%", lg: 260 }}>
|
||||||
<UserProfileAvatarForm user={user} />
|
<UserProfileAvatarForm user={user} />
|
||||||
</Box>
|
</Box>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
{session?.user.id === user.id && (
|
{session?.user.id === user.id && (
|
||||||
<Stack mb="lg">
|
<Stack mb="lg">
|
||||||
<Title order={2}>{tGeneral("item.language")}</Title>
|
<Title order={2}>{tGeneral("item.onboardingTours.title")}</Title>
|
||||||
<CurrentLanguageCombobox />
|
<ResetTours />
|
||||||
</Stack>
|
</Stack>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Stack mb="lg">
|
|
||||||
<Title order={2}>{tGeneral("item.board.title")}</Title>
|
|
||||||
<ChangeHomeBoardForm
|
|
||||||
user={user}
|
|
||||||
boardsData={boards.map((board) => ({
|
|
||||||
id: board.id,
|
|
||||||
name: board.name,
|
|
||||||
logoImageUrl: board.logoImageUrl,
|
|
||||||
}))}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
<Stack mb="lg">
|
|
||||||
<Title order={2}>{tGeneral("item.search")}</Title>
|
|
||||||
<ChangeSearchPreferencesForm user={user} searchEnginesData={searchEngines} />
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
<Stack mb="lg">
|
|
||||||
<Title order={2}>{tGeneral("item.firstDayOfWeek")}</Title>
|
|
||||||
<FirstDayOfWeek user={user} />
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
<Stack mb="lg">
|
|
||||||
<Title order={2}>{tGeneral("item.accessibility")}</Title>
|
|
||||||
<PingIconsEnabled user={user} />
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
<DangerZoneRoot>
|
<DangerZoneRoot>
|
||||||
<DangerZoneItem
|
<DangerZoneItem
|
||||||
label={t("user.action.delete.label")}
|
label={t("user.action.delete.label")}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { UserAvatar } from "@homarr/ui";
|
|||||||
|
|
||||||
import { ManageContainer } from "~/components/manage/manage-container";
|
import { ManageContainer } from "~/components/manage/manage-container";
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
||||||
import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
|
import { catchTrpcNotFound, catchTrpcUnauthorized } from "~/errors/trpc-catch-error";
|
||||||
import { NavigationLink } from "../groups/[id]/_navigation";
|
import { NavigationLink } from "../groups/[id]/_navigation";
|
||||||
import { canAccessUserEditPage } from "./access";
|
import { canAccessUserEditPage } from "./access";
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ export default async function Layout(props: PropsWithChildren<LayoutProps>) {
|
|||||||
const session = await auth();
|
const session = await auth();
|
||||||
const t = await getI18n();
|
const t = await getI18n();
|
||||||
const tUser = await getScopedI18n("management.page.user");
|
const tUser = await getScopedI18n("management.page.user");
|
||||||
const user = await api.user.getById({ userId: params.userId }).catch(catchTrpcNotFound);
|
const user = await api.user.getById({ userId: params.userId }).catch(catchTrpcNotFound).catch(catchTrpcUnauthorized);
|
||||||
|
|
||||||
if (!canAccessUserEditPage(session, user.id)) {
|
if (!canAccessUserEditPage(session, user.id)) {
|
||||||
notFound();
|
notFound();
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { api } from "@homarr/api/server";
|
|||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
|
|
||||||
import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
|
import { catchTrpcNotFound, catchTrpcUnauthorized } from "~/errors/trpc-catch-error";
|
||||||
import { canAccessUserEditPage } from "../access";
|
import { canAccessUserEditPage } from "../access";
|
||||||
import { ChangePasswordForm } from "./_components/_change-password-form";
|
import { ChangePasswordForm } from "./_components/_change-password-form";
|
||||||
|
|
||||||
@@ -23,7 +23,8 @@ export default async function UserSecurityPage(props: Props) {
|
|||||||
.getById({
|
.getById({
|
||||||
userId: params.userId,
|
userId: params.userId,
|
||||||
})
|
})
|
||||||
.catch(catchTrpcNotFound);
|
.catch(catchTrpcNotFound)
|
||||||
|
.catch(catchTrpcUnauthorized);
|
||||||
|
|
||||||
if (!canAccessUserEditPage(session, user.id)) {
|
if (!canAccessUserEditPage(session, user.id)) {
|
||||||
notFound();
|
notFound();
|
||||||
|
|||||||
+12
-32
@@ -1,20 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { startTransition, useCallback, useState } from "react";
|
import { startTransition, useCallback, useState } from "react";
|
||||||
import {
|
import { Badge, Button, Card, Group, Stack, Stepper, Table, Text, TextInput, Title, Tooltip } from "@mantine/core";
|
||||||
Badge,
|
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
Group,
|
|
||||||
PasswordInput,
|
|
||||||
Stack,
|
|
||||||
Stepper,
|
|
||||||
Table,
|
|
||||||
Text,
|
|
||||||
TextInput,
|
|
||||||
Title,
|
|
||||||
Tooltip,
|
|
||||||
} from "@mantine/core";
|
|
||||||
import { useListState } from "@mantine/hooks";
|
import { useListState } from "@mantine/hooks";
|
||||||
import { IconPlus, IconUserCheck } from "@tabler/icons-react";
|
import { IconPlus, IconUserCheck } from "@tabler/icons-react";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
@@ -24,10 +11,11 @@ import type { GroupPermissionKey } from "@homarr/definitions";
|
|||||||
import { everyoneGroup, groupPermissions } from "@homarr/definitions";
|
import { everyoneGroup, groupPermissions } from "@homarr/definitions";
|
||||||
import type { IsValid } from "@homarr/form";
|
import type { IsValid } from "@homarr/form";
|
||||||
import { useZodForm } from "@homarr/form";
|
import { useZodForm } from "@homarr/form";
|
||||||
|
import { UserCreatePasswordFields } from "@homarr/forms-collection";
|
||||||
import { useModalAction } from "@homarr/modals";
|
import { useModalAction } from "@homarr/modals";
|
||||||
import { showErrorNotification } from "@homarr/notifications";
|
import { showErrorNotification } from "@homarr/notifications";
|
||||||
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
||||||
import { CustomPasswordInput, UserAvatar } from "@homarr/ui";
|
import { UserAvatar } from "@homarr/ui";
|
||||||
import { createCustomErrorParams } from "@homarr/validation/form/i18n";
|
import { createCustomErrorParams } from "@homarr/validation/form/i18n";
|
||||||
import { userPasswordSchema } from "@homarr/validation/user";
|
import { userPasswordSchema } from "@homarr/validation/user";
|
||||||
|
|
||||||
@@ -149,7 +137,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
color={!generalForm.isValid() ? "red" : undefined}
|
color={!generalForm.isValid() ? "red" : undefined}
|
||||||
>
|
>
|
||||||
<form>
|
<form>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<TextInput
|
<TextInput
|
||||||
label={tUserField("username.label")}
|
label={tUserField("username.label")}
|
||||||
@@ -165,27 +153,19 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Step label={t("step.security.label")} allowStepSelect={false} allowStepClick={false}>
|
<Stepper.Step label={t("step.security.label")} allowStepSelect={false} allowStepClick={false}>
|
||||||
<form>
|
<form>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<CustomPasswordInput
|
<UserCreatePasswordFields
|
||||||
withPasswordRequirements
|
|
||||||
label={tUserField("password.label")}
|
|
||||||
variant="filled"
|
variant="filled"
|
||||||
withAsterisk
|
passwordInputProps={securityForm.getInputProps("password")}
|
||||||
{...securityForm.getInputProps("password")}
|
confirmPasswordInputProps={securityForm.getInputProps("confirmPassword")}
|
||||||
/>
|
|
||||||
<PasswordInput
|
|
||||||
label={tUserField("passwordConfirm.label")}
|
|
||||||
variant="filled"
|
|
||||||
withAsterisk
|
|
||||||
{...securityForm.getInputProps("confirmPassword")}
|
|
||||||
/>
|
/>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
</form>
|
</form>
|
||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Step label={t("step.groups.label")} allowStepSelect={false} allowStepClick={false}>
|
<Stepper.Step label={t("step.groups.label")} allowStepSelect={false} allowStepClick={false}>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<GroupsForm
|
<GroupsForm
|
||||||
initialGroups={initialGroups}
|
initialGroups={initialGroups}
|
||||||
addGroup={(groupId) =>
|
addGroup={(groupId) =>
|
||||||
@@ -198,20 +178,20 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
</Card>
|
</Card>
|
||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
|
<Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack maw={300} align="center" mx="auto">
|
<Stack maw={300} align="center" mx="auto">
|
||||||
<UserAvatar
|
<UserAvatar
|
||||||
size="xl"
|
size="xl"
|
||||||
user={{ name: generalForm.values.username, email: generalForm.values.email ?? null, image: null }}
|
user={{ name: generalForm.values.username, email: generalForm.values.email ?? null, image: null }}
|
||||||
/>
|
/>
|
||||||
<Text tt="uppercase" fw="bolder" size="xl">
|
<Text fw={700} size="xl">
|
||||||
{generalForm.values.username}
|
{generalForm.values.username}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Completed>
|
<Stepper.Completed>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack align="center" maw={300} mx="auto">
|
<Stack align="center" maw={300} mx="auto">
|
||||||
<IconUserCheck size="3rem" />
|
<IconUserCheck size="3rem" />
|
||||||
<Title order={2}>{t("step.completed.title")}</Title>
|
<Title order={2}>{t("step.completed.title")}</Title>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export const StepperNavigationComponent = ({
|
|||||||
}: StepperNavigationComponentProps) => {
|
}: StepperNavigationComponentProps) => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
return (
|
return (
|
||||||
<Card shadow="md" withBorder>
|
<Card>
|
||||||
{!isComplete ? (
|
{!isComplete ? (
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
+1
-1
@@ -101,7 +101,7 @@ export const SaveAffix = ({ groupId }: SaveAffixProps) => {
|
|||||||
<div style={{ position: "sticky", bottom: 20 }}>
|
<div style={{ position: "sticky", bottom: 20 }}>
|
||||||
<Transition transition="slide-up" mounted={form.isDirty()}>
|
<Transition transition="slide-up" mounted={form.isDirty()}>
|
||||||
{(transitionStyles) => (
|
{(transitionStyles) => (
|
||||||
<Card style={transitionStyles} withBorder>
|
<Card style={transitionStyles}>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Text fw={500}>{tForm("unsavedChanges")}</Text>
|
<Text fw={500}>{tForm("unsavedChanges")}</Text>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -68,7 +68,6 @@ const PermissionCard = async ({ group, isDanger }: PermissionCardProps) => {
|
|||||||
return (
|
return (
|
||||||
<Card
|
<Card
|
||||||
p="md"
|
p="md"
|
||||||
withBorder
|
|
||||||
style={{
|
style={{
|
||||||
borderColor: isDanger ? "var(--mantine-color-red-8)" : undefined,
|
borderColor: isDanger ? "var(--mantine-color-red-8)" : undefined,
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ const SaveAffix = ({ visible, isPending, onDiscard, onSave }: SaveAffixProps) =>
|
|||||||
<div style={{ position: "sticky", bottom: 20 }}>
|
<div style={{ position: "sticky", bottom: 20 }}>
|
||||||
<Transition transition="slide-up" mounted={visible}>
|
<Transition transition="slide-up" mounted={visible}>
|
||||||
{(transitionStyles) => (
|
{(transitionStyles) => (
|
||||||
<Card style={transitionStyles} withBorder>
|
<Card style={transitionStyles}>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Text fw={500}>{t("common.unsavedChanges")}</Text>
|
<Text fw={500}>{t("common.unsavedChanges")}</Text>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { isProviderEnabled } from "@homarr/auth/server";
|
|||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
import { Link } from "@homarr/ui";
|
import { Link } from "@homarr/ui";
|
||||||
|
|
||||||
|
import { TourTarget } from "~/components/layout/header/tour-target";
|
||||||
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 { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
||||||
import { createMetaTitle } from "~/metadata";
|
import { createMetaTitle } from "~/metadata";
|
||||||
@@ -38,14 +39,18 @@ export default async function UsersPage() {
|
|||||||
title={t("list.title")}
|
title={t("list.title")}
|
||||||
primaryAction={
|
primaryAction={
|
||||||
credentialsProviderEnabled ? (
|
credentialsProviderEnabled ? (
|
||||||
<MobileAffixButton component={Link} href="/manage/users/create">
|
<TourTarget id="manage-users-create">
|
||||||
{t("create.title")}
|
<MobileAffixButton component={Link} href="/manage/users/create">
|
||||||
</MobileAffixButton>
|
{t("create.title")}
|
||||||
|
</MobileAffixButton>
|
||||||
|
</TourTarget>
|
||||||
) : undefined
|
) : undefined
|
||||||
}
|
}
|
||||||
floatingPrimaryAction={credentialsProviderEnabled}
|
floatingPrimaryAction={credentialsProviderEnabled}
|
||||||
>
|
>
|
||||||
<UserListComponent initialUserList={userList} />
|
<TourTarget id="manage-users-list">
|
||||||
|
<UserListComponent initialUserList={userList} />
|
||||||
|
</TourTarget>
|
||||||
</ManagePageLayout>
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -99,7 +99,7 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Card withBorder w={dimensions.width} h={dimensions.height} p={dimensions.height >= 96 ? undefined : 4}>
|
<Card w={dimensions.width} h={dimensions.height} p={dimensions.height >= 96 ? undefined : 4}>
|
||||||
<QueryErrorResetBoundary>
|
<QueryErrorResetBoundary>
|
||||||
{({ reset }) => (
|
{({ reset }) => (
|
||||||
<ErrorBoundary
|
<ErrorBoundary
|
||||||
@@ -123,17 +123,35 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
|
|||||||
</QueryErrorResetBoundary>
|
</QueryErrorResetBoundary>
|
||||||
</Card>
|
</Card>
|
||||||
<Affix bottom={12} right={72}>
|
<Affix bottom={12} right={72}>
|
||||||
<ActionIcon size={48} variant="default" radius="xl" onClick={handleOpenEditWidgetModal}>
|
<ActionIcon
|
||||||
|
size={48}
|
||||||
|
variant="default"
|
||||||
|
radius="xl"
|
||||||
|
onClick={handleOpenEditWidgetModal}
|
||||||
|
aria-label={t("common.action.edit")}
|
||||||
|
>
|
||||||
<IconPencil size={24} />
|
<IconPencil size={24} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Affix>
|
</Affix>
|
||||||
<Affix bottom={12} right={72 + 60}>
|
<Affix bottom={12} right={72 + 60}>
|
||||||
<ActionIcon size={48} variant="default" radius="xl" onClick={toggleEditMode}>
|
<ActionIcon
|
||||||
|
size={48}
|
||||||
|
variant="default"
|
||||||
|
radius="xl"
|
||||||
|
onClick={toggleEditMode}
|
||||||
|
aria-label={editMode ? t("widgetPreview.toggle.disabled") : t("widgetPreview.toggle.enabled")}
|
||||||
|
>
|
||||||
{editMode ? <IconToggleLeft size={24} /> : <IconToggleRight size={24} />}
|
{editMode ? <IconToggleLeft size={24} /> : <IconToggleRight size={24} />}
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Affix>
|
</Affix>
|
||||||
<Affix bottom={12} right={72 + 120}>
|
<Affix bottom={12} right={72 + 120}>
|
||||||
<ActionIcon size={48} variant="default" radius="xl" onClick={openDimensionsModal}>
|
<ActionIcon
|
||||||
|
size={48}
|
||||||
|
variant="default"
|
||||||
|
radius="xl"
|
||||||
|
onClick={openDimensionsModal}
|
||||||
|
aria-label={t("widgetPreview.dimensions.title")}
|
||||||
|
>
|
||||||
<IconDimensions size={24} />
|
<IconDimensions size={24} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Affix>
|
</Affix>
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ export const BoardItemContent = ({ item }: BoardItemContentProps) => {
|
|||||||
item.advancedOptions.customCssClasses.join(" "),
|
item.advancedOptions.customCssClasses.join(" "),
|
||||||
)}
|
)}
|
||||||
radius={board.itemRadius}
|
radius={board.itemRadius}
|
||||||
withBorder
|
|
||||||
styles={{
|
styles={{
|
||||||
root: {
|
root: {
|
||||||
"--opacity": board.opacity / 100,
|
"--opacity": board.opacity / 100,
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuP
|
|||||||
),
|
),
|
||||||
integrationSupport: "supportedIntegrations" in currentDefinition,
|
integrationSupport: "supportedIntegrations" in currentDefinition,
|
||||||
settings,
|
settings,
|
||||||
|
appId: item.kind === "app" ? (item.options.appId as string | undefined) : undefined,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title(t) {
|
title(t) {
|
||||||
@@ -105,9 +106,17 @@ const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuP
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu withinPortal withArrow position="right-start" arrowPosition="center">
|
<Menu withinPortal position="right-start" arrowPosition="center">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="default" radius={"xl"} pos="absolute" top={offset} right={offset} style={{ zIndex: 10 }}>
|
<ActionIcon
|
||||||
|
variant="default"
|
||||||
|
radius={"xl"}
|
||||||
|
pos="absolute"
|
||||||
|
top={offset}
|
||||||
|
right={offset}
|
||||||
|
style={{ zIndex: 10 }}
|
||||||
|
aria-label={tItem("menu.label.settings")}
|
||||||
|
>
|
||||||
<IconDotsVertical size={"1rem"} />
|
<IconDotsVertical size={"1rem"} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -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,47 +129,59 @@ 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" radius="md" 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 openDelay={300} closeDelay={100}>
|
<Tooltip.Group closeDelay={100}>
|
||||||
<Group gap={2}>
|
<Group gap={2}>
|
||||||
{integrations.slice(0, countToShow).map((integration) => (
|
{integrations.slice(0, countToShow).map((integration) => (
|
||||||
<Tooltip key={integration} label={getIntegrationName(integration)} withArrow>
|
<Tooltip key={integration} label={getIntegrationName(integration)} withArrow>
|
||||||
@@ -195,6 +206,6 @@ const SupportedIntegrations = ({ integrations, mt }: SupportedIntegrationsProps)
|
|||||||
)}
|
)}
|
||||||
</Group>
|
</Group>
|
||||||
</Tooltip.Group>
|
</Tooltip.Group>
|
||||||
</Center>
|
</Group>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -45,13 +45,7 @@ export const BoardCategorySection = ({ section }: Props) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card
|
<Card style={{ "--opacity": board.opacity / 100 }} radius={board.itemRadius} p={0} className={classes.itemCard}>
|
||||||
style={{ "--opacity": board.opacity / 100 }}
|
|
||||||
radius={board.itemRadius}
|
|
||||||
withBorder
|
|
||||||
p={0}
|
|
||||||
className={classes.itemCard}
|
|
||||||
>
|
|
||||||
<Stack>
|
<Stack>
|
||||||
<Group wrap="nowrap" gap="sm">
|
<Group wrap="nowrap" gap="sm">
|
||||||
<UnstyledButton w="100%" p="sm" onClick={toggle}>
|
<UnstyledButton w="100%" p="sm" onClick={toggle}>
|
||||||
|
|||||||
@@ -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,
|
||||||
|
});
|
||||||
@@ -30,9 +30,9 @@ export const CategoryMenu = ({ category }: Props) => {
|
|||||||
const t = useScopedI18n("section.category");
|
const t = useScopedI18n("section.category");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu withArrow>
|
<Menu>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon mr="sm" variant="transparent">
|
<ActionIcon mr="sm" variant="transparent" aria-label={t("menu.label.settings")}>
|
||||||
<IconDotsVertical size={20} />
|
<IconDotsVertical size={20} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useMemo } from "react";
|
import { useMemo } from "react";
|
||||||
|
|
||||||
import type { GridItemHTMLElement } from "@homarr/gridstack";
|
import type { GridItemHTMLElement } from "@homarr/gridstack";
|
||||||
|
import { WidgetSizeProvider } from "@homarr/widgets";
|
||||||
|
|
||||||
import type { DynamicSectionItem, SectionItem } from "~/app/[locale]/boards/_types";
|
import type { DynamicSectionItem, SectionItem } from "~/app/[locale]/boards/_types";
|
||||||
import { BoardItemContent } from "../items/item-content";
|
import { BoardItemContent } from "../items/item-content";
|
||||||
@@ -18,7 +19,7 @@ export const SectionContent = () => {
|
|||||||
* @see https://github.com/homarr-labs/homarr/pull/1770
|
* @see https://github.com/homarr-labs/homarr/pull/1770
|
||||||
*/
|
*/
|
||||||
const sortedItems = useMemo(() => {
|
const sortedItems = useMemo(() => {
|
||||||
return [...items, ...innerSections].sort((itemA, itemB) => {
|
return [...items, ...innerSections].toSorted((itemA, itemB) => {
|
||||||
if (itemA.yOffset === itemB.yOffset) {
|
if (itemA.yOffset === itemB.yOffset) {
|
||||||
return itemA.xOffset - itemB.xOffset;
|
return itemA.xOffset - itemB.xOffset;
|
||||||
}
|
}
|
||||||
@@ -59,7 +60,13 @@ const Item = ({ item, innerRef }: ItemProps) => {
|
|||||||
minWidth={minWidth}
|
minWidth={minWidth}
|
||||||
minHeight={minHeight}
|
minHeight={minHeight}
|
||||||
>
|
>
|
||||||
{item.type === "item" ? <BoardItemContent item={item} /> : <BoardDynamicSection section={item} />}
|
{item.type === "item" ? (
|
||||||
|
<WidgetSizeProvider gridWidth={item.width} gridHeight={item.height}>
|
||||||
|
<BoardItemContent item={item} />
|
||||||
|
</WidgetSizeProvider>
|
||||||
|
) : (
|
||||||
|
<BoardDynamicSection section={item} />
|
||||||
|
)}
|
||||||
</GridStackItem>
|
</GridStackItem>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ export const BoardDynamicSection = ({ section }: Props) => {
|
|||||||
className={combineClasses(classes.itemCard, section.options.customCssClasses.join(" "))}
|
className={combineClasses(classes.itemCard, section.options.customCssClasses.join(" "))}
|
||||||
w="100%"
|
w="100%"
|
||||||
h="100%"
|
h="100%"
|
||||||
withBorder
|
|
||||||
styles={{
|
styles={{
|
||||||
root: {
|
root: {
|
||||||
overflow: "visible",
|
overflow: "visible",
|
||||||
|
|||||||
@@ -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,
|
||||||
});
|
});
|
||||||
@@ -43,9 +43,17 @@ export const BoardDynamicSectionMenu = ({ section }: { section: DynamicSectionIt
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu withinPortal withArrow position="right-start" arrowPosition="center">
|
<Menu withinPortal position="right-start" arrowPosition="center">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="default" radius={"xl"} pos="absolute" top={4} right={4} style={{ zIndex: 10 }}>
|
<ActionIcon
|
||||||
|
variant="default"
|
||||||
|
radius={"xl"}
|
||||||
|
pos="absolute"
|
||||||
|
top={4}
|
||||||
|
right={4}
|
||||||
|
style={{ zIndex: 10 }}
|
||||||
|
aria-label={tItem("menu.label.settings")}
|
||||||
|
>
|
||||||
<IconDotsVertical size={"1rem"} />
|
<IconDotsVertical size={"1rem"} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -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,
|
||||||
|
});
|
||||||
@@ -6,11 +6,20 @@ import { LanguageCombobox } from "./language-combobox";
|
|||||||
|
|
||||||
interface CurrentLanguageComboboxProps {
|
interface CurrentLanguageComboboxProps {
|
||||||
width?: string;
|
width?: string;
|
||||||
|
withinPortal?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const CurrentLanguageCombobox = ({ width }: CurrentLanguageComboboxProps) => {
|
export const CurrentLanguageCombobox = ({ width, withinPortal }: CurrentLanguageComboboxProps) => {
|
||||||
const currentLocale = useCurrentLocale();
|
const currentLocale = useCurrentLocale();
|
||||||
const { changeLocale, isPending } = useChangeLocale();
|
const { changeLocale, isPending } = useChangeLocale();
|
||||||
|
|
||||||
return <LanguageCombobox value={currentLocale} onChange={changeLocale} isPending={isPending} width={width} />;
|
return (
|
||||||
|
<LanguageCombobox
|
||||||
|
value={currentLocale}
|
||||||
|
onChange={changeLocale}
|
||||||
|
isPending={isPending}
|
||||||
|
width={width}
|
||||||
|
withinPortal={withinPortal}
|
||||||
|
/>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
@@ -16,9 +16,17 @@ interface LanguageComboboxProps {
|
|||||||
onChange: (value: SupportedLanguage) => void;
|
onChange: (value: SupportedLanguage) => void;
|
||||||
isPending?: boolean;
|
isPending?: boolean;
|
||||||
width?: string;
|
width?: string;
|
||||||
|
withinPortal?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const LanguageCombobox = ({ label, value, onChange, isPending, width }: LanguageComboboxProps) => {
|
export const LanguageCombobox = ({
|
||||||
|
label,
|
||||||
|
value,
|
||||||
|
onChange,
|
||||||
|
isPending,
|
||||||
|
width,
|
||||||
|
withinPortal = false,
|
||||||
|
}: LanguageComboboxProps) => {
|
||||||
const combobox = useCombobox({
|
const combobox = useCombobox({
|
||||||
onDropdownClose: () => combobox.resetSelectedOption(),
|
onDropdownClose: () => combobox.resetSelectedOption(),
|
||||||
});
|
});
|
||||||
@@ -39,7 +47,7 @@ export const LanguageCombobox = ({ label, value, onChange, isPending, width }: L
|
|||||||
}, [combobox]);
|
}, [combobox]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Combobox store={combobox} onOptionSubmit={handleOnOptionSubmit}>
|
<Combobox store={combobox} withinPortal={withinPortal} onOptionSubmit={handleOnOptionSubmit}>
|
||||||
<Combobox.Target>
|
<Combobox.Target>
|
||||||
<InputBase
|
<InputBase
|
||||||
component="button"
|
component="button"
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { Link } from "@homarr/ui";
|
|||||||
|
|
||||||
import { ClientBurger } from "./header/burger";
|
import { ClientBurger } from "./header/burger";
|
||||||
import { DesktopSearchInput, MobileSearchButton } from "./header/search";
|
import { DesktopSearchInput, MobileSearchButton } from "./header/search";
|
||||||
|
import { TourTarget } from "./header/tour-target";
|
||||||
import { UserButton } from "./header/user";
|
import { UserButton } from "./header/user";
|
||||||
import { HomarrLogoWithTitle } from "./logo/homarr-logo";
|
import { HomarrLogoWithTitle } from "./logo/homarr-logo";
|
||||||
|
|
||||||
@@ -25,11 +26,15 @@ export const MainHeader = ({ logo, actions, hasNavigation = true }: Props) => {
|
|||||||
{logo ?? <HomarrLogoWithTitle size="md" />}
|
{logo ?? <HomarrLogoWithTitle size="md" />}
|
||||||
</UnstyledButton>
|
</UnstyledButton>
|
||||||
</Group>
|
</Group>
|
||||||
<DesktopSearchInput />
|
<TourTarget id="board-search">
|
||||||
|
<DesktopSearchInput />
|
||||||
|
</TourTarget>
|
||||||
<Group h="100%" align="center" justify="end" style={{ flex: 1 }} wrap="nowrap">
|
<Group h="100%" align="center" justify="end" style={{ flex: 1 }} wrap="nowrap">
|
||||||
{actions}
|
{actions}
|
||||||
<MobileSearchButton />
|
<MobileSearchButton />
|
||||||
<UserButton />
|
<TourTarget id="board-user-menu">
|
||||||
|
<UserButton />
|
||||||
|
</TourTarget>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
<Spotlight />
|
<Spotlight />
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import type { ReactNode } from "react";
|
||||||
|
import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
|
||||||
|
import { Box } from "@mantine/core";
|
||||||
|
|
||||||
|
export const TourTarget = ({ id, children }: { id: string; children: ReactNode }) => (
|
||||||
|
<OnboardingTour.Target id={id}>
|
||||||
|
<Box data-tour-target={id}>{children}</Box>
|
||||||
|
</OnboardingTour.Target>
|
||||||
|
);
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import type { ReactNode } from "react";
|
import type { ReactNode } from "react";
|
||||||
import { usePathname } from "next/navigation";
|
import { usePathname } from "next/navigation";
|
||||||
|
import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
|
||||||
import { NavLink } from "@mantine/core";
|
import { NavLink } from "@mantine/core";
|
||||||
|
|
||||||
import { Link } from "@homarr/ui";
|
import { Link } from "@homarr/ui";
|
||||||
@@ -9,55 +10,45 @@ import { Link } from "@homarr/ui";
|
|||||||
export const CommonNavLink = (props: ClientNavigationLink) =>
|
export const CommonNavLink = (props: ClientNavigationLink) =>
|
||||||
"href" in props ? <NavLinkHref {...props} /> : <NavLinkWithItems {...props} />;
|
"href" in props ? <NavLinkHref {...props} /> : <NavLinkWithItems {...props} />;
|
||||||
|
|
||||||
|
const TourTarget = ({ id, children }: { id?: string; children: ReactNode }) => {
|
||||||
|
if (!id) return <>{children}</>;
|
||||||
|
return <OnboardingTour.Target id={id}>{children}</OnboardingTour.Target>;
|
||||||
|
};
|
||||||
|
|
||||||
const NavLinkHref = (props: NavigationLinkHref) => {
|
const NavLinkHref = (props: NavigationLinkHref) => {
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
return props.external ? (
|
const tourId = props["data-onboarding-tour-id"];
|
||||||
<NavLink
|
const link = props.external ? (
|
||||||
component="a"
|
<NavLink component="a" label={props.label} leftSection={props.icon} href={props.href} target="_blank" />
|
||||||
label={props.label}
|
|
||||||
leftSection={props.icon}
|
|
||||||
href={props.href}
|
|
||||||
style={{
|
|
||||||
borderRadius: 5,
|
|
||||||
}}
|
|
||||||
target="_blank"
|
|
||||||
/>
|
|
||||||
) : (
|
) : (
|
||||||
<NavLink
|
<NavLink
|
||||||
component={Link}
|
component={Link}
|
||||||
label={props.label}
|
label={props.label}
|
||||||
leftSection={props.icon}
|
leftSection={props.icon}
|
||||||
href={props.href}
|
href={props.href}
|
||||||
active={pathname === props.href}
|
active={pathname === props.href || pathname.startsWith(`${props.href}/`)}
|
||||||
style={{
|
|
||||||
borderRadius: 5,
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
return <TourTarget id={tourId}>{link}</TourTarget>;
|
||||||
};
|
};
|
||||||
|
|
||||||
const NavLinkWithItems = (props: NavigationLinkWithItems) => {
|
const NavLinkWithItems = (props: NavigationLinkWithItems) => {
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
const isActive = props.items.some((item) => item.href === pathname);
|
const isActive = props.items.some((item) => pathname === item.href || pathname.startsWith(`${item.href}/`));
|
||||||
return (
|
const nav = (
|
||||||
<NavLink
|
<NavLink label={props.label} leftSection={props.icon} defaultOpened={isActive}>
|
||||||
style={{
|
|
||||||
borderRadius: 5,
|
|
||||||
}}
|
|
||||||
label={props.label}
|
|
||||||
leftSection={props.icon}
|
|
||||||
defaultOpened={isActive}
|
|
||||||
>
|
|
||||||
{props.items.map((item) => (
|
{props.items.map((item) => (
|
||||||
<NavLinkHref key={item.label} {...item} />
|
<NavLinkHref key={item.label} {...item} />
|
||||||
))}
|
))}
|
||||||
</NavLink>
|
</NavLink>
|
||||||
);
|
);
|
||||||
|
return <TourTarget id={props["data-onboarding-tour-id"]}>{nav}</TourTarget>;
|
||||||
};
|
};
|
||||||
|
|
||||||
interface CommonNavigationLinkProps {
|
interface CommonNavigationLinkProps {
|
||||||
label: string;
|
label: string;
|
||||||
icon: ReactNode;
|
icon: ReactNode;
|
||||||
|
"data-onboarding-tour-id"?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface NavigationLinkHref extends CommonNavigationLinkProps {
|
interface NavigationLinkHref extends CommonNavigationLinkProps {
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export const MainNavigation = ({ headerSection, footerSection, links }: MainNavi
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { icon: TablerIcon, iconProps, ...props } = link;
|
const { icon: TablerIcon, iconProps, "data-onboarding-tour-id": tourId, ...props } = link;
|
||||||
const Icon =
|
const Icon =
|
||||||
typeof TablerIcon === "string" ? (
|
typeof TablerIcon === "string" ? (
|
||||||
<Image src={TablerIcon} w={20} h={20} />
|
<Image src={TablerIcon} w={20} h={20} />
|
||||||
@@ -38,17 +38,20 @@ export const MainNavigation = ({ headerSection, footerSection, links }: MainNavi
|
|||||||
if ("items" in props) {
|
if ("items" in props) {
|
||||||
clientLink = {
|
clientLink = {
|
||||||
...props,
|
...props,
|
||||||
|
"data-onboarding-tour-id": tourId,
|
||||||
items: props.items
|
items: props.items
|
||||||
.filter((item) => !item.hidden)
|
.filter((item) => !item.hidden)
|
||||||
.map((item) => {
|
.map((item) => {
|
||||||
|
const { "data-onboarding-tour-id": itemTourId, ...rest } = item;
|
||||||
return {
|
return {
|
||||||
...item,
|
...rest,
|
||||||
|
"data-onboarding-tour-id": itemTourId,
|
||||||
icon: <item.icon size={20} stroke={1.5} {...iconProps} />,
|
icon: <item.icon size={20} stroke={1.5} {...iconProps} />,
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
} as ClientNavigationLink;
|
} as ClientNavigationLink;
|
||||||
} else {
|
} else {
|
||||||
clientLink = props as ClientNavigationLink;
|
clientLink = { ...props, "data-onboarding-tour-id": tourId } as ClientNavigationLink;
|
||||||
}
|
}
|
||||||
return <CommonNavLink key={index} {...clientLink} icon={Icon} />;
|
return <CommonNavLink key={index} {...clientLink} icon={Icon} />;
|
||||||
})}
|
})}
|
||||||
@@ -63,6 +66,7 @@ interface CommonNavigationLinkProps {
|
|||||||
icon: TablerIcon | string;
|
icon: TablerIcon | string;
|
||||||
iconProps?: TablerIconProps;
|
iconProps?: TablerIconProps;
|
||||||
hidden?: boolean;
|
hidden?: boolean;
|
||||||
|
"data-onboarding-tour-id"?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface NavigationLinkHref extends CommonNavigationLinkProps {
|
interface NavigationLinkHref extends CommonNavigationLinkProps {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export const DangerZoneRoot = async ({ children }: DangerZoneRootProps) => {
|
|||||||
<Title c="red.8" order={2}>
|
<Title c="red.8" order={2}>
|
||||||
{t("common.dangerZone")}
|
{t("common.dangerZone")}
|
||||||
</Title>
|
</Title>
|
||||||
<Card withBorder style={{ borderColor: "var(--mantine-color-red-8)", borderWidth: 3 }}>
|
<Card style={{ borderColor: "var(--mantine-color-red-8)", borderWidth: 3 }}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
{Array.isArray(children)
|
{Array.isArray(children)
|
||||||
? children.map((child, index) => (
|
? children.map((child, index) => (
|
||||||
|
|||||||
@@ -58,19 +58,23 @@ export const DynamicBreadcrumb = ({
|
|||||||
}
|
}
|
||||||
const href = `/${pathnameParts.slice(0, index + 1).join("/")}`;
|
const href = `/${pathnameParts.slice(0, index + 1).join("/")}`;
|
||||||
const translationKey = `${pathnameParts.slice(0, index + 1).join(".")}`;
|
const translationKey = `${pathnameParts.slice(0, index + 1).join(".")}`;
|
||||||
|
const mappedValue = dynamicMappings?.get(pathnamePart);
|
||||||
|
|
||||||
|
if (mappedValue) {
|
||||||
|
if (nonInteractable?.includes(pathnamePart)) {
|
||||||
|
return <Text key={href}>{mappedValue}</Text>;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<Anchor key={href} href={href}>
|
||||||
|
{mappedValue}
|
||||||
|
</Anchor>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (nonInteractable?.includes(pathnamePart)) {
|
if (nonInteractable?.includes(pathnamePart)) {
|
||||||
return <Text key={href}>{t(`${translationKey}.label` as TranslationKeys)}</Text>;
|
return <Text key={href}>{t(`${translationKey}.label` as TranslationKeys)}</Text>;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dynamicMappings?.has(pathnamePart)) {
|
|
||||||
return (
|
|
||||||
<Anchor key={href} href={href}>
|
|
||||||
{dynamicMappings.get(pathnamePart)}
|
|
||||||
</Anchor>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Anchor key={href} href={href}>
|
<Anchor key={href} href={href}>
|
||||||
{t(`${translationKey}.label` as TranslationKeys)}
|
{t(`${translationKey}.label` as TranslationKeys)}
|
||||||
|
|||||||
Loaded 100 of 353 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user