Skip to content

A modern and easy to use dashboard. 80+ integrations. 20K+ icons built in. Authentication out of the box. No YAML, drag and drop configuration.

perf(manage): prefetch navigation and align primary actions (#7301)

Thomasd3e76ebdce16
diff --git a/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx b/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx
index 4300d1abf..32213946a 100644
--- a/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/assistant/_components/assistant-configuration.tsx
@@ -41,6 +41,7 @@ import {
IconWorld,
} from "@tabler/icons-react";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import {
assistantProviderCanUseOpenRouterServerTools,
@@ -140,27 +141,35 @@ const ConfigurationSkeleton = ({ label }: { label: string }) => (
);
interface AssistantConfigurationProps {
+ initialConfiguration?: RouterOutputs["assistant"]["getAdminConfiguration"];
// Onboarding defers the root provider refresh until completion to preserve setup drafts.
refreshAfterSave?: boolean;
}
-export const AssistantConfiguration = ({ refreshAfterSave = true }: AssistantConfigurationProps) => {
+export const AssistantConfiguration = ({
+ initialConfiguration,
+ refreshAfterSave = true,
+}: AssistantConfigurationProps) => {
const t = useI18n("management.page.settings.section.assistant");
const tCommon = useI18n("common");
const router = useRouter();
const utils = clientApi.useUtils();
- const { data: configuration, isLoading } = clientApi.assistant.getAdminConfiguration.useQuery();
- const [provider, setProvider] = useState<AssistantProvider>("homarr");
- const [baseUrl, setBaseUrl] = useState<string>(assistantProviderPresets.homarr.baseUrl);
- const [modelDiscoveryPath, setModelDiscoveryPath] = useState<string>("/models");
+ const { data: configuration, isLoading } = clientApi.assistant.getAdminConfiguration.useQuery(undefined, {
+ initialData: initialConfiguration,
+ refetchOnWindowFocus: false,
+ refetchOnReconnect: false,
+ });
+ const [provider, setProvider] = useState<AssistantProvider>(configuration?.provider ?? "homarr");
+ const [baseUrl, setBaseUrl] = useState(configuration?.baseUrl ?? assistantProviderPresets.homarr.baseUrl);
+ const [modelDiscoveryPath, setModelDiscoveryPath] = useState(configuration?.modelDiscoveryPath ?? "/models");
const [apiKey, setApiKey] = useState("");
const [credentialFlow, setCredentialFlow] = useState<CredentialFlow>("idle");
const [headers, setHeaders] = useState<HeaderEntry[]>([]);
const [clearHeaders, setClearHeaders] = useState(false);
const [nextHeaderId, setNextHeaderId] = useState(1);
- const [modelId, setModelId] = useState("");
- const [enabled, setEnabled] = useState(false);
- const [webSearchEnabled, setWebSearchEnabled] = useState(false);
+ const [modelId, setModelId] = useState(configuration?.modelId ?? "");
+ const [enabled, setEnabled] = useState(configuration?.enabled ?? false);
+ const [webSearchEnabled, setWebSearchEnabled] = useState(configuration?.webSearchEnabled ?? false);
useEffect(() => {
const configuredProvider = configuration?.provider ?? "homarr";
diff --git a/apps/nextjs/src/app/[locale]/manage/assistant/page.tsx b/apps/nextjs/src/app/[locale]/manage/assistant/page.tsx
index a3ee8961e..1ebf57b42 100644
--- a/apps/nextjs/src/app/[locale]/manage/assistant/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/assistant/page.tsx
@@ -1,6 +1,7 @@
import { notFound } from "next/navigation";
import { Text } from "@mantine/core";
+import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
import { getI18n } from "@homarr/translation/server";
@@ -22,12 +23,13 @@ export default async function AssistantPage() {
}
const t = await getI18n("management.page.settings.section.assistant");
+ const configuration = await api.assistant.getAdminConfiguration();
return (
<ManagePageLayout title={t("title")}>
<Text c="dimmed" maw="70ch">
{t("description")}
</Text>
- <AssistantConfiguration />
+ <AssistantConfiguration initialConfiguration={configuration} />
</ManagePageLayout>
);
}
diff --git a/apps/nextjs/src/app/[locale]/manage/boards/_components/boards-page-content.tsx b/apps/nextjs/src/app/[locale]/manage/boards/_components/boards-page-content.tsx
new file mode 100644
index 000000000..4b82057dc
--- /dev/null
+++ b/apps/nextjs/src/app/[locale]/manage/boards/_components/boards-page-content.tsx
@@ -0,0 +1,73 @@
+"use client";
+
+import type { PropsWithChildren } from "react";
+import { useEffect, useState } from "react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { Button, Card, Collapse } from "@mantine/core";
+import { IconCategoryPlus } from "@tabler/icons-react";
+
+import { BoardCreateForm } from "@homarr/forms-collection";
+import { useI18n } from "@homarr/translation/client";
+
+import { TourTarget } from "~/components/layout/header/tour-target";
+import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+
+interface BoardsPageContentProps {
+ title: string;
+ canCreateBoards: boolean;
+}
+
+export const BoardsPageContent = ({ title, canCreateBoards, children }: PropsWithChildren<BoardsPageContentProps>) => {
+ const t = useI18n("management.page.board.action");
+ const router = useRouter();
+ const searchParams = useSearchParams();
+ const [isOpen, setIsOpen] = useState(searchParams.get("create") === "true");
+ const [formKey, setFormKey] = useState(0);
+
+ useEffect(() => {
+ if (searchParams.get("create") !== "true") return;
+
+ setFormKey((value) => value + 1);
+ setIsOpen(true);
+ }, [searchParams]);
+
+ const close = () => {
+ setIsOpen(false);
+ setFormKey((value) => value + 1);
+ if (searchParams.has("create")) router.replace("/manage/boards", { scroll: false });
+ };
+
+ const toggle = () => {
+ if (isOpen) {
+ close();
+ return;
+ }
+
+ setFormKey((value) => value + 1);
+ setIsOpen(true);
+ };
+
+ return (
+ <ManagePageLayout
+ title={title}
+ primaryAction={
+ canCreateBoards && (
+ <TourTarget id="manage-boards-create">
+ <Button leftSection={<IconCategoryPlus size="1rem" />} onClick={toggle} aria-expanded={isOpen}>
+ {t("new.label")}
+ </Button>
+ </TourTarget>
+ )
+ }
+ >
+ {canCreateBoards && (
+ <Collapse expanded={isOpen}>
+ <Card withBorder>
+ <BoardCreateForm key={formKey} onCancel={close} />
+ </Card>
+ </Collapse>
+ )}
+ {children}
+ </ManagePageLayout>
+ );
+};
diff --git a/apps/nextjs/src/app/[locale]/manage/boards/_components/create-board-button.tsx b/apps/nextjs/src/app/[locale]/manage/boards/_components/create-board-button.tsx
deleted file mode 100644
index ce9059784..000000000
--- a/apps/nextjs/src/app/[locale]/manage/boards/_components/create-board-button.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-"use client";
-
-import { useEffect, useState } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
-import { Button, Card, Collapse, Group, Stack } from "@mantine/core";
-import { IconCategoryPlus } from "@tabler/icons-react";
-
-import { BoardCreateForm } from "@homarr/forms-collection";
-import { useI18n } from "@homarr/translation/client";
-
-export const CreateBoardButton = () => {
- const t = useI18n("management.page.board.action");
- const router = useRouter();
- const searchParams = useSearchParams();
- const [isOpen, setIsOpen] = useState(searchParams.get("create") === "true");
- const [formKey, setFormKey] = useState(0);
-
- useEffect(() => {
- if (searchParams.get("create") !== "true") return;
-
- setFormKey((value) => value + 1);
- setIsOpen(true);
- }, [searchParams]);
-
- const close = () => {
- setIsOpen(false);
- setFormKey((value) => value + 1);
- if (searchParams.has("create")) router.replace("/manage/boards", { scroll: false });
- };
-
- const toggle = () => {
- if (isOpen) {
- close();
- return;
- }
-
- setFormKey((value) => value + 1);
- setIsOpen(true);
- };
-
- return (
- <Stack>
- <Group justify="end">
- <Button leftSection={<IconCategoryPlus size="1rem" />} onClick={toggle}>
- {t("new.label")}
- </Button>
- </Group>
- <Collapse expanded={isOpen}>
- <Card withBorder>
- <BoardCreateForm key={formKey} onCancel={close} />
- </Card>
- </Collapse>
- </Stack>
- );
-};
diff --git a/apps/nextjs/src/app/[locale]/manage/boards/page.tsx b/apps/nextjs/src/app/[locale]/manage/boards/page.tsx
index e3b3a1286..2ba74a40d 100644
--- a/apps/nextjs/src/app/[locale]/manage/boards/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/boards/page.tsx
@@ -7,24 +7,18 @@ import { constructBoardPermissions } from "@homarr/auth/shared";
import { getI18n } from "@homarr/translation/server";
import { TourTarget } from "~/components/layout/header/tour-target";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
import { NoResults } from "~/components/no-results";
import { BoardCard } from "./_components/board-card";
-import { CreateBoardButton } from "./_components/create-board-button";
+import { BoardsPageContent } from "./_components/boards-page-content";
export default async function ManageBoardsPage() {
const t = await getI18n("management.page.board");
const session = await auth();
const boards = await api.board.getManageOverview();
- const canCreateBoards = session?.user.permissions.includes("board-create");
+ const canCreateBoards = session?.user.permissions.includes("board-create") ?? false;
return (
- <ManagePageLayout title={t("title")}>
- {canCreateBoards && (
- <TourTarget id="manage-boards-create">
- <CreateBoardButton />
- </TourTarget>
- )}
+ <BoardsPageContent title={t("title")} canCreateBoards={canCreateBoards}>
{boards.length === 0 && (
<NoResults icon={IconLayoutDashboard} title={t("noResults.title")} description={t("noResults.description")} />
)}
@@ -56,6 +50,6 @@ export default async function ManageBoardsPage() {
</Grid>
</TourTarget>
)}
- </ManagePageLayout>
+ </BoardsPageContent>
);
}
diff --git a/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/_workshop-publish-form.tsx b/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/_workshop-publish-form.tsx
index 36aa1bdc0..3415948c0 100644
--- a/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/_workshop-publish-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/_workshop-publish-form.tsx
@@ -17,6 +17,7 @@ import {
} from "@mantine/core";
import { IconArrowLeft, IconBuildingStore, IconCheck, IconExternalLink, IconPhoto } from "@tabler/icons-react";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { useByteFormatter } from "@homarr/settings";
import { useI18n } from "@homarr/translation/client";
@@ -33,7 +34,12 @@ import { WorkshopAccountButton, useWorkshopSession } from "~/components/workshop
const listHref = "/manage/custom-widgets";
-export function WorkshopPublishForm({ widget }: { widget: { id: string; name: string } }) {
+interface WorkshopPublishFormProps {
+ widget: { id: string; name: string };
+ initialDefinition: RouterOutputs["customWidget"]["export"];
+}
+
+export function WorkshopPublishForm({ widget, initialDefinition }: WorkshopPublishFormProps) {
const t = useI18n("workshop");
const tCommon = useI18n("common");
const { formatBytes } = useByteFormatter();
@@ -45,7 +51,7 @@ export function WorkshopPublishForm({ widget }: { widget: { id: string; name: st
const [publishedSubmissionId, setPublishedSubmissionId] = useState<string | null>(null);
const createSubmission = useWorkshopCreateMutation(session.client);
- const definition = clientApi.customWidget.export.useQuery({ id: widget.id });
+ const definition = clientApi.customWidget.export.useQuery({ id: widget.id }, { initialData: initialDefinition });
const breadcrumb = <DynamicBreadcrumb dynamicMappings={new Map([[widget.id, widget.name]])} />;
diff --git a/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/page.tsx b/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/page.tsx
index 3cac4e498..939e0deaf 100644
--- a/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/custom-widgets/publish/[id]/page.tsx
@@ -15,7 +15,10 @@ export default async function WorkshopPublishPage(props: WorkshopPublishPageProp
const [session, { id }] = await Promise.all([auth(), props.params]);
if (!session) redirect(createLoginUrl(`/manage/custom-widgets/publish/${id}`));
if (!session.user.permissions.includes("admin")) redirect("/");
- const definition = await api.customWidget.get({ id }).catch(catchTrpcNotFound);
+ const [definition, exportedDefinition] = await Promise.all([
+ api.customWidget.get({ id }).catch(catchTrpcNotFound),
+ api.customWidget.export({ id }).catch(catchTrpcNotFound),
+ ]);
- return <WorkshopPublishForm widget={{ id, name: definition.name }} />;
+ return <WorkshopPublishForm widget={{ id, name: definition.name }} initialDefinition={exportedDefinition} />;
}
diff --git a/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form-wrapper.tsx b/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form-wrapper.tsx
index 7d7768ec2..270a5ba7e 100644
--- a/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form-wrapper.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form-wrapper.tsx
@@ -2,17 +2,24 @@
import { useRouter } from "next/navigation";
+import type { RouterOutputs } from "@homarr/api";
import type { IntegrationKind } from "@homarr/definitions";
import { NewIntegrationForm } from "./_integration-new-form";
interface IntegrationNewFormWrapperProps {
+ selectableApps: RouterOutputs["app"]["selectable"];
kind: IntegrationKind;
initialUrl?: string;
initialName?: string;
}
-export const IntegrationNewFormWrapper = ({ kind, initialUrl, initialName }: IntegrationNewFormWrapperProps) => {
+export const IntegrationNewFormWrapper = ({
+ kind,
+ initialUrl,
+ initialName,
+ selectableApps,
+}: IntegrationNewFormWrapperProps) => {
const router = useRouter();
return (
@@ -20,6 +27,7 @@ export const IntegrationNewFormWrapper = ({ kind, initialUrl, initialName }: Int
kind={kind}
initialUrl={initialUrl}
initialName={initialName}
+ selectableApps={selectableApps}
onSuccess={() => router.push("/manage/integrations")}
/>
);
diff --git a/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx b/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx
index 5f9a9296e..97167c5aa 100644
--- a/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx
@@ -49,6 +49,7 @@ import { IntegrationTestConnectionError } from "../_components/test-connection/i
import type { AnyMappedTestConnectionError } from "../_components/test-connection/types";
interface NewIntegrationFormProps {
+ selectableApps?: RouterOutputs["app"]["selectable"];
kind: IntegrationKind;
initialUrl?: string;
initialName?: string;
@@ -67,7 +68,14 @@ const formSchema = integrationCreateSchema.omit({ kind: true, app: true }).and(
}),
);
-export const NewIntegrationForm = ({ kind, initialUrl, initialName, onSuccess, onCancel }: NewIntegrationFormProps) => {
+export const NewIntegrationForm = ({
+ kind,
+ initialUrl,
+ initialName,
+ onSuccess,
+ onCancel,
+ selectableApps,
+}: NewIntegrationFormProps) => {
const tCommon = useI18n("common");
const tIntegration = useI18n("integration");
const secretKinds = getAllSecretKindOptions(kind);
@@ -237,7 +245,7 @@ export const NewIntegrationForm = ({ kind, initialUrl, initialName, onSuccess, o
/>
)}
- <AppForm form={form} canCreateApps={canCreateApps} />
+ <AppForm form={form} canCreateApps={canCreateApps} selectableApps={selectableApps} />
<Group justify="end" align="center">
{onCancel ? (
@@ -260,7 +268,15 @@ export const NewIntegrationForm = ({ kind, initialUrl, initialName, onSuccess, o
type FormType = z.infer<typeof formSchema>;
-const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; canCreateApps: boolean }) => {
+const AppForm = ({
+ form,
+ canCreateApps,
+ selectableApps,
+}: {
+ form: UseFormReturnType<FormType>;
+ canCreateApps: boolean;
+ selectableApps?: RouterOutputs["app"]["selectable"];
+}) => {
const tIntegration = useI18n("integration");
const checkboxInputProps = form.getInputProps("hasApp", { type: "checkbox" });
@@ -310,7 +326,7 @@ const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; c
{...form.getInputProps("appHref")}
/>
) : (
- <IntegrationAppSelect {...form.getInputProps("appId")} />
+ <IntegrationAppSelect {...form.getInputProps("appId")} selectableApps={selectableApps} />
)}
</Stack>
</Fieldset>
@@ -358,11 +374,12 @@ type IntegrationAppSelectProps = Modify<
{
value?: string | null;
onChange: (value: string | null) => void;
+ selectableApps?: RouterOutputs["app"]["selectable"];
}
>;
-const IntegrationAppSelect = ({ value, ...props }: IntegrationAppSelectProps) => {
- const { data, isPending } = clientApi.app.selectable.useQuery();
+const IntegrationAppSelect = ({ value, selectableApps, ...props }: IntegrationAppSelectProps) => {
+ const { data, isPending } = clientApi.app.selectable.useQuery(undefined, { initialData: selectableApps });
const tIntegration = useI18n("integration");
const appMap = new Map(data?.map((app) => [app.id, app] as const));
diff --git a/apps/nextjs/src/app/[locale]/manage/integrations/new/page.tsx b/apps/nextjs/src/app/[locale]/manage/integrations/new/page.tsx
index 3f7cc3e6b..9fe89ff7d 100644
--- a/apps/nextjs/src/app/[locale]/manage/integrations/new/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/integrations/new/page.tsx
@@ -2,6 +2,7 @@ import { notFound } from "next/navigation";
import { Container, Group, Stack, Title } from "@mantine/core";
import { z } from "zod/v4";
+import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
import { getIntegrationName, integrationKinds } from "@homarr/definitions";
import { getI18n } from "@homarr/translation/server";
@@ -47,6 +48,7 @@ export default async function IntegrationsNewPage(props: NewIntegrationPageProps
const tCreate = await getI18n("integration.page.create");
const currentKind = result.data;
+ const selectableApps = await api.app.selectable();
return (
<>
@@ -57,7 +59,12 @@ export default async function IntegrationsNewPage(props: NewIntegrationPageProps
<IntegrationAvatar kind={currentKind} size="md" />
<Title>{tCreate("title", { name: getIntegrationName(currentKind) })}</Title>
</Group>
- <IntegrationNewFormWrapper kind={currentKind} initialUrl={searchParams.url} initialName={searchParams.name} />
+ <IntegrationNewFormWrapper
+ kind={currentKind}
+ initialUrl={searchParams.url}
+ initialName={searchParams.name}
+ selectableApps={selectableApps}
+ />
</Stack>
</Container>
</>
diff --git a/apps/nextjs/src/app/[locale]/manage/layout.tsx b/apps/nextjs/src/app/[locale]/manage/layout.tsx
index a9d7fb4db..5e697c9e5 100644
--- a/apps/nextjs/src/app/[locale]/manage/layout.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/layout.tsx
@@ -164,6 +164,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
label: t("items.tools.items.kubernetes"),
icon: IconBox,
href: "/manage/tools/kubernetes",
+ prefetch: false,
hidden: !(session?.user.permissions.includes("admin") && env.ENABLE_KUBERNETES),
},
{
diff --git a/apps/nextjs/src/app/[locale]/manage/search-engines/_form.tsx b/apps/nextjs/src/app/[locale]/manage/search-engines/_form.tsx
index 0b37cd1ed..85aff9b12 100644
--- a/apps/nextjs/src/app/[locale]/manage/search-engines/_form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/search-engines/_form.tsx
@@ -5,6 +5,7 @@ import { Button, Fieldset, Grid, Group, SegmentedControl, Stack, Textarea, TextI
import { WidgetIntegrationSelect } from "@homarr/widgets/widget-integration-select";
import type { z } from "zod/v4";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { searchEngineTypes } from "@homarr/definitions";
import { useZodForm } from "@homarr/form";
@@ -17,6 +18,7 @@ import { searchEngineManageSchema } from "@homarr/validation/search-engine";
type FormType = z.infer<typeof searchEngineManageSchema>;
interface SearchEngineFormProps {
+ integrations: RouterOutputs["integration"]["allThatSupportSearch"];
submitButtonTranslation: (t: ScopedTranslationFunction<"common">) => string;
initialValues?: FormType;
handleSubmit: (values: FormType) => void;
@@ -25,11 +27,12 @@ interface SearchEngineFormProps {
}
export const SearchEngineForm = (props: SearchEngineFormProps) => {
- const { submitButtonTranslation, handleSubmit, initialValues, isPending, disableShort } = props;
+ const { integrations, submitButtonTranslation, handleSubmit, initialValues, isPending, disableShort } = props;
const t = useI18n("search.engine");
const tCommon = useI18n("common");
-
- const [integrationData] = clientApi.integration.allThatSupportSearch.useSuspenseQuery();
+ const { data: availableIntegrations } = clientApi.integration.allThatSupportSearch.useQuery(undefined, {
+ initialData: integrations,
+ });
const form = useZodForm(searchEngineManageSchema, {
initialValues: initialValues ?? {
@@ -83,7 +86,7 @@ export const SearchEngineForm = (props: SearchEngineFormProps) => {
{form.values.type === "fromIntegration" && (
<WidgetIntegrationSelect
label="Integration"
- data={integrationData}
+ data={availableIntegrations}
canSelectMultiple={false}
onChange={(value) => form.setFieldValue("integrationId", value[0])}
value={form.values.integrationId !== undefined ? [form.values.integrationId] : []}
diff --git a/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/_search-engine-edit-form.tsx b/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/_search-engine-edit-form.tsx
index 4d44e2a4c..232920b42 100644
--- a/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/_search-engine-edit-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/_search-engine-edit-form.tsx
@@ -15,10 +15,11 @@ import type { searchEngineManageSchema } from "@homarr/validation/search-engine"
import { SearchEngineForm } from "../../_form";
interface SearchEngineEditFormProps {
+ integrations: RouterOutputs["integration"]["allThatSupportSearch"];
searchEngine: RouterOutputs["searchEngine"]["byId"];
}
-export const SearchEngineEditForm = ({ searchEngine }: SearchEngineEditFormProps) => {
+export const SearchEngineEditForm = ({ searchEngine, integrations }: SearchEngineEditFormProps) => {
const t = useI18n("search.engine.page.edit.notification");
const tCommon = useI18n("common");
const router = useRouter();
@@ -55,6 +56,7 @@ export const SearchEngineEditForm = ({ searchEngine }: SearchEngineEditFormProps
return (
<SearchEngineForm
+ integrations={integrations}
submitButtonTranslation={submitButtonTranslation}
initialValues={searchEngine}
handleSubmit={handleSubmit}
diff --git a/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/page.tsx b/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/page.tsx
index 17c924dc3..e639172b9 100644
--- a/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/page.tsx
@@ -21,7 +21,10 @@ export default async function SearchEngineEditPage(props: SearchEngineEditPagePr
notFound();
}
- const searchEngine = await api.searchEngine.byId({ id: params.id });
+ const [searchEngine, integrations] = await Promise.all([
+ api.searchEngine.byId({ id: params.id }),
+ api.integration.allThatSupportSearch(),
+ ]);
const t = await getI18n("search.engine.page.edit");
return (
@@ -29,7 +32,7 @@ export default async function SearchEngineEditPage(props: SearchEngineEditPagePr
<DynamicBreadcrumb dynamicMappings={new Map([[params.id, searchEngine.name]])} nonInteractable={["edit"]} />
<Stack>
<Title>{t("title")}</Title>
- <SearchEngineEditForm searchEngine={searchEngine} />
+ <SearchEngineEditForm searchEngine={searchEngine} integrations={integrations} />
</Stack>
</ManageContainer>
);
diff --git a/apps/nextjs/src/app/[locale]/manage/search-engines/new/_search-engine-new-form.tsx b/apps/nextjs/src/app/[locale]/manage/search-engines/new/_search-engine-new-form.tsx
index 6c7002918..c32e53c8c 100644
--- a/apps/nextjs/src/app/[locale]/manage/search-engines/new/_search-engine-new-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/search-engines/new/_search-engine-new-form.tsx
@@ -4,6 +4,7 @@ import { useCallback } from "react";
import { useRouter } from "next/navigation";
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 { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
@@ -13,7 +14,11 @@ import type { searchEngineManageSchema } from "@homarr/validation/search-engine"
import { SearchEngineForm } from "../_form";
-export const SearchEngineNewForm = () => {
+export const SearchEngineNewForm = ({
+ integrations,
+}: {
+ integrations: RouterOutputs["integration"]["allThatSupportSearch"];
+}) => {
const t = useI18n("search.engine.page.create.notification");
const router = useRouter();
@@ -45,6 +50,7 @@ export const SearchEngineNewForm = () => {
return (
<SearchEngineForm
+ integrations={integrations}
submitButtonTranslation={submitButtonTranslation}
handleSubmit={handleSubmit}
isPending={isPending}
diff --git a/apps/nextjs/src/app/[locale]/manage/search-engines/new/page.tsx b/apps/nextjs/src/app/[locale]/manage/search-engines/new/page.tsx
index c33e324fc..f1ac54a0c 100644
--- a/apps/nextjs/src/app/[locale]/manage/search-engines/new/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/search-engines/new/page.tsx
@@ -1,6 +1,7 @@
import { notFound } from "next/navigation";
import { Stack, Title } from "@mantine/core";
+import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
import { getI18n } from "@homarr/translation/server";
@@ -16,13 +17,14 @@ export default async function SearchEngineNewPage() {
}
const t = await getI18n("search.engine.page.create");
+ const integrations = await api.integration.allThatSupportSearch();
return (
<ManageContainer>
<DynamicBreadcrumb />
<Stack>
<Title>{t("title")}</Title>
- <SearchEngineNewForm />
+ <SearchEngineNewForm integrations={integrations} />
</Stack>
</ManageContainer>
);
diff --git a/apps/nextjs/src/app/[locale]/manage/settings/loading.tsx b/apps/nextjs/src/app/[locale]/manage/settings/loading.tsx
deleted file mode 100644
index 097406c3d..000000000
--- a/apps/nextjs/src/app/[locale]/manage/settings/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Center, Loader } from "@mantine/core";
-
-export default function SettingsLoading() {
- return (
- <Center h="40vh">
- <Loader />
- </Center>
- );
-}
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/certificates/_components/add-certificate.tsx b/apps/nextjs/src/app/[locale]/manage/tools/certificates/_components/add-certificate.tsx
index 21731871a..83c80e14e 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/certificates/_components/add-certificate.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/certificates/_components/add-certificate.tsx
@@ -1,22 +1,36 @@
"use client";
-import { Button, Card, Collapse, Stack } from "@mantine/core";
+import type { PropsWithChildren } from "react";
+import { Button, Card, Collapse, Group, Stack, Text } from "@mantine/core";
import { useDisclosure } from "@mantine/hooks";
import { revalidatePathActionAsync } from "@homarr/common/client";
import { useI18n } from "@homarr/translation/client";
+import { Link } from "@homarr/ui";
+import { ManagePageHeader } from "~/components/manage/manage-page-layout";
import { CertificateUploadForm } from "./certificate-upload-form";
-export const AddCertificateSection = () => {
+export const CertificatesPageContent = ({ children }: PropsWithChildren) => {
const [opened, { close, toggle }] = useDisclosure(false);
const t = useI18n("certificate");
return (
- <Stack gap="sm">
- <Button onClick={toggle} variant="default" aria-expanded={opened}>
- {t("action.create.label")}
- </Button>
+ <Stack>
+ <ManagePageHeader
+ title={t("page.list.title")}
+ primaryAction={
+ <Group>
+ <Button variant="default" component={Link} href="/manage/tools/certificates/hostnames">
+ {t("page.list.toHostnames")}
+ </Button>
+ <Button onClick={toggle} aria-expanded={opened}>
+ {t("action.create.label")}
+ </Button>
+ </Group>
+ }
+ />
+ <Text>{t("page.list.description")}</Text>
<Collapse expanded={opened}>
<Card withBorder>
<CertificateUploadForm
@@ -28,6 +42,7 @@ export const AddCertificateSection = () => {
/>
</Card>
</Collapse>
+ {children}
</Stack>
);
};
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/certificates/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/certificates/page.tsx
index 9be9bdb42..e8f994220 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/certificates/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/certificates/page.tsx
@@ -1,6 +1,6 @@
import { X509Certificate } from "node:crypto";
import { notFound } from "next/navigation";
-import { Button, Card, Group, SimpleGrid, Stack, Text, Title } from "@mantine/core";
+import { Card, Group, SimpleGrid, Stack, Text } from "@mantine/core";
import { IconAlertTriangle, IconCertificate, IconCertificateOff } from "@tabler/icons-react";
import dayjs from "dayjs";
@@ -9,11 +9,10 @@ import { getMantineColor } from "@homarr/common";
import { loadCustomRootCertificatesAsync } from "@homarr/core/infrastructure/certificates";
import type { SupportedLanguage } from "@homarr/translation";
import { getI18n } from "@homarr/translation/server";
-import { Link } from "@homarr/ui";
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
import { NoResults } from "~/components/no-results";
-import { AddCertificateSection } from "./_components/add-certificate";
+import { CertificatesPageContent } from "./_components/add-certificate";
import { RemoveCertificate } from "./_components/remove-certificate";
interface CertificatesPageProps {
@@ -58,22 +57,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps
<>
<DynamicBreadcrumb />
- <Stack>
- <Group justify="space-between">
- <Stack gap={4}>
- <Title>{t("page.list.title")}</Title>
- <Text>{t("page.list.description")}</Text>
- </Stack>
-
- <Group>
- <Button variant="default" component={Link} href="/manage/tools/certificates/hostnames">
- {t("page.list.toHostnames")}
- </Button>
- </Group>
- </Group>
-
- <AddCertificateSection />
-
+ <CertificatesPageContent>
{x509Certificates.length === 0 && (
<NoResults icon={IconCertificateOff} title={t("page.list.noResults.title")} />
)}
@@ -128,7 +112,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps
</Card>
))}
</SimpleGrid>
- </Stack>
+ </CertificatesPageContent>
</>
);
}
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/cluster-dashboard.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/cluster-dashboard.tsx
index 573262fd6..06d69dd60 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/cluster-dashboard.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/cluster-dashboard.tsx
@@ -1,10 +1,10 @@
"use client";
-import { Alert, SimpleGrid, Skeleton, Stack, Title } from "@mantine/core";
+import { Alert, SimpleGrid, Stack, Title } from "@mantine/core";
import { IconInfoCircle } from "@tabler/icons-react";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
-import { createId } from "@homarr/common";
import type { KubernetesLabelResourceType } from "@homarr/definitions";
import { useI18n } from "@homarr/translation/client";
@@ -12,35 +12,34 @@ import KubernetesErrorPage from "~/app/[locale]/manage/tools/kubernetes/cluster-
import { HeaderCard } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/header-card/header-card";
import { ResourceGauge } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-gauge";
import { ResourceTile } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-tile/resource-tile";
-import { useSelectedKubernetesContextId } from "../kubernetes-context-selector";
+import { createKubernetesResourceQueryOptions } from "../kubernetes-query-options";
-export function ClusterDashboard() {
- const tCluster = useI18n("kubernetes.cluster");
- const contextId = useSelectedKubernetesContextId();
+interface ClusterDashboardProps {
+ contextId: string;
+ initialCluster: RouterOutputs["kubernetes"]["cluster"]["getCluster"] | null;
+ initialResourceCounts: RouterOutputs["kubernetes"]["cluster"]["getClusterResourceCounts"] | null;
+}
- const {
- data: clusterData,
- isLoading: isClusterLoading,
- isError: isClusterError,
- } = clientApi.kubernetes.cluster.getCluster.useQuery({ contextId: contextId ?? "" }, { enabled: Boolean(contextId) });
+export function ClusterDashboard({ contextId, initialCluster, initialResourceCounts }: ClusterDashboardProps) {
+ const tCluster = useI18n("kubernetes.cluster");
- const {
- data: resourceCountsData,
- isLoading: isResourceCountsLoading,
- isError: isResourceCountsError,
- } = clientApi.kubernetes.cluster.getClusterResourceCounts.useQuery(
- { contextId: contextId ?? "" },
- { enabled: Boolean(contextId) },
+ const { data: clusterData, isError: isClusterError } = clientApi.kubernetes.cluster.getCluster.useQuery(
+ { contextId },
+ createKubernetesResourceQueryOptions(initialCluster ?? undefined),
);
+ const { data: resourceCountsData, isError: isResourceCountsError } =
+ clientApi.kubernetes.cluster.getClusterResourceCounts.useQuery(
+ { contextId },
+ createKubernetesResourceQueryOptions(initialResourceCounts ?? undefined),
+ );
+
return (
<Stack bg="var(--mantine-color-body)">
<Title>{tCluster("title")}</Title>
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
- {isClusterError ? (
- Array.from({ length: 3 }).map(() => <KubernetesErrorPage key={createId()} />)
- ) : isClusterLoading ? (
- Array.from({ length: 3 }).map(() => <Skeleton key={createId()} height={65} />)
+ {isClusterError || !clusterData ? (
+ Array.from({ length: 3 }, (_, index) => <KubernetesErrorPage key={index} />)
) : (
<>
<HeaderCard headerType={"providers"} value={clusterData ? clusterData.providers : ""} />
@@ -59,31 +58,24 @@ export function ClusterDashboard() {
)}
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
- {isClusterError
- ? Array.from({ length: 3 }).map(() => <KubernetesErrorPage key={createId()} />)
- : isClusterLoading
- ? Array.from({ length: 3 }).map(() => <Skeleton key={createId()} height={200} />)
- : clusterData?.capacity.map((capacity) => (
- <ResourceGauge kubernetesCapacity={capacity} key={capacity.type} />
- ))}
+ {isClusterError || !clusterData
+ ? Array.from({ length: 3 }, (_, index) => <KubernetesErrorPage key={index} />)
+ : clusterData.capacity.map((capacity) => <ResourceGauge kubernetesCapacity={capacity} key={capacity.type} />)}
</SimpleGrid>
<Title>{tCluster("resources.title")}</Title>
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
- {isResourceCountsError
- ? Array.from({ length: 8 }).map(() => <KubernetesErrorPage key={createId()} />)
- : isResourceCountsLoading
- ? Array.from({ length: 8 }).map(() => <Skeleton key={createId()} height={100} />)
- : contextId &&
- resourceCountsData?.map((clusterResourceCount) => (
- <ResourceTile
- count={clusterResourceCount.count}
- contextId={contextId}
- label={clusterResourceCount.label as KubernetesLabelResourceType}
- key={clusterResourceCount.label}
- />
- ))}
+ {isResourceCountsError || !resourceCountsData
+ ? Array.from({ length: 8 }, (_, index) => <KubernetesErrorPage key={index} />)
+ : resourceCountsData.map((clusterResourceCount) => (
+ <ResourceTile
+ count={clusterResourceCount.count}
+ contextId={contextId}
+ label={clusterResourceCount.label as KubernetesLabelResourceType}
+ key={clusterResourceCount.label}
+ />
+ ))}
</SimpleGrid>
</Stack>
);
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/configmaps/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/configmaps/page.tsx
index 8ad89b4b5..2b4560873 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/configmaps/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/configmaps/page.tsx
@@ -22,6 +22,7 @@ export default async function ConfigMapsPage({
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const configMaps =
context.status === "unavailable"
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/ingresses/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/ingresses/page.tsx
index 5a4be2b24..de457e773 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/ingresses/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/ingresses/page.tsx
@@ -22,6 +22,7 @@ export default async function NamespacesPage({
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const ingresses =
context.status === "unavailable"
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context-selector.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context-selector.tsx
index 9dd1a5336..df94ced5c 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context-selector.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context-selector.tsx
@@ -1,30 +1,34 @@
"use client";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { Alert, Badge, Button, Group, Select, Stack, Text } from "@mantine/core";
-import { useLocalStorage } from "@mantine/hooks";
import { IconAlertTriangle } from "@tabler/icons-react";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { useI18n } from "@homarr/translation/client";
-export const KubernetesContextSelector = () => {
+import { kubernetesContextCookieName } from "./kubernetes-context.constants";
+import { createKubernetesResourceQueryOptions } from "./kubernetes-query-options";
+
+export const KubernetesContextSelector = ({
+ initialContexts,
+ initialContextId,
+}: {
+ initialContexts?: RouterOutputs["kubernetes"]["contexts"]["getContexts"];
+ initialContextId: string | null;
+}) => {
const t = useI18n("kubernetes.context");
const tCommon = useI18n("common");
const pathname = usePathname();
const router = useRouter();
const searchParams = useSearchParams();
const { data, isError, refetch } = clientApi.kubernetes.contexts.getContexts.useQuery(undefined, {
+ ...createKubernetesResourceQueryOptions(initialContexts),
refetchInterval: 30_000,
- refetchOnMount: "always",
- refetchOnReconnect: true,
- refetchOnWindowFocus: true,
- });
- const [storedContextId, setStoredContextId] = useLocalStorage<string | null>({
- key: "homarr-kubernetes-context",
- defaultValue: null,
});
+ const [storedContextId, setStoredContextId] = useState(initialContextId);
const requestedContextId = searchParams.get("context");
const contextId =
data?.contexts.find((context) => context.contextId === requestedContextId)?.contextId ??
@@ -35,11 +39,16 @@ export const KubernetesContextSelector = () => {
const context = data?.contexts.find((item) => item.contextId === contextId);
useEffect(() => {
- if (!contextId || requestedContextId === contextId) return;
- const next = new URLSearchParams(searchParams);
- next.set("context", contextId);
- router.replace(`${pathname}?${next.toString()}`);
- }, [contextId, pathname, requestedContextId, router, searchParams]);
+ if (!contextId) return;
+ if (contextId !== storedContextId) {
+ setStoredContextId(contextId);
+ document.cookie = `${kubernetesContextCookieName}=${encodeURIComponent(contextId)}; Path=/; Max-Age=31536000; SameSite=Lax`;
+ }
+ }, [contextId, storedContextId]);
+
+ useEffect(() => {
+ if (!initialContexts && data) router.refresh();
+ }, [data, initialContexts, router]);
if (isError) {
return (
@@ -59,6 +68,7 @@ export const KubernetesContextSelector = () => {
const selectContext = (value: string | null) => {
if (!value) return;
setStoredContextId(value);
+ document.cookie = `${kubernetesContextCookieName}=${encodeURIComponent(value)}; Path=/; Max-Age=31536000; SameSite=Lax`;
const next = new URLSearchParams(searchParams);
next.set("context", value);
router.replace(`${pathname}?${next.toString()}`);
@@ -94,21 +104,6 @@ export const KubernetesContextSelector = () => {
);
};
-export const useSelectedKubernetesContextId = () => {
- const searchParams = useSearchParams();
- const { data } = clientApi.kubernetes.contexts.getContexts.useQuery(undefined, {
- refetchInterval: 30_000,
- refetchOnReconnect: true,
- refetchOnWindowFocus: true,
- });
- const requested = searchParams.get("context");
- if (data?.contexts.some(({ contextId }) => contextId === requested)) return requested;
- return (
- data?.contexts.find(({ contextId }) => contextId === data.defaultContextId)?.contextId ??
- data?.contexts[0]?.contextId
- );
-};
-
const contextStatusColor = (status: "available" | "degraded" | "unavailable") => {
if (status === "available") return "green";
if (status === "degraded") return "yellow";
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context.constants.ts b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context.constants.ts
new file mode 100644
index 000000000..86109b70c
--- /dev/null
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context.constants.ts
@@ -0,0 +1 @@
+export const kubernetesContextCookieName = "homarr-kubernetes-context";
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context.ts b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context.ts
index 13d700d84..577dc8ec8 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context.ts
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-context.ts
@@ -1,14 +1,34 @@
+import { cache } from "react";
+import { cookies } from "next/headers";
+
import { api } from "@homarr/api/server";
+import { createLogger } from "@homarr/core/infrastructure/logs";
+
+import { kubernetesContextCookieName } from "./kubernetes-context.constants";
+
+const logger = createLogger({ module: "kubernetesContexts" });
+
+export const getKubernetesContextsAsync = cache(async () => {
+ try {
+ return await api.kubernetes.contexts.getContexts();
+ } catch (error) {
+ logger.error(new Error("Failed to load Kubernetes contexts", { cause: error }));
+ return undefined;
+ }
+});
export interface KubernetesContextSearchParams {
context?: string | string[];
}
export const getSelectedKubernetesContextAsync = async (searchParams: Promise<KubernetesContextSearchParams>) => {
- const [{ context }, result] = await Promise.all([searchParams, api.kubernetes.contexts.getContexts()]);
+ const [{ context }, result, cookieStore] = await Promise.all([searchParams, getKubernetesContextsAsync(), cookies()]);
+ if (!result) return null;
const requestedContextId = Array.isArray(context) ? context[0] : context;
+ const storedContextId = cookieStore.get(kubernetesContextCookieName)?.value;
const selected =
result.contexts.find(({ contextId }) => contextId === requestedContextId) ??
+ result.contexts.find(({ contextId }) => contextId === storedContextId) ??
result.contexts.find(({ contextId }) => contextId === result.defaultContextId) ??
result.contexts[0];
if (!selected) throw new Error("No Kubernetes context is configured");
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-query-options.ts b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-query-options.ts
index 217a66a70..860a5f1aa 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-query-options.ts
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/kubernetes-query-options.ts
@@ -11,7 +11,8 @@ const getErrorRefetchInterval = (query: QueryWithStatus) => {
export const createKubernetesResourceQueryOptions = <TData>(initialData: TData) => ({
initialData,
- refetchOnMount: "always" as const,
+ staleTime: 30_000,
+ refetchOnMount: true,
refetchOnWindowFocus: true,
refetchOnReconnect: true,
refetchInterval: getErrorRefetchInterval,
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/layout.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/layout.tsx
index e3fd6c49a..130b3a4d3 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/layout.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/layout.tsx
@@ -1,14 +1,27 @@
-import { Suspense } from "react";
+import { notFound } from "next/navigation";
+import { cookies } from "next/headers";
import { Stack } from "@mantine/core";
+import { auth } from "@homarr/auth/next";
+import { env } from "@homarr/docker/env";
+
import { KubernetesContextSelector } from "./kubernetes-context-selector";
+import { getKubernetesContextsAsync } from "./kubernetes-context";
+import { kubernetesContextCookieName } from "./kubernetes-context.constants";
+
+export default async function KubernetesLayout({ children }: { children: React.ReactNode }) {
+ const session = await auth();
+ if (!(session?.user.permissions.includes("admin") && env.ENABLE_KUBERNETES)) {
+ notFound();
+ }
+ const [contexts, cookieStore] = await Promise.all([getKubernetesContextsAsync(), cookies()]);
-export default function KubernetesLayout({ children }: { children: React.ReactNode }) {
return (
<Stack>
- <Suspense fallback={null}>
- <KubernetesContextSelector />
- </Suspense>
+ <KubernetesContextSelector
+ initialContexts={contexts}
+ initialContextId={cookieStore.get(kubernetesContextCookieName)?.value ?? null}
+ />
{children}
</Stack>
);
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/namespaces/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/namespaces/page.tsx
index 0bef9bd1e..aeb102a24 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/namespaces/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/namespaces/page.tsx
@@ -22,6 +22,7 @@ export default async function NamespacesPage({
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const namespaces =
context.status === "unavailable"
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/nodes/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/nodes/page.tsx
index cd5737bb7..3c5e09302 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/nodes/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/nodes/page.tsx
@@ -18,6 +18,7 @@ export default async function NodesPage({ searchParams }: { searchParams: Promis
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const nodes =
context.status === "unavailable" ? [] : await api.kubernetes.nodes.getNodes({ contextId: context.contextId });
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/page.tsx
index ae9d8fe4c..e21942a7c 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/page.tsx
@@ -1,21 +1,48 @@
import { notFound } from "next/navigation";
+import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
+import { createLogger } from "@homarr/core/infrastructure/logs";
import { env } from "@homarr/docker/env";
import { ClusterDashboard } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/cluster-dashboard";
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
+import type { KubernetesContextSearchParams } from "./kubernetes-context";
+import { getSelectedKubernetesContextAsync } from "./kubernetes-context";
-export default async function KubernetesPage() {
+const logger = createLogger({ module: "kubernetesDashboard" });
+
+export default async function KubernetesPage({
+ searchParams,
+}: {
+ searchParams: Promise<KubernetesContextSearchParams>;
+}) {
const session = await auth();
if (!(session?.user.permissions.includes("admin") && env.ENABLE_KUBERNETES)) {
notFound();
}
+ const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
+ const [cluster, resourceCounts] = await Promise.allSettled([
+ api.kubernetes.cluster.getCluster({ contextId: context.contextId }),
+ api.kubernetes.cluster.getClusterResourceCounts({ contextId: context.contextId }),
+ ]);
+ if (cluster.status === "rejected") {
+ logger.error(new Error("Failed to load the Kubernetes cluster overview", { cause: cluster.reason }));
+ }
+ if (resourceCounts.status === "rejected") {
+ logger.error(new Error("Failed to load Kubernetes resource counts", { cause: resourceCounts.reason }));
+ }
+
return (
<>
<DynamicBreadcrumb />
- <ClusterDashboard />
+ <ClusterDashboard
+ contextId={context.contextId}
+ initialCluster={cluster.status === "fulfilled" ? cluster.value : null}
+ initialResourceCounts={resourceCounts.status === "fulfilled" ? resourceCounts.value : null}
+ />
</>
);
}
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/pods/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/pods/page.tsx
index cbf998530..e952889e2 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/pods/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/pods/page.tsx
@@ -18,6 +18,7 @@ export default async function PodsPage({ searchParams }: { searchParams: Promise
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const pods =
context.status === "unavailable" ? [] : await api.kubernetes.pods.getPods({ contextId: context.contextId });
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/secrets/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/secrets/page.tsx
index b82e2660e..891e2fcde 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/secrets/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/secrets/page.tsx
@@ -18,6 +18,7 @@ export default async function SecretsPage({ searchParams }: { searchParams: Prom
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const secrets =
context.status === "unavailable" ? [] : await api.kubernetes.secrets.getSecrets({ contextId: context.contextId });
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/services/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/services/page.tsx
index 76316e3b8..5ba769c8e 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/services/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/services/page.tsx
@@ -18,6 +18,7 @@ export default async function ServicesPage({ searchParams }: { searchParams: Pro
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const services =
context.status === "unavailable" ? [] : await api.kubernetes.services.getServices({ contextId: context.contextId });
diff --git a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/volumes/page.tsx b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/volumes/page.tsx
index e538cad93..18a7bba5f 100644
--- a/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/volumes/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/tools/kubernetes/volumes/page.tsx
@@ -18,6 +18,7 @@ export default async function VolumesPage({ searchParams }: { searchParams: Prom
}
const context = await getSelectedKubernetesContextAsync(searchParams);
+ if (!context) return <DynamicBreadcrumb />;
const tResource = await getI18n("kubernetes.cluster.resources");
const volumes =
context.status === "unavailable" ? [] : await api.kubernetes.volumes.getVolumes({ contextId: context.contextId });
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_oauth-connections.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_oauth-connections.tsx
index e7e25ee0e..bed775704 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_oauth-connections.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_oauth-connections.tsx
@@ -1,9 +1,10 @@
"use client";
import { useId, useState } from "react";
-import { Alert, Button, Divider, Group, Skeleton, Stack, Text, Title } from "@mantine/core";
+import { Alert, Button, Divider, Group, Stack, Text, Title } from "@mantine/core";
import { IconExclamationCircle } from "@tabler/icons-react";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { useI18n } from "@homarr/translation/client";
import { InlineConfirmButton } from "@homarr/ui";
@@ -13,18 +14,24 @@ import { formatOAuthDisplayText } from "~/app/[locale]/manage/tools/api/componen
type RevokeFeedback = "success" | "error" | null;
-export const OAuthConnections = () => {
+export const OAuthConnections = ({
+ initialConnections,
+}: {
+ initialConnections?: RouterOutputs["apiKeys"]["getOwnOAuth"];
+}) => {
const t = useI18n("management.page.user.setting.general.item.oauthConnections");
const tProvenance = useI18n("management.page.tool.api.tab.apiKey.provenance");
const headingId = useId();
const [feedback, setFeedback] = useState<RevokeFeedback>(null);
const utils = clientApi.useUtils();
const connections = clientApi.apiKeys.getOwnOAuth.useQuery(undefined, {
+ initialData: initialConnections,
retry: false,
staleTime: 0,
refetchOnMount: "always",
});
- const canShowConnections = connections.isFetchedAfterMount && !connections.isError;
+ const connectionData = connections.isFetchedAfterMount ? connections.data : initialConnections;
+ const canShowConnections = connectionData !== undefined && !connections.isError;
const revoke = clientApi.apiKeys.revokeOwnOAuth.useMutation({
onMutate() {
setFeedback(null);
@@ -60,16 +67,7 @@ export const OAuthConnections = () => {
</Alert>
)}
- {!connections.isFetchedAfterMount && !connections.isError && (
- <Stack gap="xs">
- <Text component="output" size="sm">
- {t("loading")}
- </Text>
- <Skeleton h={20} w="45%" animate={false} aria-hidden />
- <Skeleton h={72} animate={false} aria-hidden />
- <Skeleton h={44} w={180} animate={false} aria-hidden />
- </Stack>
- )}
+ {!canShowConnections && !connections.isError && <Text component="output">{t("loading")}</Text>}
{connections.isError && (
<Alert color="red" variant="light" icon={<IconExclamationCircle size={18} />} title={t("loadError.title")}>
@@ -89,19 +87,19 @@ export const OAuthConnections = () => {
</Alert>
)}
- {canShowConnections && connections.data?.length === 0 && (
+ {canShowConnections && connectionData?.length === 0 && (
<Stack gap="xs">
<Text fw={500}>{t("empty.title")}</Text>
<Text size="sm">{t("empty.description")}</Text>
</Stack>
)}
- {canShowConnections && (connections.data?.length ?? 0) > 0 && (
+ {canShowConnections && (connectionData?.length ?? 0) > 0 && (
<Text size="sm">{tProvenance("clientNameHint")}</Text>
)}
{canShowConnections &&
- connections.data?.map((connection) => (
+ connectionData?.map((connection) => (
<Stack key={connection.id} gap="sm">
<Divider />
<Group align="flex-start" justify="space-between">
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_reset-tours.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_reset-tours.tsx
index 321e3d793..d5f2d725d 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_reset-tours.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_reset-tours.tsx
@@ -4,15 +4,16 @@ import { useRouter } from "next/navigation";
import { Badge, Button, Group, Stack, Text } from "@mantine/core";
import { IconRefresh } from "@tabler/icons-react";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { showSuccessNotification } from "@homarr/notifications";
import { useI18n } from "@homarr/translation/client";
-export const ResetTours = () => {
+export const ResetTours = ({ initialTourStatus }: { initialTourStatus?: RouterOutputs["user"]["getTourStatus"] }) => {
const t = useI18n("management.page.user.setting.general.item.onboardingTours");
const router = useRouter();
const utils = clientApi.useUtils();
- const { data: tourStatus } = clientApi.user.getTourStatus.useQuery();
+ const { data: tourStatus } = clientApi.user.getTourStatus.useQuery(undefined, { initialData: initialTourStatus });
const { mutate: resetTours, isPending } = clientApi.user.resetTours.useMutation({
onSuccess() {
showSuccessNotification({
@@ -31,13 +32,15 @@ export const ResetTours = () => {
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>
+ {tourStatus && (
+ <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>
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
index fb8fd49c5..941e730fa 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
@@ -4,6 +4,7 @@ import { IconExclamationCircle } from "@tabler/icons-react";
import { api } from "@homarr/api/server";
import { auth } from "@homarr/auth/next";
+import { createLogger } from "@homarr/core/infrastructure/logs";
import { getI18n } from "@homarr/translation/server";
import { DangerZoneItem, DangerZoneRoot } from "~/components/manage/danger-zone";
@@ -16,6 +17,8 @@ import { OAuthConnections } from "./_components/_oauth-connections";
import { UserProfileAvatarForm } from "./_components/_profile-avatar-form";
import { ResetTours } from "./_components/_reset-tours";
+const logger = createLogger({ module: "userGeneralSettings" });
+
interface Props {
params: Promise<{
userId: string;
@@ -51,9 +54,23 @@ export default async function EditUserPage(props: Props) {
notFound();
}
- const boards = await api.board.getManageOverview({ fullPreview: false, userId: user.id });
- const searchEngines = await api.searchEngine.getSelectable();
const isSelf = session?.user.id === user.id;
+ const [boards, searchEngines, connections, tourStatus] = await Promise.all([
+ api.board.getManageOverview({ fullPreview: false, userId: user.id }),
+ api.searchEngine.getSelectable(),
+ isSelf
+ ? api.apiKeys.getOwnOAuth().catch((error: unknown) => {
+ logger.error(new Error("Failed to load the user's OAuth connections", { cause: error }));
+ return undefined;
+ })
+ : undefined,
+ isSelf
+ ? api.user.getTourStatus().catch((error: unknown) => {
+ logger.error(new Error("Failed to load the user's onboarding tour status", { cause: error }));
+ return undefined;
+ })
+ : undefined,
+ ]);
const isCredentialsUser = user.provider === "credentials";
return (
@@ -77,12 +94,12 @@ export default async function EditUserPage(props: Props) {
profileAvatar={<UserProfileAvatarForm user={user} />}
/>
- {isSelf && <OAuthConnections key={user.id} />}
+ {isSelf && <OAuthConnections key={user.id} initialConnections={connections} />}
- {session?.user.id === user.id && (
+ {isSelf && (
<Stack mb="lg">
<Title order={2}>{tGeneral("item.onboardingTours.title")}</Title>
- <ResetTours />
+ <ResetTours initialTourStatus={tourStatus} />
</Stack>
)}
diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/page.tsx
index 3b95eb261..0b1e2b8db 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/page.tsx
@@ -1,5 +1,5 @@
import { notFound } from "next/navigation";
-import { Alert, Anchor, Center, Group, Stack, Table, TableTbody, TableTd, TableTr, Text, Title } from "@mantine/core";
+import { Alert, Anchor, Center, Group, Stack, Table, TableTbody, TableTd, TableTr, Text } from "@mantine/core";
import { IconExclamationCircle } from "@tabler/icons-react";
import type { RouterOutputs } from "@homarr/api";
@@ -14,6 +14,7 @@ import { everyoneGroup } from "@homarr/definitions";
import { getI18n } from "@homarr/translation/server";
import { Link, SearchInput, UserAvatar } from "@homarr/ui";
+import { ManagePageHeader } from "~/components/manage/manage-page-layout";
import { ReservedGroupAlert } from "../_reserved-group-alert";
import { AddGroupMember } from "./_add-group-member";
import { RemoveGroupMember } from "./_remove-group-member";
@@ -53,7 +54,19 @@ export default async function GroupsDetailPage(props: GroupsDetailPageProps) {
return (
<Stack>
- <Title>{tMembers("title")}</Title>
+ <ManagePageHeader
+ title={tMembers("title")}
+ primaryAction={
+ canManageMembers &&
+ !isReserved && (
+ <AddGroupMember
+ groupId={group.id}
+ presentUserIds={group.members.map((member) => member.id)}
+ allowedProviders={allowedProviders}
+ />
+ )
+ }
+ />
{isReserved ? (
<ReservedGroupAlert />
@@ -71,13 +84,6 @@ export default async function GroupsDetailPage(props: GroupsDetailPageProps) {
ariaLabel={tMembers("search")}
defaultValue={searchParams.search}
/>
- {canManageMembers && !isReserved && (
- <AddGroupMember
- groupId={group.id}
- presentUserIds={group.members.map((member) => member.id)}
- allowedProviders={allowedProviders}
- />
- )}
</Group>
{filteredMembers.length === 0 && (
<Center py="sm">
diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx
index 482819c3b..f0189d20d 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx
@@ -2,6 +2,7 @@
import { Button, Group, Stack } from "@mantine/core";
+import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { useZodForm } from "@homarr/form";
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
@@ -11,15 +12,15 @@ import { groupSettingsSchema } from "@homarr/validation/group";
import { BoardSelect } from "~/components/board/board-select";
interface GroupHomeBoardsProps {
+ availableBoards: RouterOutputs["board"]["getBoardsForGroup"];
homeBoardId: string | null;
mobileHomeBoardId: string | null;
groupId: string;
}
-export const GroupHomeBoards = ({ homeBoardId, mobileHomeBoardId, groupId }: GroupHomeBoardsProps) => {
+export const GroupHomeBoards = ({ homeBoardId, mobileHomeBoardId, groupId, availableBoards }: GroupHomeBoardsProps) => {
const tGroup = useI18n("group");
const tCommon = useI18n("common");
- const [availableBoards] = clientApi.board.getBoardsForGroup.useSuspenseQuery({ groupId });
const form = useZodForm(groupSettingsSchema.pick({ homeBoardId: true, mobileHomeBoardId: true }), {
initialValues: {
homeBoardId,
diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/page.tsx
index f53ca051e..243ec92da 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/page.tsx
@@ -22,7 +22,10 @@ export default async function GroupPermissionsPage(props: GroupSettingsPageProps
notFound();
}
- const group = await api.group.getById({ id: params.id });
+ const [group, availableBoards] = await Promise.all([
+ api.group.getById({ id: params.id }),
+ api.board.getBoardsForGroup({ groupId: params.id }),
+ ]);
const t = await getI18n("management.page.group.setting.setting");
const tEntities = await getI18n("common.entity");
@@ -36,7 +39,12 @@ export default async function GroupPermissionsPage(props: GroupSettingsPageProps
<Title order={3}>{tEntities("boards")}</Title>
- <GroupHomeBoards homeBoardId={group.homeBoardId} mobileHomeBoardId={group.mobileHomeBoardId} groupId={group.id} />
+ <GroupHomeBoards
+ homeBoardId={group.homeBoardId}
+ mobileHomeBoardId={group.mobileHomeBoardId}
+ groupId={group.id}
+ availableBoards={availableBoards}
+ />
</Stack>
);
}
diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx
index 2386d070f..516cf77a3 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx
@@ -1,21 +1,24 @@
"use client";
+import type { PropsWithChildren } from "react";
import { useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
-import { Button, Card, Collapse, Group, Stack, TextInput } from "@mantine/core";
+import { Button, Card, Collapse, TextInput } from "@mantine/core";
import { IconSearch } from "@tabler/icons-react";
import type { RouterOutputs } from "@homarr/api";
import { useI18n } from "@homarr/translation/client";
+import { ManagePageLayout } from "~/components/manage/manage-page-layout";
import { GroupCreateForm } from "./_components/group-create-form";
import { GroupsTable } from "./_groups-table";
interface GroupsListProps {
+ title: string;
groups: RouterOutputs["group"]["getAll"];
}
-export const GroupsList = ({ groups }: GroupsListProps) => {
+export const GroupsList = ({ title, groups, children }: PropsWithChildren<GroupsListProps>) => {
const [search, setSearch] = useState("");
const router = useRouter();
const searchParams = useSearchParams();
@@ -58,10 +61,14 @@ export const GroupsList = ({ groups }: GroupsListProps) => {
};
return (
- <Stack>
- <Group justify="end">
- <Button onClick={toggleCreate}>{tGroup("action.create.label")}</Button>
- </Group>
+ <ManagePageLayout
+ title={title}
+ primaryAction={
+ <Button onClick={toggleCreate} aria-expanded={isCreateOpen}>
+ {tGroup("action.create.label")}
+ </Button>
+ }
+ >
<Collapse expanded={isCreateOpen}>
<Card withBorder>
<GroupCreateForm
@@ -74,6 +81,7 @@ export const GroupsList = ({ groups }: GroupsListProps) => {
/>
</Card>
</Collapse>
+ {children}
<TextInput
leftSection={<IconSearch size={20} stroke={1.5} />}
value={search}
@@ -81,6 +89,6 @@ export const GroupsList = ({ groups }: GroupsListProps) => {
placeholder={`${tGroup("search")}...`}
/>
<GroupsTable groups={filteredGroups} initialGroupIds={initialGroupIds} hasFilter={search.length !== 0} />
- </Stack>
+ </ManagePageLayout>
);
};
diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/page.tsx
index eced4a16d..1cd39b5c7 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/groups/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/groups/page.tsx
@@ -8,7 +8,6 @@ import { everyoneGroup } from "@homarr/definitions";
import { getI18n } from "@homarr/translation/server";
import { Link } from "@homarr/ui";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
import { GroupsList } from "./_client";
import classes from "./groups.module.css";
@@ -26,30 +25,26 @@ export default async function GroupsListPage() {
const groupsWithoutEveryone = groups.filter((group) => group.name !== everyoneGroup);
return (
- <ManagePageLayout title={tCommon("entity.groups")}>
- <Stack>
- {dbEveryoneGroup && (
- <UnstyledButton component={Link} href={`/manage/users/groups/${dbEveryoneGroup.id}`}>
- <Card className={classes.everyoneGroup}>
- <Group align="center">
- <ThemeIcon radius="xl" variant="light">
- <IconUsersGroup size={16} />
- </ThemeIcon>
-
- <Stack gap={0} flex={1}>
- <Text fw={500}>{tGroup("defaultGroup.name")}</Text>
- <Text size="sm" c="gray.6">
- {tGroup("defaultGroup.description", { name: everyoneGroup })}
- </Text>
- </Stack>
- <IconChevronRight size={20} />
- </Group>
- </Card>
- </UnstyledButton>
- )}
-
- <GroupsList groups={groupsWithoutEveryone} />
- </Stack>
- </ManagePageLayout>
+ <GroupsList title={tCommon("entity.groups")} groups={groupsWithoutEveryone}>
+ {dbEveryoneGroup && (
+ <UnstyledButton component={Link} href={`/manage/users/groups/${dbEveryoneGroup.id}`}>
+ <Card className={classes.everyoneGroup}>
+ <Group align="center">
+ <ThemeIcon radius="xl" variant="light">
+ <IconUsersGroup size={16} />
+ </ThemeIcon>
+
+ <Stack gap={0} flex={1}>
+ <Text fw={500}>{tGroup("defaultGroup.name")}</Text>
+ <Text size="sm" c="gray.6">
+ {tGroup("defaultGroup.description", { name: everyoneGroup })}
+ </Text>
+ </Stack>
+ <IconChevronRight size={20} />
+ </Group>
+ </Card>
+ </UnstyledButton>
+ )}
+ </GroupsList>
);
}
diff --git a/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx b/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx
index 7502fa6c2..9b9a5444f 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx
@@ -2,7 +2,7 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
-import { Card, Collapse, Group, Stack } from "@mantine/core";
+import { Card, Collapse } from "@mantine/core";
import { IconTrash } from "@tabler/icons-react";
import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime";
@@ -15,16 +15,19 @@ import { invariantTechnicalLabels } from "@homarr/definitions";
import { useI18n } from "@homarr/translation/client";
import { InlineConfirmActionIcon } from "@homarr/ui";
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
+
+import { ManagePageLayout } from "~/components/manage/manage-page-layout";
import { InviteCreateButton } from "./invite-create-button";
import { InviteCreateForm } from "./invite-create-form";
dayjs.extend(relativeTime);
interface InviteListComponentProps {
+ title: string;
initialInvites: RouterOutputs["invite"]["getAll"];
}
-export const InviteListComponent = ({ initialInvites }: InviteListComponentProps) => {
+export const InviteListComponent = ({ title, initialInvites }: InviteListComponentProps) => {
const t = useI18n("management.page.user.invite");
const router = useRouter();
const searchParams = useSearchParams();
@@ -104,17 +107,14 @@ export const InviteListComponent = ({ initialInvites }: InviteListComponentProps
};
return (
- <Stack>
- <Group justify="end">
- <InviteCreateButton onClick={toggleCreate} />
- </Group>
+ <ManagePageLayout title={title} primaryAction={<InviteCreateButton onClick={toggleCreate} />}>
<Collapse expanded={isCreateOpen}>
<Card withBorder>
<InviteCreateForm key={formKey} onClose={closeCreate} />
</Card>
</Collapse>
<MantineReactTable table={table} />
- </Stack>
+ </ManagePageLayout>
);
};
diff --git a/apps/nextjs/src/app/[locale]/manage/users/invites/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/invites/page.tsx
index 5f6656e64..777a0cc0a 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/invites/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/invites/page.tsx
@@ -5,7 +5,6 @@ import { auth } from "@homarr/auth/next";
import { isProviderEnabled } from "@homarr/auth/server";
import { getI18n } from "@homarr/translation/server";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
import { InviteListComponent } from "./_components/invite-list";
export default async function InvitesOverviewPage() {
@@ -21,9 +20,5 @@ export default async function InvitesOverviewPage() {
const t = await getI18n("management.page.user.invite");
const initialInvites = await api.invite.getAll();
- return (
- <ManagePageLayout title={t("title")}>
- <InviteListComponent initialInvites={initialInvites} />
- </ManagePageLayout>
- );
+ return <InviteListComponent title={t("title")} initialInvites={initialInvites} />;
}
diff --git a/apps/nextjs/src/components/layout/navigation-link.tsx b/apps/nextjs/src/components/layout/navigation-link.tsx
index 22d5f95c1..5a83ad3a6 100644
--- a/apps/nextjs/src/components/layout/navigation-link.tsx
+++ b/apps/nextjs/src/components/layout/navigation-link.tsx
@@ -53,6 +53,7 @@ const NavLinkHref = (props: NavigationLinkHref) => {
label={props.label}
leftSection={props.icon}
href={props.href}
+ prefetch={props.prefetch ?? true}
active={isActive}
onClick={() => setNavigationCollapsed(true)}
/>
@@ -88,6 +89,7 @@ interface CommonNavigationLinkProps {
interface NavigationLinkHref extends CommonNavigationLinkProps {
href: string;
+ prefetch?: boolean;
external?: boolean;
exact?: boolean;
active?: boolean;
diff --git a/apps/nextjs/src/components/layout/navigation.tsx b/apps/nextjs/src/components/layout/navigation.tsx
index dbe7b987d..0f30c30bc 100644
--- a/apps/nextjs/src/components/layout/navigation.tsx
+++ b/apps/nextjs/src/components/layout/navigation.tsx
@@ -71,6 +71,7 @@ interface CommonNavigationLinkProps {
interface NavigationLinkHref extends CommonNavigationLinkProps {
href: string;
+ prefetch?: boolean;
external?: boolean;
exact?: boolean;
}
diff --git a/apps/nextjs/src/components/manage/manage-page-layout.tsx b/apps/nextjs/src/components/manage/manage-page-layout.tsx
index 3ae38e1bd..d4f933c6d 100644
--- a/apps/nextjs/src/components/manage/manage-page-layout.tsx
+++ b/apps/nextjs/src/components/manage/manage-page-layout.tsx
@@ -28,16 +28,11 @@ export const ManagePageLayout = ({
size,
children,
}: ManagePageLayoutProps) => {
- const titleNode = typeof title === "string" ? <Title>{title}</Title> : title;
-
return (
<ManageContainer size={size}>
{breadcrumb ?? <DynamicBreadcrumb />}
<Stack pb={floatingPrimaryAction ? { base: MANAGE_FLOATING_ACTION_BOTTOM_OFFSET, md: 0 } : undefined}>
- <Group justify="space-between" align="center">
- {titleNode}
- {primaryAction}
- </Group>
+ <ManagePageHeader title={title} primaryAction={primaryAction} />
{toolbar}
{children}
{footer && <Group justify="end">{footer}</Group>}
@@ -45,3 +40,10 @@ export const ManagePageLayout = ({
</ManageContainer>
);
};
+
+export const ManagePageHeader = ({ title, primaryAction }: Pick<ManagePageLayoutProps, "title" | "primaryAction">) => (
+ <Group justify="space-between" align="center">
+ {typeof title === "string" ? <Title>{title}</Title> : title}
+ {primaryAction}
+ </Group>
+);