Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4361ccf7f0 | ||
|
|
d5fd6905ea | ||
|
|
b99f28f8c1 | ||
|
|
1d7c121dad | ||
|
|
0a4a9f98ab | ||
|
|
f902ca439d |
No files matched your search
@@ -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 .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"start": "pnpm with-env next start",
|
"start": "pnpm with-env next start",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
|
|||||||
@@ -18,7 +18,15 @@ export const CustomMantineProvider = ({
|
|||||||
const manager = useColorSchemeManager();
|
const manager = useColorSchemeManager();
|
||||||
return (
|
return (
|
||||||
<DirectionProvider>
|
<DirectionProvider>
|
||||||
<MantineProvider defaultColorScheme={defaultColorScheme} colorSchemeManager={manager} theme={theme}>
|
<MantineProvider
|
||||||
|
defaultColorScheme={defaultColorScheme}
|
||||||
|
colorSchemeManager={manager}
|
||||||
|
theme={createTheme({
|
||||||
|
primaryColor: "red",
|
||||||
|
autoContrast: true,
|
||||||
|
defaultRadius: "sm",
|
||||||
|
})}
|
||||||
|
>
|
||||||
{children}
|
{children}
|
||||||
</MantineProvider>
|
</MantineProvider>
|
||||||
</DirectionProvider>
|
</DirectionProvider>
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ export default async function AboutPage() {
|
|||||||
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3, lg: 4, xl: 5 }} spacing="md">
|
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3, lg: 4, xl: 5 }} spacing="md">
|
||||||
{Object.entries(dependencies)
|
{Object.entries(dependencies)
|
||||||
.filter(([, value]) => !value.includes("workspace:"))
|
.filter(([, value]) => !value.includes("workspace:"))
|
||||||
.sort(([key1], [key2]) => key1.localeCompare(key2))
|
.toSorted(([key1], [key2]) => key1.localeCompare(key2))
|
||||||
.map(([name, version]) => (
|
.map(([name, version]) => (
|
||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
key={name}
|
key={name}
|
||||||
|
|||||||
@@ -148,9 +148,7 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const integrationCategories = integrationDefs[searchParams.kind].category.flat();
|
const supportsSearchEngine = integrationDefs[searchParams.kind].category.flat().includes("search");
|
||||||
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))}>
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps
|
|||||||
} as const;
|
} as const;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.sort((certA, certB) => {
|
.toSorted((certA, certB) => {
|
||||||
if (certA.isError) return -1;
|
if (certA.isError) return -1;
|
||||||
if (certB.isError) return 1;
|
if (certB.isError) return 1;
|
||||||
return certA.x509.validToDate.getTime() - certB.x509.validToDate.getTime();
|
return certA.x509.validToDate.getTime() - certB.x509.validToDate.getTime();
|
||||||
|
|||||||
+85
@@ -0,0 +1,85 @@
|
|||||||
|
"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
@@ -0,0 +1,84 @@
|
|||||||
|
"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
@@ -0,0 +1,83 @@
|
|||||||
|
"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
@@ -1,332 +0,0 @@
|
|||||||
"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
@@ -0,0 +1,69 @@
|
|||||||
|
"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>;
|
||||||
+4
-5
@@ -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, useMediaQuery } from "@mantine/hooks";
|
import { useDisclosure } 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,7 +25,6 @@ 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");
|
||||||
@@ -95,11 +94,11 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
|
|||||||
}, [mutate, user.id, openConfirmModal, tManageAvatar]);
|
}, [mutate, user.id, openConfirmModal, tManageAvatar]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box pos="relative" display="flex" style={{ justifyContent: isMobile ? "center" : undefined }}>
|
<Box pos="relative">
|
||||||
<Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow withinPortal>
|
<Menu opened={opened} keepMounted onChange={toggle} position="bottom-start">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<UnstyledButton onClick={toggle}>
|
<UnstyledButton onClick={toggle}>
|
||||||
<UserAvatar user={user} size={isMobile ? 120 : 200} />
|
<UserAvatar user={user} size={200} />
|
||||||
<Button
|
<Button
|
||||||
component="div"
|
component="div"
|
||||||
pos="absolute"
|
pos="absolute"
|
||||||
|
|||||||
+94
@@ -0,0 +1,94 @@
|
|||||||
|
"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">;
|
||||||
@@ -6,13 +6,18 @@ 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 { UserGeneralSettingsForm } from "./_components/_general-settings-form";
|
import { FirstDayOfWeek } from "./_components/_first-day-of-week";
|
||||||
|
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";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
params: Promise<{
|
params: Promise<{
|
||||||
@@ -58,7 +63,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 (
|
||||||
@@ -68,25 +73,51 @@ 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" align="flex-start" wrap="wrap">
|
<Group gap="xl">
|
||||||
<Box flex={1} miw={{ base: "100%", md: 540 }}>
|
<Box flex={1}>
|
||||||
<UserGeneralSettingsForm
|
<UserProfileForm user={user} />
|
||||||
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: 260 }}>
|
<Box w={{ base: "100%", lg: 200 }}>
|
||||||
<UserProfileAvatarForm user={user} />
|
<UserProfileAvatarForm user={user} />
|
||||||
</Box>
|
</Box>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
|
{session?.user.id === user.id && (
|
||||||
|
<Stack mb="lg">
|
||||||
|
<Title order={2}>{tGeneral("item.language")}</Title>
|
||||||
|
<CurrentLanguageCombobox />
|
||||||
|
</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")}
|
||||||
|
|||||||
@@ -6,20 +6,11 @@ import { LanguageCombobox } from "./language-combobox";
|
|||||||
|
|
||||||
interface CurrentLanguageComboboxProps {
|
interface CurrentLanguageComboboxProps {
|
||||||
width?: string;
|
width?: string;
|
||||||
withinPortal?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const CurrentLanguageCombobox = ({ width, withinPortal }: CurrentLanguageComboboxProps) => {
|
export const CurrentLanguageCombobox = ({ width }: CurrentLanguageComboboxProps) => {
|
||||||
const currentLocale = useCurrentLocale();
|
const currentLocale = useCurrentLocale();
|
||||||
const { changeLocale, isPending } = useChangeLocale();
|
const { changeLocale, isPending } = useChangeLocale();
|
||||||
|
|
||||||
return (
|
return <LanguageCombobox value={currentLocale} onChange={changeLocale} isPending={isPending} width={width} />;
|
||||||
<LanguageCombobox
|
|
||||||
value={currentLocale}
|
|
||||||
onChange={changeLocale}
|
|
||||||
isPending={isPending}
|
|
||||||
width={width}
|
|
||||||
withinPortal={withinPortal}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
@@ -16,17 +16,9 @@ interface LanguageComboboxProps {
|
|||||||
onChange: (value: SupportedLanguage) => void;
|
onChange: (value: SupportedLanguage) => void;
|
||||||
isPending?: boolean;
|
isPending?: boolean;
|
||||||
width?: string;
|
width?: string;
|
||||||
withinPortal?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const LanguageCombobox = ({
|
export const LanguageCombobox = ({ label, value, onChange, isPending, width }: LanguageComboboxProps) => {
|
||||||
label,
|
|
||||||
value,
|
|
||||||
onChange,
|
|
||||||
isPending,
|
|
||||||
width,
|
|
||||||
withinPortal = false,
|
|
||||||
}: LanguageComboboxProps) => {
|
|
||||||
const combobox = useCombobox({
|
const combobox = useCombobox({
|
||||||
onDropdownClose: () => combobox.resetSelectedOption(),
|
onDropdownClose: () => combobox.resetSelectedOption(),
|
||||||
});
|
});
|
||||||
@@ -47,7 +39,7 @@ export const LanguageCombobox = ({
|
|||||||
}, [combobox]);
|
}, [combobox]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Combobox store={combobox} withinPortal={withinPortal} onOptionSubmit={handleOnOptionSubmit}>
|
<Combobox store={combobox} onOptionSubmit={handleOnOptionSubmit}>
|
||||||
<Combobox.Target>
|
<Combobox.Target>
|
||||||
<InputBase
|
<InputBase
|
||||||
component="button"
|
component="button"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"dev": "pnpm with-env tsx ./src/main.ts",
|
"dev": "pnpm with-env tsx ./src/main.ts",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
"with-env": "dotenv -e ../../.env --"
|
"with-env": "dotenv -e ../../.env --"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"dev": "pnpm with-env tsx ./src/main.ts",
|
"dev": "pnpm with-env tsx ./src/main.ts",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
"with-env": "dotenv -e ../../.env --"
|
"with-env": "dotenv -e ../../.env --"
|
||||||
|
|||||||
+2
-2
@@ -17,8 +17,8 @@
|
|||||||
"db:studio": "pnpm -F db studio",
|
"db:studio": "pnpm -F db studio",
|
||||||
"dev": "pnpm -F nextjs dev",
|
"dev": "pnpm -F nextjs dev",
|
||||||
"docker:dev": "docker compose -f ./development/development.docker-compose.yml up",
|
"docker:dev": "docker compose -f ./development/development.docker-compose.yml up",
|
||||||
"format": "turbo format --continue -- --check",
|
"format": "turbo format --continue",
|
||||||
"format:fix": "turbo format --continue",
|
"format:fix": "turbo format --continue -- --write",
|
||||||
"lint": "turbo lint --continue",
|
"lint": "turbo lint --continue",
|
||||||
"lint:fix": "turbo lint --continue -- --fix",
|
"lint:fix": "turbo lint --continue -- --fix",
|
||||||
"lint:ws": "pnpm dlx sherif@latest",
|
"lint:ws": "pnpm dlx sherif@latest",
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { hasQueryAccessToIntegrationsAsync } from "@homarr/auth/server";
|
|
||||||
import { constructIntegrationPermissions } from "@homarr/auth/shared";
|
|
||||||
import { createId, objectEntries } from "@homarr/common";
|
import { createId, objectEntries } from "@homarr/common";
|
||||||
import { decryptSecret, encryptSecret } from "@homarr/common/server";
|
import { decryptSecret, encryptSecret } from "@homarr/common/server";
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
@@ -16,9 +14,11 @@ import {
|
|||||||
integrations,
|
integrations,
|
||||||
integrationSecrets,
|
integrationSecrets,
|
||||||
integrationUserPermissions,
|
integrationUserPermissions,
|
||||||
|
searchEngines,
|
||||||
} from "@homarr/db/schema";
|
} from "@homarr/db/schema";
|
||||||
import type { IntegrationSecretKind } from "@homarr/definitions";
|
import type { IntegrationSecretKind } from "@homarr/definitions";
|
||||||
import {
|
import {
|
||||||
|
getIconUrl,
|
||||||
getIntegrationKindsByCategory,
|
getIntegrationKindsByCategory,
|
||||||
getPermissionsWithParents,
|
getPermissionsWithParents,
|
||||||
integrationCategories,
|
integrationCategories,
|
||||||
@@ -33,7 +33,6 @@ import {
|
|||||||
integrationSavePermissionsSchema,
|
integrationSavePermissionsSchema,
|
||||||
integrationUpdateSchema,
|
integrationUpdateSchema,
|
||||||
} from "@homarr/validation/integration";
|
} from "@homarr/validation/integration";
|
||||||
import { mediaRequestOptionsSchema, mediaRequestRequestSchema } from "@homarr/validation/widgets/media-request";
|
|
||||||
|
|
||||||
import { createOneIntegrationMiddleware } from "../../middlewares/integration";
|
import { createOneIntegrationMiddleware } from "../../middlewares/integration";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
|
||||||
@@ -42,7 +41,6 @@ import { MissingSecretError, testConnectionAsync } from "./integration-test-conn
|
|||||||
import { mapTestConnectionError } from "./map-test-connection-error";
|
import { mapTestConnectionError } from "./map-test-connection-error";
|
||||||
|
|
||||||
const logger = createLogger({ module: "integrationRouter" });
|
const logger = createLogger({ module: "integrationRouter" });
|
||||||
const mediaRequestSearchKinds = getIntegrationKindsByCategory("mediaSearch");
|
|
||||||
|
|
||||||
export const integrationRouter = createTRPCRouter({
|
export const integrationRouter = createTRPCRouter({
|
||||||
all: protectedProcedure.query(async ({ ctx }) => {
|
all: protectedProcedure.query(async ({ ctx }) => {
|
||||||
@@ -82,7 +80,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.toSorted(
|
.sort(
|
||||||
(integrationA, integrationB) =>
|
(integrationA, integrationB) =>
|
||||||
integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
|
integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
|
||||||
);
|
);
|
||||||
@@ -130,7 +128,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.toSorted(
|
.sort(
|
||||||
(integrationA, integrationB) =>
|
(integrationA, integrationB) =>
|
||||||
integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
|
integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
|
||||||
);
|
);
|
||||||
@@ -181,7 +179,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.toSorted(
|
.sort(
|
||||||
(integrationA, integrationB) =>
|
(integrationA, integrationB) =>
|
||||||
integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
|
integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
|
||||||
);
|
);
|
||||||
@@ -316,7 +314,20 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
url: input.url,
|
url: input.url,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Media request search is a first-class Spotlight action. Do not create a search engine for it.
|
if (
|
||||||
|
input.attemptSearchEngineCreation &&
|
||||||
|
integrationDefs[input.kind].category.flatMap((category) => category).includes("search")
|
||||||
|
) {
|
||||||
|
const icon = getIconUrl(input.kind);
|
||||||
|
await ctx.db.insert(searchEngines).values({
|
||||||
|
id: createId(),
|
||||||
|
name: input.name,
|
||||||
|
integrationId,
|
||||||
|
type: "fromIntegration",
|
||||||
|
iconUrl: icon,
|
||||||
|
short: await getNextValidShortNameForSearchEngineAsync(ctx.db, input.name),
|
||||||
|
});
|
||||||
|
}
|
||||||
}),
|
}),
|
||||||
update: protectedProcedure.input(integrationUpdateSchema).mutation(async ({ ctx, input }) => {
|
update: protectedProcedure.input(integrationUpdateSchema).mutation(async ({ ctx, input }) => {
|
||||||
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.id), "full");
|
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.id), "full");
|
||||||
@@ -484,7 +495,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
inherited: dbGroupPermissions.toSorted((permissionA, permissionB) => {
|
inherited: dbGroupPermissions.sort((permissionA, permissionB) => {
|
||||||
return permissionA.group.name.localeCompare(permissionB.group.name);
|
return permissionA.group.name.localeCompare(permissionB.group.name);
|
||||||
}),
|
}),
|
||||||
users: userPermissions
|
users: userPermissions
|
||||||
@@ -492,7 +503,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
user,
|
user,
|
||||||
permission,
|
permission,
|
||||||
}))
|
}))
|
||||||
.toSorted((permissionA, permissionB) => {
|
.sort((permissionA, permissionB) => {
|
||||||
return (permissionA.user.name ?? "").localeCompare(permissionB.user.name ?? "");
|
return (permissionA.user.name ?? "").localeCompare(permissionB.user.name ?? "");
|
||||||
}),
|
}),
|
||||||
groups: dbGroupIntegrationPermission
|
groups: dbGroupIntegrationPermission
|
||||||
@@ -503,7 +514,7 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
},
|
},
|
||||||
permission,
|
permission,
|
||||||
}))
|
}))
|
||||||
.toSorted((permissionA, permissionB) => {
|
.sort((permissionA, permissionB) => {
|
||||||
return permissionA.group.name.localeCompare(permissionB.group.name);
|
return permissionA.group.name.localeCompare(permissionB.group.name);
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
@@ -607,149 +618,8 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
const integrationInstance = await createIntegrationAsync(ctx.integration);
|
const integrationInstance = await createIntegrationAsync(ctx.integration);
|
||||||
return await integrationInstance.searchAsync(encodeURI(input.query));
|
return await integrationInstance.searchAsync(encodeURI(input.query));
|
||||||
}),
|
}),
|
||||||
mediaRequestSearchTargets: protectedProcedure.query(async ({ ctx }) => {
|
|
||||||
const integrationsWithAccess = await getAccessibleMediaRequestSearchIntegrationsAsync(ctx);
|
|
||||||
|
|
||||||
return integrationsWithAccess.map((integration) => {
|
|
||||||
const permissions = constructIntegrationPermissions(integration, ctx.session);
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: integration.id,
|
|
||||||
name: integration.name,
|
|
||||||
kind: integration.kind,
|
|
||||||
url: integration.url,
|
|
||||||
permissions: {
|
|
||||||
hasInteractAccess: permissions.hasInteractAccess,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}),
|
|
||||||
searchMediaRequests: protectedProcedure
|
|
||||||
.input(
|
|
||||||
z.object({
|
|
||||||
query: z.string(),
|
|
||||||
integrationIds: z.array(z.string()).optional(),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.query(async ({ ctx, input }) => {
|
|
||||||
const query = input.query.trim();
|
|
||||||
if (query.length === 0) return [];
|
|
||||||
|
|
||||||
const integrationsWithAccess = await getAccessibleMediaRequestSearchIntegrationsAsync(ctx, input.integrationIds);
|
|
||||||
|
|
||||||
const results = await Promise.all(
|
|
||||||
integrationsWithAccess.map(async (integration) => {
|
|
||||||
const integrationInstance = await createIntegrationAsync({
|
|
||||||
id: integration.id,
|
|
||||||
name: integration.name,
|
|
||||||
url: integration.url,
|
|
||||||
kind: integration.kind as (typeof mediaRequestSearchKinds)[number],
|
|
||||||
externalUrl: integration.app?.href ?? null,
|
|
||||||
decryptedSecrets: integration.secrets.map((secret) => ({
|
|
||||||
...secret,
|
|
||||||
value: decryptSecret(secret.value),
|
|
||||||
})),
|
|
||||||
});
|
|
||||||
const permissions = constructIntegrationPermissions(integration, ctx.session);
|
|
||||||
|
|
||||||
return await integrationInstance.searchAsync(encodeURI(query)).then((searchResults) =>
|
|
||||||
searchResults.map((result) => ({
|
|
||||||
...result,
|
|
||||||
integration: {
|
|
||||||
id: integration.id,
|
|
||||||
name: integration.name,
|
|
||||||
kind: integration.kind,
|
|
||||||
url: integration.url,
|
|
||||||
permissions: {
|
|
||||||
hasInteractAccess: permissions.hasInteractAccess,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
return results.flat();
|
|
||||||
}),
|
|
||||||
getMediaRequestOptions: protectedProcedure
|
|
||||||
.concat(createOneIntegrationMiddleware("query", "jellyseerr", "overseerr", "seerr"))
|
|
||||||
.input(mediaRequestOptionsSchema)
|
|
||||||
.query(async ({ ctx, input }) => {
|
|
||||||
const integration = await createIntegrationAsync(ctx.integration);
|
|
||||||
return await integration.getSeriesInformationAsync(input.mediaType, input.mediaId);
|
|
||||||
}),
|
|
||||||
requestMedia: protectedProcedure
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "jellyseerr", "overseerr", "seerr"))
|
|
||||||
.input(mediaRequestRequestSchema)
|
|
||||||
.mutation(async ({ ctx, input }) => {
|
|
||||||
const integration = await createIntegrationAsync(ctx.integration);
|
|
||||||
return await integration.requestMediaAsync(input.mediaType, input.mediaId, input.seasons);
|
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
interface IntegrationRouterContext {
|
|
||||||
db: Database;
|
|
||||||
session: Parameters<typeof hasQueryAccessToIntegrationsAsync>[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
const getAccessibleMediaRequestSearchIntegrationsAsync = async (
|
|
||||||
ctx: IntegrationRouterContext,
|
|
||||||
integrationIds?: string[],
|
|
||||||
) => {
|
|
||||||
const groupsOfCurrentUser = await ctx.db.query.groupMembers.findMany({
|
|
||||||
where: eq(groupMembers.userId, ctx.session?.user.id ?? ""),
|
|
||||||
});
|
|
||||||
|
|
||||||
const integrationsFromDb = await ctx.db.query.integrations.findMany({
|
|
||||||
where:
|
|
||||||
integrationIds && integrationIds.length > 0
|
|
||||||
? and(inArray(integrations.id, integrationIds), inArray(integrations.kind, mediaRequestSearchKinds))
|
|
||||||
: inArray(integrations.kind, mediaRequestSearchKinds),
|
|
||||||
orderBy: asc(integrations.name),
|
|
||||||
with: {
|
|
||||||
app: true,
|
|
||||||
secrets: true,
|
|
||||||
items: {
|
|
||||||
with: {
|
|
||||||
item: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
userPermissions: {
|
|
||||||
where: eq(integrationUserPermissions.userId, ctx.session?.user.id ?? ""),
|
|
||||||
},
|
|
||||||
groupPermissions: {
|
|
||||||
where: inArray(
|
|
||||||
integrationGroupPermissions.groupId,
|
|
||||||
groupsOfCurrentUser.map((group) => group.groupId),
|
|
||||||
),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (integrationIds && integrationsFromDb.length !== integrationIds.length) {
|
|
||||||
throw new TRPCError({
|
|
||||||
code: "NOT_FOUND",
|
|
||||||
message: "One or more media request search integrations were not found",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const integrationsWithAccess = await Promise.all(
|
|
||||||
integrationsFromDb.map(async (integration) => ({
|
|
||||||
integration,
|
|
||||||
hasAccess: await hasQueryAccessToIntegrationsAsync(ctx.db, [integration], ctx.session),
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (integrationIds && integrationsWithAccess.some(({ hasAccess }) => !hasAccess)) {
|
|
||||||
throw new TRPCError({
|
|
||||||
code: "FORBIDDEN",
|
|
||||||
message: "User does not have permission to query one or more media request search integrations",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return integrationsWithAccess.filter(({ hasAccess }) => hasAccess).map(({ integration }) => integration);
|
|
||||||
};
|
|
||||||
|
|
||||||
interface UpdateSecretInput {
|
interface UpdateSecretInput {
|
||||||
integrationId: string;
|
integrationId: string;
|
||||||
value: string;
|
value: string;
|
||||||
@@ -770,6 +640,35 @@ interface AddSecretInput {
|
|||||||
kind: IntegrationSecretKind;
|
kind: IntegrationSecretKind;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getNextValidShortNameForSearchEngineAsync = async (db: Database, integrationName: string) => {
|
||||||
|
const searchEngines = await db.query.searchEngines.findMany({
|
||||||
|
columns: {
|
||||||
|
short: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const usedShortNames = searchEngines.flatMap((searchEngine) => searchEngine.short.toLowerCase());
|
||||||
|
const nameByIntegrationName = integrationName.slice(0, 1).toLowerCase();
|
||||||
|
|
||||||
|
if (!usedShortNames.includes(nameByIntegrationName)) {
|
||||||
|
return nameByIntegrationName;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 8 is max length constraint
|
||||||
|
for (let i = 2; i < 9999999; i++) {
|
||||||
|
const generatedName = `${nameByIntegrationName}${i}`;
|
||||||
|
if (usedShortNames.includes(generatedName)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
return generatedName;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(
|
||||||
|
"Unable to automatically generate a short name. All possible variations were exhausted. Please disable the automatic creation and choose one later yourself.",
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const addSecretAsync = async (db: Database, input: AddSecretInput) => {
|
const addSecretAsync = async (db: Database, input: AddSecretInput) => {
|
||||||
await db.insert(integrationSecrets).values({
|
await db.insert(integrationSecrets).values({
|
||||||
kind: input.kind,
|
kind: input.kind,
|
||||||
|
|||||||
@@ -6,9 +6,12 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
|
|||||||
import { asc, eq, like } from "@homarr/db";
|
import { asc, eq, like } from "@homarr/db";
|
||||||
import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries";
|
import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries";
|
||||||
import { searchEngines, users } from "@homarr/db/schema";
|
import { searchEngines, users } from "@homarr/db/schema";
|
||||||
|
import { createIntegrationAsync } from "@homarr/integrations";
|
||||||
import { byIdSchema, paginatedSchema, searchSchema } from "@homarr/validation/common";
|
import { byIdSchema, paginatedSchema, searchSchema } from "@homarr/validation/common";
|
||||||
import { searchEngineEditSchema, searchEngineManageSchema } from "@homarr/validation/search-engine";
|
import { searchEngineEditSchema, searchEngineManageSchema } from "@homarr/validation/search-engine";
|
||||||
|
import { mediaRequestOptionsSchema, mediaRequestRequestSchema } from "@homarr/validation/widgets/media-request";
|
||||||
|
|
||||||
|
import { createOneIntegrationMiddleware } from "../../middlewares/integration";
|
||||||
import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
|
import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
|
||||||
|
|
||||||
const logger = createLogger({ module: "searchEngineRouter" });
|
const logger = createLogger({ module: "searchEngineRouter" });
|
||||||
@@ -145,6 +148,20 @@ export const searchEngineRouter = createTRPCRouter({
|
|||||||
limit: input.limit,
|
limit: input.limit,
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
getMediaRequestOptions: protectedProcedure
|
||||||
|
.concat(createOneIntegrationMiddleware("query", "jellyseerr", "overseerr"))
|
||||||
|
.input(mediaRequestOptionsSchema)
|
||||||
|
.query(async ({ ctx, input }) => {
|
||||||
|
const integration = await createIntegrationAsync(ctx.integration);
|
||||||
|
return await integration.getSeriesInformationAsync(input.mediaType, input.mediaId);
|
||||||
|
}),
|
||||||
|
requestMedia: protectedProcedure
|
||||||
|
.concat(createOneIntegrationMiddleware("interact", "jellyseerr", "overseerr"))
|
||||||
|
.input(mediaRequestRequestSchema)
|
||||||
|
.mutation(async ({ ctx, input }) => {
|
||||||
|
const integration = await createIntegrationAsync(ctx.integration);
|
||||||
|
return await integration.requestMediaAsync(input.mediaType, input.mediaId, input.seasons);
|
||||||
|
}),
|
||||||
create: permissionRequiredProcedure
|
create: permissionRequiredProcedure
|
||||||
.requiresPermission("search-engine-create")
|
.requiresPermission("search-engine-create")
|
||||||
.input(searchEngineManageSchema)
|
.input(searchEngineManageSchema)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
|
|||||||
import type { Session } from "@homarr/auth";
|
import type { Session } from "@homarr/auth";
|
||||||
import { createId } from "@homarr/common";
|
import { createId } from "@homarr/common";
|
||||||
import { encryptSecret } from "@homarr/common/server";
|
import { encryptSecret } from "@homarr/common/server";
|
||||||
import { apps, integrations, integrationSecrets, integrationUserPermissions, users } from "@homarr/db/schema";
|
import { apps, integrations, integrationSecrets } from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDb } from "@homarr/db/test";
|
||||||
import type { GroupPermissionKey } from "@homarr/definitions";
|
import type { GroupPermissionKey } from "@homarr/definitions";
|
||||||
|
|
||||||
@@ -59,127 +59,6 @@ describe("all should return all integrations", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("mediaRequestSearchTargets should return accessible media search integrations", () => {
|
|
||||||
test("with integration use access should only return media request search integrations", async () => {
|
|
||||||
const db = createDb();
|
|
||||||
const caller = integrationRouter.createCaller({
|
|
||||||
db,
|
|
||||||
deviceType: undefined,
|
|
||||||
session: defaultSessionWithPermissions(["integration-use-all"]),
|
|
||||||
});
|
|
||||||
|
|
||||||
await db.insert(integrations).values([
|
|
||||||
{
|
|
||||||
id: "1",
|
|
||||||
name: "Jellyseerr",
|
|
||||||
kind: "jellyseerr",
|
|
||||||
url: "http://jellyseerr.local",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "2",
|
|
||||||
name: "Jellyfin",
|
|
||||||
kind: "jellyfin",
|
|
||||||
url: "http://jellyfin.local",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await caller.mediaRequestSearchTargets();
|
|
||||||
|
|
||||||
expect(result).toHaveLength(1);
|
|
||||||
expect(result[0]!.id).toBe("1");
|
|
||||||
expect(result[0]!.kind).toBe("jellyseerr");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("without access should not return media request search integrations", async () => {
|
|
||||||
const db = createDb();
|
|
||||||
const caller = integrationRouter.createCaller({
|
|
||||||
db,
|
|
||||||
deviceType: undefined,
|
|
||||||
session: defaultSessionWithPermissions(),
|
|
||||||
});
|
|
||||||
|
|
||||||
await db.insert(integrations).values({
|
|
||||||
id: "1",
|
|
||||||
name: "Jellyseerr",
|
|
||||||
kind: "jellyseerr",
|
|
||||||
url: "http://jellyseerr.local",
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await caller.mediaRequestSearchTargets();
|
|
||||||
|
|
||||||
expect(result).toHaveLength(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("with direct integration use access should return media request search integrations", async () => {
|
|
||||||
const db = createDb();
|
|
||||||
const caller = integrationRouter.createCaller({
|
|
||||||
db,
|
|
||||||
deviceType: undefined,
|
|
||||||
session: defaultSessionWithPermissions(),
|
|
||||||
});
|
|
||||||
|
|
||||||
await db.insert(integrations).values({
|
|
||||||
id: "1",
|
|
||||||
name: "Jellyseerr",
|
|
||||||
kind: "jellyseerr",
|
|
||||||
url: "http://jellyseerr.local",
|
|
||||||
});
|
|
||||||
await db.insert(users).values({ id: defaultUserId });
|
|
||||||
await db.insert(integrationUserPermissions).values({
|
|
||||||
integrationId: "1",
|
|
||||||
userId: defaultUserId,
|
|
||||||
permission: "use",
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await caller.mediaRequestSearchTargets();
|
|
||||||
|
|
||||||
expect(result).toHaveLength(1);
|
|
||||||
expect(result[0]!.id).toBe("1");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("searchMediaRequests should validate scoped integrations", () => {
|
|
||||||
test("with a non media search integration should throw not found", async () => {
|
|
||||||
const db = createDb();
|
|
||||||
const caller = integrationRouter.createCaller({
|
|
||||||
db,
|
|
||||||
deviceType: undefined,
|
|
||||||
session: defaultSessionWithPermissions(["integration-use-all"]),
|
|
||||||
});
|
|
||||||
|
|
||||||
await db.insert(integrations).values({
|
|
||||||
id: "1",
|
|
||||||
name: "Jellyfin",
|
|
||||||
kind: "jellyfin",
|
|
||||||
url: "http://jellyfin.local",
|
|
||||||
});
|
|
||||||
|
|
||||||
await expect(caller.searchMediaRequests({ query: "matrix", integrationIds: ["1"] })).rejects.toThrow(
|
|
||||||
"One or more media request search integrations were not found",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("without query access to a scoped media search integration should throw forbidden", async () => {
|
|
||||||
const db = createDb();
|
|
||||||
const caller = integrationRouter.createCaller({
|
|
||||||
db,
|
|
||||||
deviceType: undefined,
|
|
||||||
session: defaultSessionWithPermissions(),
|
|
||||||
});
|
|
||||||
|
|
||||||
await db.insert(integrations).values({
|
|
||||||
id: "1",
|
|
||||||
name: "Jellyseerr",
|
|
||||||
kind: "jellyseerr",
|
|
||||||
url: "http://jellyseerr.local",
|
|
||||||
});
|
|
||||||
|
|
||||||
await expect(caller.searchMediaRequests({ query: "matrix", integrationIds: ["1"] })).rejects.toThrow(
|
|
||||||
"User does not have permission to query one or more media request search integrations",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("byId should return an integration by id", () => {
|
describe("byId should return an integration by id", () => {
|
||||||
test("with full access should return an integration by id", async () => {
|
test("with full access should return an integration by id", async () => {
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
@@ -329,7 +208,7 @@ describe("create should create a new integration", () => {
|
|||||||
expect(dbSecret!.updatedAt).toEqual(fakeNow);
|
expect(dbSecret!.updatedAt).toEqual(fakeNow);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("with create integration access should not create a search engine for media request search integrations", async () => {
|
test("with create integration access should create a new integration when creating search engine", async () => {
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
const caller = integrationRouter.createCaller({
|
const caller = integrationRouter.createCaller({
|
||||||
db,
|
db,
|
||||||
@@ -364,7 +243,12 @@ describe("create should create a new integration", () => {
|
|||||||
expect(dbSecret!.value).toMatch(/^[a-f0-9]+.[a-f0-9]+$/);
|
expect(dbSecret!.value).toMatch(/^[a-f0-9]+.[a-f0-9]+$/);
|
||||||
expect(dbSecret!.updatedAt).toEqual(fakeNow);
|
expect(dbSecret!.updatedAt).toEqual(fakeNow);
|
||||||
|
|
||||||
expect(dbSearchEngine).toBeUndefined();
|
expect(dbSearchEngine!.integrationId).toBe(dbIntegration!.id);
|
||||||
|
expect(dbSearchEngine!.short).toBe("j");
|
||||||
|
expect(dbSearchEngine!.name).toBe(input.name);
|
||||||
|
expect(dbSearchEngine!.iconUrl).toBe(
|
||||||
|
"https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg",
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("with create integration access should create a new integration with new linked app", async () => {
|
test("with create integration access should create a new integration with new linked app", async () => {
|
||||||
|
|||||||
@@ -40,9 +40,6 @@ export const env = createEnv({
|
|||||||
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: z.string().optional(),
|
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: z.string().optional(),
|
||||||
AUTH_OIDC_FORCE_USERINFO: createBooleanSchema(false),
|
AUTH_OIDC_FORCE_USERINFO: createBooleanSchema(false),
|
||||||
AUTH_OIDC_ENABLE_DANGEROUS_ACCOUNT_LINKING: createBooleanSchema(false),
|
AUTH_OIDC_ENABLE_DANGEROUS_ACCOUNT_LINKING: createBooleanSchema(false),
|
||||||
AUTH_OIDC_TOKEN_ENDPOINT_AUTH_METHOD: z
|
|
||||||
.enum(["client_secret_basic", "client_secret_post", "client_secret_jwt", "none"])
|
|
||||||
.default("client_secret_basic"),
|
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
...(authProviders.includes("ldap")
|
...(authProviders.includes("ldap")
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -14,9 +14,6 @@ export const OidcProvider = (headers: ReadonlyHeaders | null): OIDCConfig<Profil
|
|||||||
type: "oidc",
|
type: "oidc",
|
||||||
clientId: env.AUTH_OIDC_CLIENT_ID,
|
clientId: env.AUTH_OIDC_CLIENT_ID,
|
||||||
clientSecret: env.AUTH_OIDC_CLIENT_SECRET,
|
clientSecret: env.AUTH_OIDC_CLIENT_SECRET,
|
||||||
client: {
|
|
||||||
token_endpoint_auth_method: env.AUTH_OIDC_TOKEN_ENDPOINT_AUTH_METHOD,
|
|
||||||
},
|
|
||||||
issuer: env.AUTH_OIDC_ISSUER,
|
issuer: env.AUTH_OIDC_ISSUER,
|
||||||
allowDangerousEmailAccountLinking: env.AUTH_OIDC_ENABLE_DANGEROUS_ACCOUNT_LINKING,
|
allowDangerousEmailAccountLinking: env.AUTH_OIDC_ENABLE_DANGEROUS_ACCOUNT_LINKING,
|
||||||
authorization: {
|
authorization: {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "esbuild src/index.ts --bundle --platform=node --outfile=cli.cjs --external:bcrypt --external:cpu-features --loader:.html=text --loader:.node=text",
|
"build": "esbuild src/index.ts --bundle --platform=node --outfile=cli.cjs --external:bcrypt --external:cpu-features --loader:.html=text --loader:.node=text",
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"run": "pnpm with-env node cli.cjs",
|
"run": "pnpm with-env node cli.cjs",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -14,9 +14,7 @@ export const mediaRequestStatsJob = createCronJob("mediaRequestStats", EVERY_MIN
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
export const mediaRequestListJob = createCronJob("mediaRequestList", EVERY_MINUTE, {
|
export const mediaRequestListJob = createCronJob("mediaRequestList", EVERY_MINUTE).withCallback(
|
||||||
expectedMaximumDurationInMillis: 15_000,
|
|
||||||
}).withCallback(
|
|
||||||
createRequestIntegrationJobHandler(mediaRequestListRequestHandler.handler, {
|
createRequestIntegrationJobHandler(mediaRequestListRequestHandler.handler, {
|
||||||
widgetKinds: ["mediaRequests-requestList"],
|
widgetKinds: ["mediaRequests-requestList"],
|
||||||
getInput: {
|
getInput: {
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import { EVERY_DAY } from "@homarr/cron-jobs-core/expressions";
|
import { EVERY_HOUR } from "@homarr/cron-jobs-core/expressions";
|
||||||
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
|
import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
|
||||||
|
|
||||||
import { createCronJob } from "../lib";
|
import { createCronJob } from "../lib";
|
||||||
|
|
||||||
export const updateCheckerJob = createCronJob("updateChecker", EVERY_DAY, {
|
export const updateCheckerJob = createCronJob("updateChecker", EVERY_HOUR, {
|
||||||
runOnStart: true,
|
runOnStart: true,
|
||||||
}).withCallback(async () => {
|
}).withCallback(async () => {
|
||||||
const handler = updateCheckerRequestHandler.handler({});
|
const handler = updateCheckerRequestHandler.handler({});
|
||||||
await handler.getCachedOrUpdatedDataAsync({});
|
await handler.getCachedOrUpdatedDataAsync({
|
||||||
|
forceUpdate: true,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
"build:postgresql": "esbuild migrations/postgresql/migrate.ts --bundle --platform=node --outfile=migrations/postgresql/migrate.cjs",
|
"build:postgresql": "esbuild migrations/postgresql/migrate.ts --bundle --platform=node --outfile=migrations/postgresql/migrate.cjs",
|
||||||
"build:sqlite": "esbuild migrations/sqlite/migrate.ts --bundle --platform=node --outfile=migrations/sqlite/migrate.cjs",
|
"build:sqlite": "esbuild migrations/sqlite/migrate.ts --bundle --platform=node --outfile=migrations/sqlite/migrate.cjs",
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"migration:custom": "pnpm with-env tsx ./migrations/custom/run-custom.ts",
|
"migration:custom": "pnpm with-env tsx ./migrations/custom/run-custom.ts",
|
||||||
"migration:mysql:drop": "pnpm with-env drizzle-kit drop --config ./configs/mysql.config.ts",
|
"migration:mysql:drop": "pnpm with-env drizzle-kit drop --config ./configs/mysql.config.ts",
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"postinstall": "tsx ./src/docs/codegen.ts",
|
"postinstall": "tsx ./src/docs/codegen.ts",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -12,14 +12,12 @@ interface SeriesInformation {
|
|||||||
overview: string;
|
overview: string;
|
||||||
seasons: SerieSeason[];
|
seasons: SerieSeason[];
|
||||||
posterPath: string;
|
posterPath: string;
|
||||||
requestedSeasons: number[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface MovieInformation {
|
interface MovieInformation {
|
||||||
id: number;
|
id: number;
|
||||||
overview: string;
|
overview: string;
|
||||||
posterPath: string;
|
posterPath: string;
|
||||||
requestedSeasons: number[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export type MediaInformation = SeriesInformation | MovieInformation;
|
export type MediaInformation = SeriesInformation | MovieInformation;
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
import type { RequestInit, Response } from "undici";
|
|
||||||
import { fetch } from "undici";
|
|
||||||
|
|
||||||
import { splitToChunksWithNItems } from "@homarr/common";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
import { createCertificateAgentAsync } from "@homarr/core/infrastructure/http";
|
|
||||||
import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
|
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||||
|
|
||||||
@@ -28,14 +24,6 @@ import {
|
|||||||
|
|
||||||
const logger = createLogger({ module: "overseerrIntegration" });
|
const logger = createLogger({ module: "overseerrIntegration" });
|
||||||
|
|
||||||
const REQUEST_TIMEOUT_MS = 10_000;
|
|
||||||
const DETAIL_FETCH_BATCH_SIZE = 5;
|
|
||||||
|
|
||||||
interface OverseerrFetchClient {
|
|
||||||
fetchAsync: (url: URL, init?: RequestInit) => Promise<Response>;
|
|
||||||
fetchUncheckedAsync: (url: URL, init?: RequestInit) => Promise<Response>;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface OverseerrSearchResult {
|
interface OverseerrSearchResult {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
@@ -52,43 +40,12 @@ export class OverseerrIntegration
|
|||||||
extends Integration
|
extends Integration
|
||||||
implements IMediaRequestIntegration, ISearchableIntegration<OverseerrSearchResult>
|
implements IMediaRequestIntegration, ISearchableIntegration<OverseerrSearchResult>
|
||||||
{
|
{
|
||||||
private async createFetchClientAsync(): Promise<OverseerrFetchClient> {
|
|
||||||
const agent = await createCertificateAgentAsync(undefined);
|
|
||||||
const apiKey = this.getSecretValue("apiKey");
|
|
||||||
|
|
||||||
const requestAsync = async (url: URL, init?: RequestInit) => {
|
|
||||||
return await withTimeoutAsync(
|
|
||||||
(signal) =>
|
|
||||||
fetch(url, {
|
|
||||||
...init,
|
|
||||||
signal,
|
|
||||||
dispatcher: agent,
|
|
||||||
headers: {
|
|
||||||
"X-Api-Key": apiKey,
|
|
||||||
...init?.headers,
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
REQUEST_TIMEOUT_MS,
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
fetchAsync: async (url, init) => {
|
|
||||||
const response = await requestAsync(url, init);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Overseerr request failed: ${response.status} ${response.statusText} (${url.toString()})`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return response;
|
|
||||||
},
|
|
||||||
fetchUncheckedAsync: requestAsync,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public async searchAsync(query: string) {
|
public async searchAsync(query: string) {
|
||||||
const client = await this.createFetchClientAsync();
|
const response = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/search", { query }), {
|
||||||
const response = await client.fetchAsync(this.url("/api/v1/search", { query }));
|
headers: {
|
||||||
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
|
},
|
||||||
|
});
|
||||||
const schemaData = await searchSchema.parseAsync(await response.json());
|
const schemaData = await searchSchema.parseAsync(await response.json());
|
||||||
|
|
||||||
if (!schemaData.results) {
|
if (!schemaData.results) {
|
||||||
@@ -103,22 +60,17 @@ export class OverseerrIntegration
|
|||||||
text: "overview" in result ? result.overview : undefined,
|
text: "overview" in result ? result.overview : undefined,
|
||||||
type: result.mediaType,
|
type: result.mediaType,
|
||||||
inLibrary: result.mediaInfo !== undefined,
|
inLibrary: result.mediaInfo !== undefined,
|
||||||
availability: result.mediaInfo
|
|
||||||
? this.mapAvailability(result.mediaInfo.status as UpstreamMediaAvailability, false)
|
|
||||||
: undefined,
|
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getSeriesInformationAsync(mediaType: "movie" | "tv", id: number) {
|
public async getSeriesInformationAsync(mediaType: "movie" | "tv", id: number) {
|
||||||
const client = await this.createFetchClientAsync();
|
|
||||||
const url = mediaType === "tv" ? this.url(`/api/v1/tv/${id}`) : this.url(`/api/v1/movie/${id}`);
|
const url = mediaType === "tv" ? this.url(`/api/v1/tv/${id}`) : this.url(`/api/v1/movie/${id}`);
|
||||||
const response = await client.fetchAsync(url);
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
const data = await mediaInformationSchema.parseAsync(await response.json());
|
headers: {
|
||||||
const requestedSeasons = [
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
...new Set(data.mediaInfo?.requests?.flatMap((req) => req.seasons.map((s) => s.seasonNumber)) ?? []),
|
},
|
||||||
];
|
});
|
||||||
const { mediaInfo: _strip, ...rest } = data;
|
return await mediaInformationSchema.parseAsync(await response.json());
|
||||||
return { ...rest, requestedSeasons };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -128,9 +80,8 @@ export class OverseerrIntegration
|
|||||||
* @param seasons A list of the seasons that should be requested.
|
* @param seasons A list of the seasons that should be requested.
|
||||||
*/
|
*/
|
||||||
public async requestMediaAsync(mediaType: "movie" | "tv", id: number, seasons?: number[]): Promise<void> {
|
public async requestMediaAsync(mediaType: "movie" | "tv", id: number, seasons?: number[]): Promise<void> {
|
||||||
const client = await this.createFetchClientAsync();
|
|
||||||
const url = this.url("/api/v1/request");
|
const url = this.url("/api/v1/request");
|
||||||
const response = await client.fetchUncheckedAsync(url, {
|
const response = await fetchWithTrustedCertificatesAsync(url, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
mediaType,
|
mediaType,
|
||||||
@@ -138,6 +89,7 @@ export class OverseerrIntegration
|
|||||||
seasons,
|
seasons,
|
||||||
}),
|
}),
|
||||||
headers: {
|
headers: {
|
||||||
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -163,16 +115,25 @@ export class OverseerrIntegration
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async getRequestsAsync(): Promise<MediaRequest[]> {
|
public async getRequestsAsync(): Promise<MediaRequest[]> {
|
||||||
const client = await this.createFetchClientAsync();
|
const pendingRequests = await fetchWithTrustedCertificatesAsync(
|
||||||
|
this.url("/api/v1/request", { take: 20, filter: "pending" }),
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
const [pendingResponse, allResponse] = await Promise.all([
|
const allRequests = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/request", { take: 20 }), {
|
||||||
client.fetchAsync(this.url("/api/v1/request", { take: 20, filter: "pending" })),
|
headers: {
|
||||||
client.fetchAsync(this.url("/api/v1/request", { take: 20 })),
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
]);
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const pendingResults = (await getRequestsSchema.parseAsync(await pendingResponse.json())).results;
|
const pendingResults = (await getRequestsSchema.parseAsync(await pendingRequests.json())).results;
|
||||||
const allResults = (await getRequestsSchema.parseAsync(await allResponse.json())).results;
|
const allResults = (await getRequestsSchema.parseAsync(await allRequests.json())).results;
|
||||||
|
|
||||||
|
//Concat the 2 lists while remove any duplicate pending from the all items list
|
||||||
let requests;
|
let requests;
|
||||||
|
|
||||||
if (pendingResults.length > 0 && allResults.length > 0) {
|
if (pendingResults.length > 0 && allResults.length > 0) {
|
||||||
@@ -181,53 +142,37 @@ export class OverseerrIntegration
|
|||||||
);
|
);
|
||||||
} else if (pendingResults.length > 0) requests = pendingResults;
|
} else if (pendingResults.length > 0) requests = pendingResults;
|
||||||
else if (allResults.length > 0) requests = allResults;
|
else if (allResults.length > 0) requests = allResults;
|
||||||
else return [];
|
else return Promise.all([]);
|
||||||
|
|
||||||
const uniqueKeys = [...new Set(requests.map((request) => `${request.type}:${request.media.tmdbId}`))];
|
return await Promise.all(
|
||||||
const informationByKey = new Map<string, MediaInformation>();
|
requests.map(async (request): Promise<MediaRequest> => {
|
||||||
|
const information = await this.getItemInformationAsync(request.media.tmdbId, request.type);
|
||||||
|
|
||||||
for (const batch of splitToChunksWithNItems(uniqueKeys, DETAIL_FETCH_BATCH_SIZE)) {
|
// See https://github.com/seerr-team/seerr/blob/af083a3cd5c3e3d5d7917fdf4fdd67fe3f39c46b/src/components/StatusBadge/index.tsx#L40
|
||||||
const batchResults = await Promise.all(
|
const inProgress = (request.media.downloadStatus ?? []).length >= 1;
|
||||||
batch.map(async (key) => {
|
|
||||||
const separatorIndex = key.indexOf(":");
|
|
||||||
const type = key.slice(0, separatorIndex) as MediaRequest["type"];
|
|
||||||
const tmdbId = Number(key.slice(separatorIndex + 1));
|
|
||||||
const information = await this.getItemInformationAsync(client, type, tmdbId);
|
|
||||||
return [key, information] as const;
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
for (const [key, information] of batchResults) {
|
return {
|
||||||
informationByKey.set(key, information);
|
id: request.id,
|
||||||
}
|
name: information.name,
|
||||||
}
|
status: this.mapRequestStatus(request.status),
|
||||||
|
availability: this.mapAvailability(request.media.status, inProgress),
|
||||||
return requests.map((request): MediaRequest => {
|
backdropImageUrl: `https://image.tmdb.org/t/p/original/${information.backdropPath}`,
|
||||||
const information = informationByKey.get(`${request.type}:${request.media.tmdbId}`)!;
|
posterImagePath: `https://image.tmdb.org/t/p/w600_and_h900_bestv2/${information.posterPath}`,
|
||||||
|
href: this.externalUrl(`/${request.type}/${request.media.tmdbId}`).toString(),
|
||||||
const inProgress = (request.media.downloadStatus ?? []).length >= 1;
|
type: request.type,
|
||||||
|
createdAt: request.createdAt,
|
||||||
return {
|
airDate: new Date(information.airDate),
|
||||||
id: request.id,
|
requestedBy: request.requestedBy
|
||||||
name: information.name,
|
? ({
|
||||||
status: this.mapRequestStatus(request.status),
|
...request.requestedBy,
|
||||||
availability: this.mapAvailability(request.media.status, inProgress),
|
displayName: request.requestedBy.displayName,
|
||||||
backdropImageUrl: `https://image.tmdb.org/t/p/original/${information.backdropPath}`,
|
link: this.externalUrl(`/users/${request.requestedBy.id}`).toString(),
|
||||||
posterImagePath: `https://image.tmdb.org/t/p/w600_and_h900_bestv2/${information.posterPath}`,
|
avatar: this.constructAvatarUrl(request.requestedBy.avatar).toString(),
|
||||||
href: this.externalUrl(`/${request.type}/${request.media.tmdbId}`).toString(),
|
} satisfies Omit<RequestUser, "requestCount">)
|
||||||
type: request.type,
|
: undefined,
|
||||||
createdAt: request.createdAt,
|
};
|
||||||
airDate: new Date(information.airDate),
|
}),
|
||||||
requestedBy: request.requestedBy
|
);
|
||||||
? ({
|
|
||||||
...request.requestedBy,
|
|
||||||
displayName: request.requestedBy.displayName,
|
|
||||||
link: this.externalUrl(`/users/${request.requestedBy.id}`).toString(),
|
|
||||||
avatar: this.constructAvatarUrl(request.requestedBy.avatar).toString(),
|
|
||||||
} satisfies Omit<RequestUser, "requestCount">)
|
|
||||||
: undefined,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected mapRequestStatus(status: UpstreamMediaRequestStatus): MediaRequestStatus {
|
protected mapRequestStatus(status: UpstreamMediaRequestStatus): MediaRequestStatus {
|
||||||
@@ -267,14 +212,20 @@ export class OverseerrIntegration
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async getStatsAsync(): Promise<RequestStats> {
|
public async getStatsAsync(): Promise<RequestStats> {
|
||||||
const client = await this.createFetchClientAsync();
|
const response = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/request/count"), {
|
||||||
const response = await client.fetchAsync(this.url("/api/v1/request/count"));
|
headers: {
|
||||||
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
|
},
|
||||||
|
});
|
||||||
return await getStatsSchema.parseAsync(await response.json());
|
return await getStatsSchema.parseAsync(await response.json());
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getUsersAsync(): Promise<RequestUser[]> {
|
public async getUsersAsync(): Promise<RequestUser[]> {
|
||||||
const client = await this.createFetchClientAsync();
|
const response = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/user", { take: 10, sort: "requests" }), {
|
||||||
const response = await client.fetchAsync(this.url("/api/v1/user", { take: 10, sort: "requests" }));
|
headers: {
|
||||||
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
|
},
|
||||||
|
});
|
||||||
const users = (await getUsersSchema.parseAsync(await response.json())).results;
|
const users = (await getUsersSchema.parseAsync(await response.json())).results;
|
||||||
return users.map((user): RequestUser => {
|
return users.map((user): RequestUser => {
|
||||||
return {
|
return {
|
||||||
@@ -287,58 +238,75 @@ export class OverseerrIntegration
|
|||||||
|
|
||||||
public async approveRequestAsync(requestId: number): Promise<void> {
|
public async approveRequestAsync(requestId: number): Promise<void> {
|
||||||
logger.info("Approving media request", { requestId, integration: this.integration.name });
|
logger.info("Approving media request", { requestId, integration: this.integration.name });
|
||||||
const client = await this.createFetchClientAsync();
|
await fetchWithTrustedCertificatesAsync(this.url(`/api/v1/request/${requestId}/approve`), {
|
||||||
await client
|
method: "POST",
|
||||||
.fetchUncheckedAsync(this.url(`/api/v1/request/${requestId}/approve`), {
|
headers: {
|
||||||
method: "POST",
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
})
|
},
|
||||||
.then((response) => {
|
}).then((response) => {
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
logger.error(
|
logger.error(
|
||||||
new ErrorWithMetadata("Failed to approve media request", {
|
new ErrorWithMetadata("Failed to approve media request", {
|
||||||
requestId,
|
requestId,
|
||||||
integration: this.integration.name,
|
integration: this.integration.name,
|
||||||
reason: `${response.status} ${response.statusText}`,
|
reason: `${response.status} ${response.statusText}`,
|
||||||
url: response.url,
|
url: response.url,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info("Successfully approved media request", { requestId, integration: this.integration.name });
|
logger.info("Successfully approved media request", { requestId, integration: this.integration.name });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public async declineRequestAsync(requestId: number): Promise<void> {
|
public async declineRequestAsync(requestId: number): Promise<void> {
|
||||||
logger.info("Declining media request", { requestId, integration: this.integration.name });
|
logger.info("Declining media request", { requestId, integration: this.integration.name });
|
||||||
const client = await this.createFetchClientAsync();
|
|
||||||
await client
|
|
||||||
.fetchUncheckedAsync(this.url(`/api/v1/request/${requestId}/decline`), {
|
|
||||||
method: "POST",
|
|
||||||
})
|
|
||||||
.then((response) => {
|
|
||||||
if (!response.ok) {
|
|
||||||
logger.error(
|
|
||||||
new ErrorWithMetadata("Failed to decline media request", {
|
|
||||||
requestId,
|
|
||||||
integration: this.integration.name,
|
|
||||||
reason: `${response.status} ${response.statusText}`,
|
|
||||||
url: response.url,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info("Successfully declined media request", { requestId, integration: this.integration.name });
|
await fetchWithTrustedCertificatesAsync(this.url(`/api/v1/request/${requestId}/decline`), {
|
||||||
});
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
|
},
|
||||||
|
}).then((response) => {
|
||||||
|
if (!response.ok) {
|
||||||
|
logger.error(
|
||||||
|
new ErrorWithMetadata("Failed to decline media request", {
|
||||||
|
requestId,
|
||||||
|
integration: this.integration.name,
|
||||||
|
reason: `${response.status} ${response.statusText}`,
|
||||||
|
url: response.url,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info("Successfully declined media request", { requestId, integration: this.integration.name });
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async getItemInformationAsync(
|
private async getItemInformationAsync(id: number, type: MediaRequest["type"]): Promise<MediaInformation> {
|
||||||
client: OverseerrFetchClient,
|
const response = await fetchWithTrustedCertificatesAsync(this.url(`/api/v1/${type}/${id}`), {
|
||||||
type: MediaRequest["type"],
|
headers: {
|
||||||
id: number,
|
"X-Api-Key": this.getSecretValue("apiKey"),
|
||||||
): Promise<MediaInformation> {
|
},
|
||||||
const response = await client.fetchAsync(this.url(`/api/v1/${type}/${id}`));
|
});
|
||||||
const rawData = (await response.json()) as TvInformation | MovieInformation;
|
|
||||||
return mediaInformationFromResponse[type](rawData as never);
|
if (type === "tv") {
|
||||||
|
const series = (await response.json()) as TvInformation;
|
||||||
|
return {
|
||||||
|
name: series.name,
|
||||||
|
backdropPath: series.backdropPath ?? series.posterPath,
|
||||||
|
posterPath: series.posterPath ?? series.backdropPath,
|
||||||
|
airDate: series.firstAirDate,
|
||||||
|
} satisfies MediaInformation;
|
||||||
|
}
|
||||||
|
|
||||||
|
const movie = (await response.json()) as MovieInformation;
|
||||||
|
return {
|
||||||
|
name: movie.title,
|
||||||
|
backdropPath: movie.backdropPath ?? movie.posterPath,
|
||||||
|
posterPath: movie.posterPath ?? movie.backdropPath,
|
||||||
|
airDate: movie.releaseDate,
|
||||||
|
} satisfies MediaInformation;
|
||||||
}
|
}
|
||||||
|
|
||||||
private constructAvatarUrl(avatar: string) {
|
private constructAvatarUrl(avatar: string) {
|
||||||
@@ -373,37 +341,6 @@ interface MovieInformation {
|
|||||||
releaseDate: string;
|
releaseDate: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const mediaInformationFromResponse = {
|
|
||||||
tv: (series: TvInformation): MediaInformation => ({
|
|
||||||
name: series.name,
|
|
||||||
backdropPath: series.backdropPath ?? series.posterPath,
|
|
||||||
posterPath: series.posterPath ?? series.backdropPath,
|
|
||||||
airDate: series.firstAirDate,
|
|
||||||
}),
|
|
||||||
movie: (movie: MovieInformation): MediaInformation => ({
|
|
||||||
name: movie.title,
|
|
||||||
backdropPath: movie.backdropPath ?? movie.posterPath,
|
|
||||||
posterPath: movie.posterPath ?? movie.backdropPath,
|
|
||||||
airDate: movie.releaseDate,
|
|
||||||
}),
|
|
||||||
} satisfies Record<MediaRequest["type"], (data: TvInformation | MovieInformation) => MediaInformation>;
|
|
||||||
|
|
||||||
const mediaInfoRequestsSchema = z
|
|
||||||
.object({
|
|
||||||
requests: z
|
|
||||||
.array(
|
|
||||||
z.object({
|
|
||||||
seasons: z.array(
|
|
||||||
z.object({
|
|
||||||
seasonNumber: z.number(),
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.optional(),
|
|
||||||
})
|
|
||||||
.optional();
|
|
||||||
|
|
||||||
const mediaInformationSchema = z.union([
|
const mediaInformationSchema = z.union([
|
||||||
z.object({
|
z.object({
|
||||||
id: z.number(),
|
id: z.number(),
|
||||||
@@ -418,22 +355,14 @@ const mediaInformationSchema = z.union([
|
|||||||
),
|
),
|
||||||
numberOfSeasons: z.number(),
|
numberOfSeasons: z.number(),
|
||||||
posterPath: z.string().startsWith("/"),
|
posterPath: z.string().startsWith("/"),
|
||||||
mediaInfo: mediaInfoRequestsSchema,
|
|
||||||
}),
|
}),
|
||||||
z.object({
|
z.object({
|
||||||
id: z.number(),
|
id: z.number(),
|
||||||
overview: z.string(),
|
overview: z.string(),
|
||||||
posterPath: z.string().startsWith("/"),
|
posterPath: z.string().startsWith("/"),
|
||||||
mediaInfo: mediaInfoRequestsSchema,
|
|
||||||
}),
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const searchMediaInfoSchema = z
|
|
||||||
.object({
|
|
||||||
status: z.number(),
|
|
||||||
})
|
|
||||||
.optional();
|
|
||||||
|
|
||||||
const searchSchema = z.object({
|
const searchSchema = z.object({
|
||||||
results: z
|
results: z
|
||||||
.array(
|
.array(
|
||||||
@@ -444,7 +373,7 @@ const searchSchema = z.object({
|
|||||||
name: z.string(),
|
name: z.string(),
|
||||||
posterPath: z.string().startsWith("/").endsWith(".jpg").nullable(),
|
posterPath: z.string().startsWith("/").endsWith(".jpg").nullable(),
|
||||||
overview: z.string(),
|
overview: z.string(),
|
||||||
mediaInfo: searchMediaInfoSchema,
|
mediaInfo: z.object({}).optional(),
|
||||||
}),
|
}),
|
||||||
z.object({
|
z.object({
|
||||||
id: z.number(),
|
id: z.number(),
|
||||||
@@ -452,14 +381,14 @@ const searchSchema = z.object({
|
|||||||
title: z.string(),
|
title: z.string(),
|
||||||
posterPath: z.string().startsWith("/").endsWith(".jpg").nullable(),
|
posterPath: z.string().startsWith("/").endsWith(".jpg").nullable(),
|
||||||
overview: z.string(),
|
overview: z.string(),
|
||||||
mediaInfo: searchMediaInfoSchema,
|
mediaInfo: z.object({}).optional(),
|
||||||
}),
|
}),
|
||||||
z.object({
|
z.object({
|
||||||
id: z.number(),
|
id: z.number(),
|
||||||
mediaType: z.literal("person"),
|
mediaType: z.literal("person"),
|
||||||
name: z.string(),
|
name: z.string(),
|
||||||
profilePath: z.string().startsWith("/").endsWith(".jpg").nullable(),
|
profilePath: z.string().startsWith("/").endsWith(".jpg").nullable(),
|
||||||
mediaInfo: searchMediaInfoSchema,
|
mediaInfo: z.object({}).optional(),
|
||||||
}),
|
}),
|
||||||
]),
|
]),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { useMemo } from "react";
|
import { useMemo } from "react";
|
||||||
import { Badge, Button, Group, Image, LoadingOverlay, Stack, Text } from "@mantine/core";
|
import { Button, Group, Image, LoadingOverlay, Stack, Text } from "@mantine/core";
|
||||||
import type { MRT_ColumnDef, MRT_Row } from "mantine-react-table";
|
import type { MRT_ColumnDef } from "mantine-react-table";
|
||||||
import { MRT_Table } from "mantine-react-table";
|
import { MRT_Table } from "mantine-react-table";
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
@@ -16,13 +16,13 @@ interface RequestMediaModalProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const RequestMediaModal = createModal<RequestMediaModalProps>(({ actions, innerProps }) => {
|
export const RequestMediaModal = createModal<RequestMediaModalProps>(({ actions, innerProps }) => {
|
||||||
const { data, isPending: isPendingQuery } = clientApi.integration.getMediaRequestOptions.useQuery({
|
const { data, isPending: isPendingQuery } = clientApi.searchEngine.getMediaRequestOptions.useQuery({
|
||||||
integrationId: innerProps.integrationId,
|
integrationId: innerProps.integrationId,
|
||||||
mediaId: innerProps.mediaId,
|
mediaId: innerProps.mediaId,
|
||||||
mediaType: innerProps.mediaType,
|
mediaType: innerProps.mediaType,
|
||||||
});
|
});
|
||||||
|
|
||||||
const { mutate, isPending: isPendingMutation } = clientApi.integration.requestMedia.useMutation({
|
const { mutate, isPending: isPendingMutation } = clientApi.searchEngine.requestMedia.useMutation({
|
||||||
onSuccess() {
|
onSuccess() {
|
||||||
actions.closeModal();
|
actions.closeModal();
|
||||||
showSuccessNotification({
|
showSuccessNotification({
|
||||||
@@ -33,7 +33,6 @@ export const RequestMediaModal = createModal<RequestMediaModalProps>(({ actions,
|
|||||||
|
|
||||||
const isPending = isPendingQuery || isPendingMutation;
|
const isPending = isPendingQuery || isPendingMutation;
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const requestedSeasons = new Set(data?.requestedSeasons ?? []);
|
|
||||||
|
|
||||||
const columns = useMemo<MRT_ColumnDef<Season>[]>(
|
const columns = useMemo<MRT_ColumnDef<Season>[]>(
|
||||||
() => [
|
() => [
|
||||||
@@ -45,18 +44,8 @@ export const RequestMediaModal = createModal<RequestMediaModalProps>(({ actions,
|
|||||||
accessorKey: "episodeCount",
|
accessorKey: "episodeCount",
|
||||||
header: t("search.engine.media.request.modal.table.header.episodes"),
|
header: t("search.engine.media.request.modal.table.header.episodes"),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
id: "status",
|
|
||||||
header: t("search.engine.media.request.modal.table.header.status"),
|
|
||||||
Cell: ({ row }) =>
|
|
||||||
requestedSeasons.has(row.original.seasonNumber) ? (
|
|
||||||
<Badge size="xs" color="violet" variant="light">
|
|
||||||
{t("search.engine.media.request.modal.table.status.requested")}
|
|
||||||
</Badge>
|
|
||||||
) : null,
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
[data?.requestedSeasons],
|
[],
|
||||||
);
|
);
|
||||||
|
|
||||||
const table = useTranslatedMantineReactTable({
|
const table = useTranslatedMantineReactTable({
|
||||||
@@ -67,7 +56,7 @@ export const RequestMediaModal = createModal<RequestMediaModalProps>(({ actions,
|
|||||||
enablePagination: false,
|
enablePagination: false,
|
||||||
enableSorting: false,
|
enableSorting: false,
|
||||||
enableSelectAll: true,
|
enableSelectAll: true,
|
||||||
enableRowSelection: (row: MRT_Row<Season>) => !requestedSeasons.has(row.original.seasonNumber),
|
enableRowSelection: true,
|
||||||
mantineTableProps: {
|
mantineTableProps: {
|
||||||
highlightOnHover: false,
|
highlightOnHover: false,
|
||||||
striped: "odd",
|
striped: "odd",
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import type { Duration } from "dayjs/plugin/duration";
|
import type { Duration } from "dayjs/plugin/duration";
|
||||||
|
|
||||||
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import type { createChannelWithLatestAndEvents } from "@homarr/redis";
|
import type { createChannelWithLatestAndEvents } from "@homarr/redis";
|
||||||
|
|
||||||
@@ -16,7 +15,6 @@ interface Options<TData, TInput extends Record<string, unknown>> {
|
|||||||
options: Options<TData, TInput>,
|
options: Options<TData, TInput>,
|
||||||
) => ReturnType<typeof createChannelWithLatestAndEvents<TData>>;
|
) => ReturnType<typeof createChannelWithLatestAndEvents<TData>>;
|
||||||
cacheDuration: Duration;
|
cacheDuration: Duration;
|
||||||
fallbackToStaleOnError?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createCachedRequestHandler = <TData, TInput extends Record<string, unknown>>(
|
export const createCachedRequestHandler = <TData, TInput extends Record<string, unknown>>(
|
||||||
@@ -28,33 +26,13 @@ export const createCachedRequestHandler = <TData, TInput extends Record<string,
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
async getCachedOrUpdatedDataAsync({ forceUpdate = false }) {
|
async getCachedOrUpdatedDataAsync({ forceUpdate = false }) {
|
||||||
const channelData = await channel.getAsync();
|
|
||||||
|
|
||||||
const requestNewDataAsync = async () => {
|
const requestNewDataAsync = async () => {
|
||||||
try {
|
const data = await options.requestAsync(input);
|
||||||
const data = await options.requestAsync(input);
|
await channel.publishAndUpdateLastStateAsync(data);
|
||||||
await channel.publishAndUpdateLastStateAsync(data);
|
return {
|
||||||
return {
|
data,
|
||||||
data,
|
timestamp: new Date(),
|
||||||
timestamp: new Date(),
|
};
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
if (options.fallbackToStaleOnError && channelData) {
|
|
||||||
logger.warn(
|
|
||||||
new ErrorWithMetadata(
|
|
||||||
"Cached request handler using stale cache after fetch failure",
|
|
||||||
{
|
|
||||||
channel: channel.name,
|
|
||||||
queryKey: options.queryKey,
|
|
||||||
},
|
|
||||||
{ cause: error },
|
|
||||||
),
|
|
||||||
);
|
|
||||||
return channelData;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (forceUpdate) {
|
if (forceUpdate) {
|
||||||
@@ -65,6 +43,8 @@ export const createCachedRequestHandler = <TData, TInput extends Record<string,
|
|||||||
return await requestNewDataAsync();
|
return await requestNewDataAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const channelData = await channel.getAsync();
|
||||||
|
|
||||||
const shouldRequestNewData =
|
const shouldRequestNewData =
|
||||||
!channelData ||
|
!channelData ||
|
||||||
dayjs().diff(channelData.timestamp, "milliseconds") > options.cacheDuration.asMilliseconds();
|
dayjs().diff(channelData.timestamp, "milliseconds") > options.cacheDuration.asMilliseconds();
|
||||||
|
|||||||
@@ -111,24 +111,6 @@ describe("getAvailableUpdatesAsync", () => {
|
|||||||
// Assert
|
// Assert
|
||||||
expect(result).toEqual([]);
|
expect(result).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("should propagate GitHub API auth errors without blocking callers", async () => {
|
|
||||||
const currentVersion = "v1.2.3";
|
|
||||||
const listReleasesSpy = vi.spyOn(new Octokit().rest.repos, "listReleases");
|
|
||||||
listReleasesSpy.mockRejectedValue(new Error("Bad credentials"));
|
|
||||||
|
|
||||||
await expect(getAvailableUpdatesAsync(currentVersion)).rejects.toThrow("Bad credentials");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("should propagate GitHub API quota exhausted errors without blocking callers", async () => {
|
|
||||||
const currentVersion = "v1.2.3";
|
|
||||||
const listReleasesSpy = vi.spyOn(new Octokit().rest.repos, "listReleases");
|
|
||||||
listReleasesSpy.mockRejectedValue(
|
|
||||||
new Error("Request quota exhausted for request GET /repos/{owner}/{repo}/releases"),
|
|
||||||
);
|
|
||||||
|
|
||||||
await expect(getAvailableUpdatesAsync(currentVersion)).rejects.toThrow("quota exhausted");
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const fakeReleases = (...inputs: [string, boolean][]) => inputs.map(fakeRelease);
|
const fakeReleases = (...inputs: [string, boolean][]) => inputs.map(fakeRelease);
|
||||||
|
|||||||
@@ -15,8 +15,7 @@ const logger = createLogger({ module: "updateCheckerRequestHandler" });
|
|||||||
|
|
||||||
export const updateCheckerRequestHandler = createCachedRequestHandler({
|
export const updateCheckerRequestHandler = createCachedRequestHandler({
|
||||||
queryKey: "homarr-update-checker",
|
queryKey: "homarr-update-checker",
|
||||||
cacheDuration: dayjs.duration(1, "day"),
|
cacheDuration: dayjs.duration(1, "hour"),
|
||||||
fallbackToStaleOnError: true,
|
|
||||||
async requestAsync(_) {
|
async requestAsync(_) {
|
||||||
return {
|
return {
|
||||||
availableUpdates: await getAvailableUpdatesAsync(packageJson.version),
|
availableUpdates: await getAvailableUpdatesAsync(packageJson.version),
|
||||||
@@ -59,7 +58,6 @@ export const getAvailableUpdatesAsync = async (currentVersion: string) => {
|
|||||||
request: {
|
request: {
|
||||||
fetch: fetchWithTrustedCertificatesAsync,
|
fetch: fetchWithTrustedCertificatesAsync,
|
||||||
},
|
},
|
||||||
throttle: { enabled: false },
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const isCurrentPrerelease = isPrereleaseTag(currentVersion);
|
const isCurrentPrerelease = isPrereleaseTag(currentVersion);
|
||||||
@@ -102,7 +100,7 @@ export const getAvailableUpdatesAsync = async (currentVersion: string) => {
|
|||||||
const availableUpdates = semanticReleases
|
const availableUpdates = semanticReleases
|
||||||
.filter((release) => isCurrentPrerelease || !release.isPrerelease)
|
.filter((release) => isCurrentPrerelease || !release.isPrerelease)
|
||||||
.filter((release) => compareSemVer(release.tagName, currentVersion) > 0)
|
.filter((release) => compareSemVer(release.tagName, currentVersion) > 0)
|
||||||
.toSorted((releaseA, releaseB) => compareSemVer(releaseB.tagName, releaseA.tagName));
|
.sort((releaseA, releaseB) => compareSemVer(releaseB.tagName, releaseA.tagName));
|
||||||
|
|
||||||
if (availableUpdates.length === 0) {
|
if (availableUpdates.length === 0) {
|
||||||
logger.debug("No available updates found", { currentVersion });
|
logger.debug("No available updates found", { currentVersion });
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -44,9 +44,6 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>
|
|||||||
setQuery(interaction.query);
|
setQuery(interaction.query);
|
||||||
setTimeout(() => selectAction(0, spotlightStore));
|
setTimeout(() => selectAction(0, spotlightStore));
|
||||||
} else if (interaction.type === "mode") {
|
} else if (interaction.type === "mode") {
|
||||||
if (interaction.query !== undefined) {
|
|
||||||
setQuery(interaction.query);
|
|
||||||
}
|
|
||||||
setMode(interaction.mode);
|
setMode(interaction.mode);
|
||||||
} else if (interaction.type === "children") {
|
} else if (interaction.type === "children") {
|
||||||
setChildrenOptions(interaction);
|
setChildrenOptions(interaction);
|
||||||
|
|||||||
@@ -1,28 +1,20 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import type { Dispatch, SetStateAction } from "react";
|
import type { Dispatch, SetStateAction } from "react";
|
||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
import { useMemo, useRef, useState } from "react";
|
||||||
import { ActionIcon, Center, Group, Kbd } from "@mantine/core";
|
import { ActionIcon, Center, Group, Kbd } from "@mantine/core";
|
||||||
import { Spotlight as MantineSpotlight } from "@mantine/spotlight";
|
import { Spotlight as MantineSpotlight } from "@mantine/spotlight";
|
||||||
import { IconSearch, IconX } from "@tabler/icons-react";
|
import { IconSearch, IconX } from "@tabler/icons-react";
|
||||||
import { useSetAtom } from "jotai";
|
|
||||||
|
|
||||||
import { hotkeys } from "@homarr/definitions";
|
import { hotkeys } from "@homarr/definitions";
|
||||||
import type { TranslationObject } from "@homarr/translation";
|
import type { TranslationObject } from "@homarr/translation";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
import type { OpenMediaRequestSearchOptions } from "../index";
|
|
||||||
import type { inferSearchInteractionOptions } from "../lib/interaction";
|
import type { inferSearchInteractionOptions } from "../lib/interaction";
|
||||||
import type { SearchMode } from "../lib/mode";
|
import type { SearchMode } from "../lib/mode";
|
||||||
import { searchModes } from "../modes";
|
import { searchModes } from "../modes";
|
||||||
import { useHomeEmptyGroups } from "../modes/help/home-empty-groups";
|
import { useHomeEmptyGroups } from "../modes/help/home-empty-groups";
|
||||||
import {
|
import { selectAction, spotlightStore } from "../spotlight-store";
|
||||||
mediaRequestSearchEvent,
|
|
||||||
mediaRequestSearchScopeAtom,
|
|
||||||
selectAction,
|
|
||||||
spotlightActions,
|
|
||||||
spotlightStore,
|
|
||||||
} from "../spotlight-store";
|
|
||||||
import { SpotlightChildrenActions } from "./actions/children-actions";
|
import { SpotlightChildrenActions } from "./actions/children-actions";
|
||||||
import { SpotlightActionGroups } from "./actions/groups/action-group";
|
import { SpotlightActionGroups } from "./actions/groups/action-group";
|
||||||
|
|
||||||
@@ -57,35 +49,10 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
|||||||
const [childrenOptions, setChildrenOptions] = useState<inferSearchInteractionOptions<"children"> | null>(null);
|
const [childrenOptions, setChildrenOptions] = useState<inferSearchInteractionOptions<"children"> | null>(null);
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const inputRef = useRef<HTMLInputElement>(null);
|
const inputRef = useRef<HTMLInputElement>(null);
|
||||||
const setMediaRequestSearchScope = useSetAtom(mediaRequestSearchScopeAtom);
|
|
||||||
// Works as always the same amount of hooks are executed
|
// Works as always the same amount of hooks are executed
|
||||||
const useGroups = "groups" in activeMode ? () => activeMode.groups : activeMode.useGroups;
|
const useGroups = "groups" in activeMode ? () => activeMode.groups : activeMode.useGroups;
|
||||||
const groups = useGroups();
|
const groups = useGroups();
|
||||||
const homeEmptyGroups = useHomeEmptyGroups();
|
const homeEmptyGroups = useHomeEmptyGroups();
|
||||||
const hasModeCharacter = activeMode.modeKey !== defaultMode && activeMode.character !== undefined;
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const handleMediaRequestSearch = (event: Event) => {
|
|
||||||
const { integrationIds, query } = (event as CustomEvent<OpenMediaRequestSearchOptions>).detail ?? {};
|
|
||||||
setMediaRequestSearchScope({ integrationIds });
|
|
||||||
setMode("media");
|
|
||||||
setChildrenOptions(null);
|
|
||||||
setQuery(query ?? "");
|
|
||||||
spotlightActions.open();
|
|
||||||
setTimeout(() => selectAction(0, spotlightStore));
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
|
|
||||||
};
|
|
||||||
}, [setMediaRequestSearchScope, setMode, setQuery]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (mode !== "media") {
|
|
||||||
setMediaRequestSearchScope({});
|
|
||||||
}
|
|
||||||
}, [mode, setMediaRequestSearchScope]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MantineSpotlight.Root
|
<MantineSpotlight.Root
|
||||||
@@ -120,13 +87,13 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
|||||||
<MantineSpotlight.Search
|
<MantineSpotlight.Search
|
||||||
placeholder={`${t("search.placeholder")}...`}
|
placeholder={`${t("search.placeholder")}...`}
|
||||||
ref={inputRef}
|
ref={inputRef}
|
||||||
leftSectionWidth={hasModeCharacter ? 80 : 48}
|
leftSectionWidth={activeMode.modeKey !== defaultMode ? 80 : 48}
|
||||||
leftSection={
|
leftSection={
|
||||||
<Group align="center" wrap="nowrap" gap="xs" w="100%" h="100%">
|
<Group align="center" wrap="nowrap" gap="xs" w="100%" h="100%">
|
||||||
<Center w={48} h="100%">
|
<Center w={48} h="100%">
|
||||||
<IconSearch stroke={1.5} />
|
<IconSearch stroke={1.5} />
|
||||||
</Center>
|
</Center>
|
||||||
{hasModeCharacter ? <Kbd size="sm">{activeMode.character}</Kbd> : null}
|
{activeMode.modeKey !== defaultMode ? <Kbd size="sm">{activeMode.character}</Kbd> : null}
|
||||||
</Group>
|
</Group>
|
||||||
}
|
}
|
||||||
styles={{
|
styles={{
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { mediaRequestSearchEvent, spotlightActions } from "./spotlight-store";
|
import { spotlightActions } from "./spotlight-store";
|
||||||
|
|
||||||
export { Spotlight } from "./components/spotlight";
|
export { Spotlight } from "./components/spotlight";
|
||||||
export { openSpotlight, openMediaRequestSearch };
|
export { openSpotlight };
|
||||||
export {
|
export {
|
||||||
SpotlightProvider,
|
SpotlightProvider,
|
||||||
useRegisterSpotlightContextResults,
|
useRegisterSpotlightContextResults,
|
||||||
@@ -11,18 +11,3 @@ export {
|
|||||||
} from "./modes/home/context";
|
} from "./modes/home/context";
|
||||||
|
|
||||||
const openSpotlight = spotlightActions.open;
|
const openSpotlight = spotlightActions.open;
|
||||||
|
|
||||||
export interface OpenMediaRequestSearchOptions {
|
|
||||||
integrationIds?: string[];
|
|
||||||
query?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
const openMediaRequestSearch = (options: OpenMediaRequestSearchOptions = {}) => {
|
|
||||||
if (typeof window !== "undefined") {
|
|
||||||
window.dispatchEvent(new CustomEvent<OpenMediaRequestSearchOptions>(mediaRequestSearchEvent, { detail: options }));
|
|
||||||
}
|
|
||||||
|
|
||||||
spotlightActions.open();
|
|
||||||
};
|
|
||||||
|
|
||||||
export { mediaRequestSearchEvent };
|
|
||||||
@@ -12,7 +12,7 @@ const searchInteractions = [
|
|||||||
createSearchInteraction("link").optionsType<{ href: string; newTab?: boolean }>(),
|
createSearchInteraction("link").optionsType<{ href: string; newTab?: boolean }>(),
|
||||||
createSearchInteraction("javaScript").optionsType<{ onSelect: () => MaybePromise<void> }>(),
|
createSearchInteraction("javaScript").optionsType<{ onSelect: () => MaybePromise<void> }>(),
|
||||||
createSearchInteraction("setQuery").optionsType<{ query: string }>(),
|
createSearchInteraction("setQuery").optionsType<{ query: string }>(),
|
||||||
createSearchInteraction("mode").optionsType<{ mode: keyof TranslationObject["search"]["mode"]; query?: string }>(),
|
createSearchInteraction("mode").optionsType<{ mode: keyof TranslationObject["search"]["mode"] }>(),
|
||||||
createSearchInteraction("children").optionsType<{
|
createSearchInteraction("children").optionsType<{
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
useActions: CreateChildrenOptionsProps<any>["useActions"];
|
useActions: CreateChildrenOptionsProps<any>["useActions"];
|
||||||
|
|||||||
@@ -64,36 +64,6 @@ type MediaRequestChildrenProps = {
|
|||||||
kind: IntegrationKind;
|
kind: IntegrationKind;
|
||||||
url: string;
|
url: string;
|
||||||
id: string;
|
id: string;
|
||||||
permissions?: {
|
|
||||||
hasInteractAccess: boolean;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useMediaRequestSearchInteraction = (
|
|
||||||
integration: MediaRequestChildrenProps["integration"],
|
|
||||||
searchResult: FromIntegrationSearchResult,
|
|
||||||
): inferSearchInteractionDefinition<"link" | "children"> => {
|
|
||||||
const { openSearchInNewTab } = useSettings();
|
|
||||||
|
|
||||||
const type = searchResult.type;
|
|
||||||
if (type === "person") {
|
|
||||||
return {
|
|
||||||
type: "link",
|
|
||||||
href: searchResult.link,
|
|
||||||
newTab: openSearchInNewTab,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
type: "children",
|
|
||||||
...mediaRequestsChildrenOptions({
|
|
||||||
result: {
|
|
||||||
...searchResult,
|
|
||||||
type,
|
|
||||||
},
|
|
||||||
integration,
|
|
||||||
}),
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -101,6 +71,8 @@ export const useFromIntegrationSearchInteraction = (
|
|||||||
searchEngine: SearchEngine,
|
searchEngine: SearchEngine,
|
||||||
searchResult: FromIntegrationSearchResult,
|
searchResult: FromIntegrationSearchResult,
|
||||||
): inferSearchInteractionDefinition<"link" | "javaScript" | "children"> => {
|
): inferSearchInteractionDefinition<"link" | "javaScript" | "children"> => {
|
||||||
|
const { openSearchInNewTab } = useSettings();
|
||||||
|
|
||||||
if (searchEngine.type !== "fromIntegration") {
|
if (searchEngine.type !== "fromIntegration") {
|
||||||
throw new Error("Invalid search engine type");
|
throw new Error("Invalid search engine type");
|
||||||
}
|
}
|
||||||
@@ -115,7 +87,25 @@ export const useFromIntegrationSearchInteraction = (
|
|||||||
) &&
|
) &&
|
||||||
"type" in searchResult
|
"type" in searchResult
|
||||||
) {
|
) {
|
||||||
return useMediaRequestSearchInteraction(searchEngine.integration, searchResult);
|
const type = searchResult.type;
|
||||||
|
if (type === "person") {
|
||||||
|
return {
|
||||||
|
type: "link",
|
||||||
|
href: searchResult.link,
|
||||||
|
newTab: openSearchInNewTab,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
type: "children",
|
||||||
|
...mediaRequestsChildrenOptions({
|
||||||
|
result: {
|
||||||
|
...searchResult,
|
||||||
|
type,
|
||||||
|
},
|
||||||
|
integration: searchEngine.integration,
|
||||||
|
}),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -125,15 +115,13 @@ export const useFromIntegrationSearchInteraction = (
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const mediaRequestsChildrenOptions = createChildrenOptions<MediaRequestChildrenProps>({
|
const mediaRequestsChildrenOptions = createChildrenOptions<MediaRequestChildrenProps>({
|
||||||
useActions() {
|
useActions() {
|
||||||
const { openModal } = useModalAction(RequestMediaModal);
|
const { openModal } = useModalAction(RequestMediaModal);
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
key: "request",
|
key: "request",
|
||||||
hide: (option) =>
|
hide: (option) => option.result.inLibrary,
|
||||||
(option.result.type === "movie" && option.result.inLibrary) ||
|
|
||||||
option.integration.permissions?.hasInteractAccess === false,
|
|
||||||
Component(option) {
|
Component(option) {
|
||||||
const t = useScopedI18n("search.mode.media");
|
const t = useScopedI18n("search.mode.media");
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import type { SearchMode } from "../../lib/mode";
|
|||||||
import { appIntegrationBoardMode } from "../app-integration-board";
|
import { appIntegrationBoardMode } from "../app-integration-board";
|
||||||
import { commandMode } from "../command";
|
import { commandMode } from "../command";
|
||||||
import { externalMode } from "../external";
|
import { externalMode } from "../external";
|
||||||
import { mediaMode } from "../media";
|
|
||||||
import { pageMode } from "../page";
|
import { pageMode } from "../page";
|
||||||
import { userGroupMode } from "../user-group";
|
import { userGroupMode } from "../user-group";
|
||||||
|
|
||||||
@@ -34,7 +33,7 @@ type QuickLinkOption = {
|
|||||||
export const useHomeEmptyGroups = () => {
|
export const useHomeEmptyGroups = () => {
|
||||||
const { data: session } = useSession();
|
const { data: session } = useSession();
|
||||||
const tPages = useScopedI18n("search.mode.page.group.page.option");
|
const tPages = useScopedI18n("search.mode.page.group.page.option");
|
||||||
const visibleSearchModes: SearchMode[] = [appIntegrationBoardMode, externalMode, mediaMode, commandMode, pageMode];
|
const visibleSearchModes: SearchMode[] = [appIntegrationBoardMode, externalMode, commandMode, pageMode];
|
||||||
|
|
||||||
if (session?.user.permissions.includes("admin")) {
|
if (session?.user.permissions.includes("admin")) {
|
||||||
visibleSearchModes.unshift(userGroupMode);
|
visibleSearchModes.unshift(userGroupMode);
|
||||||
@@ -88,7 +87,7 @@ export const useHomeEmptyGroups = () => {
|
|||||||
useInteraction: interaction.link(({ path }) => ({ href: path })),
|
useInteraction: interaction.link(({ path }) => ({ href: path })),
|
||||||
}),
|
}),
|
||||||
createGroup({
|
createGroup({
|
||||||
keyPath: "modeKey",
|
keyPath: "character",
|
||||||
title: (t) => t("search.mode.help.group.mode.title"),
|
title: (t) => t("search.mode.help.group.mode.title"),
|
||||||
options: visibleSearchModes.map(({ character, modeKey }) => ({ character, modeKey })),
|
options: visibleSearchModes.map(({ character, modeKey }) => ({ character, modeKey })),
|
||||||
Component: ({ modeKey, character }) => {
|
Component: ({ modeKey, character }) => {
|
||||||
@@ -97,7 +96,7 @@ export const useHomeEmptyGroups = () => {
|
|||||||
return (
|
return (
|
||||||
<Group px="md" py="xs" w="100%" wrap="nowrap" align="center" justify="space-between">
|
<Group px="md" py="xs" w="100%" wrap="nowrap" align="center" justify="space-between">
|
||||||
<Text>{t("help")}</Text>
|
<Text>{t("help")}</Text>
|
||||||
{character && <Kbd size="sm">{character}</Kbd>}
|
<Kbd size="sm">{character}</Kbd>
|
||||||
</Group>
|
</Group>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ type GroupItem = {
|
|||||||
name: string;
|
name: string;
|
||||||
description?: string;
|
description?: string;
|
||||||
icon: TablerIcon | string;
|
icon: TablerIcon | string;
|
||||||
disabled?: boolean;
|
|
||||||
useInteraction: (query: string) => inferSearchInteractionDefinition<SearchInteraction>;
|
useInteraction: (query: string) => inferSearchInteractionDefinition<SearchInteraction>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -38,7 +37,7 @@ export const homeSearchEngineGroup = createGroup<GroupItem>({
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Group w="100%" wrap="nowrap" align="center" px="md" py="xs" opacity={item.disabled ? 0.55 : 1}>
|
<Group w="100%" wrap="nowrap" align="center" px="md" py="xs">
|
||||||
{icon}
|
{icon}
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Text>{item.name}</Text>
|
<Text>{item.name}</Text>
|
||||||
@@ -92,7 +91,9 @@ const createDefaultSearchEntries = (
|
|||||||
query: string,
|
query: string,
|
||||||
t: TranslationFunction,
|
t: TranslationFunction,
|
||||||
): GroupItem[] => {
|
): GroupItem[] => {
|
||||||
if (!session?.user && !defaultSearchEngine) return [];
|
if (!session?.user && !defaultSearchEngine) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
if (!defaultSearchEngine) {
|
if (!defaultSearchEngine) {
|
||||||
return [
|
return [
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { appIntegrationBoardMode } from "./app-integration-board";
|
|||||||
import { commandMode } from "./command";
|
import { commandMode } from "./command";
|
||||||
import { externalMode } from "./external";
|
import { externalMode } from "./external";
|
||||||
import { homeMode } from "./home";
|
import { homeMode } from "./home";
|
||||||
import { mediaMode } from "./media";
|
|
||||||
import { pageMode } from "./page";
|
import { pageMode } from "./page";
|
||||||
import { userGroupMode } from "./user-group";
|
import { userGroupMode } from "./user-group";
|
||||||
|
|
||||||
@@ -12,6 +11,5 @@ export const searchModes = [
|
|||||||
externalMode,
|
externalMode,
|
||||||
commandMode,
|
commandMode,
|
||||||
pageMode,
|
pageMode,
|
||||||
mediaMode,
|
|
||||||
homeMode,
|
homeMode,
|
||||||
] as const;
|
] as const;
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import type { SearchMode } from "../../lib/mode";
|
|
||||||
import { mediaRequestSearchGroup } from "./media-request-search-group";
|
|
||||||
|
|
||||||
export const mediaMode = {
|
|
||||||
modeKey: "media",
|
|
||||||
character: undefined,
|
|
||||||
groups: [mediaRequestSearchGroup],
|
|
||||||
} satisfies SearchMode;
|
|
||||||
@@ -1,172 +0,0 @@
|
|||||||
import { Badge, Group, Image, Stack, Text } from "@mantine/core";
|
|
||||||
import { useDebouncedValue } from "@mantine/hooks";
|
|
||||||
import { IconMovie, IconSearch } from "@tabler/icons-react";
|
|
||||||
import { keepPreviousData } from "@tanstack/react-query";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { getIntegrationName } from "@homarr/definitions";
|
|
||||||
import type { MediaAvailability } from "@homarr/integrations/types";
|
|
||||||
import { mediaAvailabilityConfiguration } from "@homarr/integrations/types";
|
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
|
||||||
|
|
||||||
import { createGroup } from "../../lib/group";
|
|
||||||
import { mediaRequestSearchScopeAtom } from "../../spotlight-store";
|
|
||||||
import { useMediaRequestSearchInteraction } from "../external/search-engines-search-group";
|
|
||||||
|
|
||||||
const availabilityLabels: Partial<Record<MediaAvailability, string>> = {
|
|
||||||
available: "Available",
|
|
||||||
partiallyAvailable: "Partial",
|
|
||||||
processing: "Processing",
|
|
||||||
requested: "Requested",
|
|
||||||
pending: "Requested",
|
|
||||||
};
|
|
||||||
|
|
||||||
type MediaRequestSearchResult = RouterOutputs["integration"]["searchMediaRequests"][number];
|
|
||||||
|
|
||||||
type MediaRequestSearchOption =
|
|
||||||
| {
|
|
||||||
key: string;
|
|
||||||
kind: "disabled" | "hint";
|
|
||||||
label: string;
|
|
||||||
description: string;
|
|
||||||
}
|
|
||||||
| {
|
|
||||||
key: string;
|
|
||||||
kind: "result";
|
|
||||||
result: MediaRequestSearchResult;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const mediaRequestSearchGroup = createGroup<MediaRequestSearchOption>({
|
|
||||||
keyPath: "key",
|
|
||||||
title: (t) => t("search.mode.media.group.title"),
|
|
||||||
Component(option) {
|
|
||||||
if (option.kind !== "result") {
|
|
||||||
return (
|
|
||||||
<Group w="100%" wrap="nowrap" align="center" px="md" py="xs" opacity={option.kind === "disabled" ? 0.55 : 1}>
|
|
||||||
{option.kind === "disabled" ? <IconMovie stroke={1.5} /> : <IconSearch stroke={1.5} />}
|
|
||||||
<Stack gap={0}>
|
|
||||||
<Text size="sm">{option.label}</Text>
|
|
||||||
<Text size="xs" c="gray.6">
|
|
||||||
{option.description}
|
|
||||||
</Text>
|
|
||||||
</Stack>
|
|
||||||
</Group>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const { result } = option;
|
|
||||||
const badgeLabel = result.availability ? availabilityLabels[result.availability as MediaAvailability] : undefined;
|
|
||||||
const badgeColor = result.availability
|
|
||||||
? mediaAvailabilityConfiguration[result.availability as MediaAvailability]?.color
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Group w="100%" wrap="nowrap" align="center" px="md" py="xs">
|
|
||||||
{result.image ? (
|
|
||||||
<Image src={result.image} w={35} h={50} fit="cover" radius="md" />
|
|
||||||
) : (
|
|
||||||
<IconSearch stroke={1.5} size={35} />
|
|
||||||
)}
|
|
||||||
<Stack gap={2} style={{ flex: 1 }}>
|
|
||||||
<Group gap="xs" wrap="nowrap">
|
|
||||||
<Text>{result.name}</Text>
|
|
||||||
{badgeLabel && (
|
|
||||||
<Badge size="xs" color={badgeColor} variant="light">
|
|
||||||
{badgeLabel}
|
|
||||||
</Badge>
|
|
||||||
)}
|
|
||||||
</Group>
|
|
||||||
<Text c="dimmed" size="sm" lineClamp={2}>
|
|
||||||
{result.text ?? getIntegrationName(result.integration.kind)}
|
|
||||||
</Text>
|
|
||||||
</Stack>
|
|
||||||
</Group>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
useInteraction(option) {
|
|
||||||
if (option.kind !== "result") {
|
|
||||||
return {
|
|
||||||
type: "none",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return useMediaRequestSearchInteraction(option.result.integration, option.result);
|
|
||||||
},
|
|
||||||
useQueryOptions(query) {
|
|
||||||
const tMedia = useScopedI18n("search.mode.media");
|
|
||||||
const scope = useAtomValue(mediaRequestSearchScopeAtom);
|
|
||||||
const [debouncedQuery] = useDebouncedValue(query.trim(), 150);
|
|
||||||
const targetsQuery = clientApi.integration.mediaRequestSearchTargets.useQuery();
|
|
||||||
|
|
||||||
const scopedTargets = (targetsQuery.data ?? []).filter((target) =>
|
|
||||||
scope.integrationIds ? scope.integrationIds.includes(target.id) : true,
|
|
||||||
);
|
|
||||||
const hasScopedTargets = scopedTargets.length > 0;
|
|
||||||
const shouldSearch = debouncedQuery.length > 0 && hasScopedTargets;
|
|
||||||
const integrationIds = scope.integrationIds ? scopedTargets.map((target) => target.id) : undefined;
|
|
||||||
|
|
||||||
const resultsQuery = clientApi.integration.searchMediaRequests.useQuery(
|
|
||||||
{ query: debouncedQuery, integrationIds },
|
|
||||||
{
|
|
||||||
enabled: shouldSearch,
|
|
||||||
placeholderData: keepPreviousData,
|
|
||||||
select: (data) => data.slice(0, 10),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
const isLoading = targetsQuery.isLoading || (shouldSearch && resultsQuery.isLoading);
|
|
||||||
const isError = targetsQuery.isError || (shouldSearch && resultsQuery.isError);
|
|
||||||
|
|
||||||
if (!targetsQuery.data) {
|
|
||||||
return {
|
|
||||||
isLoading,
|
|
||||||
isError,
|
|
||||||
data: [],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!hasScopedTargets) {
|
|
||||||
return {
|
|
||||||
isLoading,
|
|
||||||
isError,
|
|
||||||
data: [
|
|
||||||
{
|
|
||||||
key: "disabled",
|
|
||||||
kind: "disabled",
|
|
||||||
label: tMedia("action.search.label"),
|
|
||||||
description: scope.integrationIds
|
|
||||||
? tMedia("action.search.disabled.scoped")
|
|
||||||
: tMedia("action.search.disabled.noIntegration"),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (debouncedQuery.length === 0) {
|
|
||||||
return {
|
|
||||||
isLoading,
|
|
||||||
isError,
|
|
||||||
data: [
|
|
||||||
{
|
|
||||||
key: "hint",
|
|
||||||
kind: "hint",
|
|
||||||
label: tMedia("action.search.label"),
|
|
||||||
description: tMedia("action.search.description"),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
isLoading,
|
|
||||||
isError,
|
|
||||||
data: (resultsQuery.data ?? []).map((result) => ({
|
|
||||||
key: `result-${result.integration.id}-${result.type}-${result.id}`,
|
|
||||||
kind: "result",
|
|
||||||
result,
|
|
||||||
})),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
|
||||||
@@ -3,17 +3,9 @@
|
|||||||
import { clamp } from "@mantine/hooks";
|
import { clamp } from "@mantine/hooks";
|
||||||
import type { SpotlightStore } from "@mantine/spotlight";
|
import type { SpotlightStore } from "@mantine/spotlight";
|
||||||
import { createSpotlight } from "@mantine/spotlight";
|
import { createSpotlight } from "@mantine/spotlight";
|
||||||
import { atom } from "jotai";
|
|
||||||
|
|
||||||
export const [spotlightStore, spotlightActions] = createSpotlight();
|
export const [spotlightStore, spotlightActions] = createSpotlight();
|
||||||
|
|
||||||
export interface MediaRequestSearchScope {
|
|
||||||
integrationIds?: string[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export const mediaRequestSearchScopeAtom = atom<MediaRequestSearchScope>({});
|
|
||||||
export const mediaRequestSearchEvent = "homarr:spotlight:media-request-search";
|
|
||||||
|
|
||||||
export const setSelectedAction = (index: number, store: SpotlightStore) => {
|
export const setSelectedAction = (index: number, store: SpotlightStore) => {
|
||||||
store.updateState((state) => ({ ...state, selected: index }));
|
store.updateState((state) => ({ ...state, selected: index }));
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf .turbo node_modules",
|
"clean": "rm -rf .turbo node_modules",
|
||||||
"format": "oxfmt .",
|
"format": "oxfmt --check .",
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "",
|
"tryAgain": "",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "",
|
"changePosition": ""
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "打开媒体"
|
"label": "打开媒体"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "查阅文档",
|
"checkoutDocs": "查阅文档",
|
||||||
"checkLogs": "检查日志获取更多详情",
|
"checkLogs": "检查日志获取更多详情",
|
||||||
"tryAgain": "重试",
|
"tryAgain": "重试",
|
||||||
"loading": "正在加载",
|
"loading": "正在加载"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "这里",
|
"here": "这里",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "新建分类",
|
"create": "新建分类",
|
||||||
"changePosition": "换位",
|
"changePosition": "换位"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "此面板是公开的",
|
"public": "此面板是公开的",
|
||||||
"private": "此面板是私有的"
|
"private": "此面板是私有的"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "crwdns2680:0crwdne2680:0"
|
"label": "crwdns2680:0crwdne2680:0"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": "crwdns4251:0crwdne4251:0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "crwdns546:0crwdne546:0",
|
"checkoutDocs": "crwdns546:0crwdne546:0",
|
||||||
"checkLogs": "crwdns2260:0crwdne2260:0",
|
"checkLogs": "crwdns2260:0crwdne2260:0",
|
||||||
"tryAgain": "crwdns548:0crwdne548:0",
|
"tryAgain": "crwdns548:0crwdne548:0",
|
||||||
"loading": "crwdns550:0crwdne550:0",
|
"loading": "crwdns550:0crwdne550:0"
|
||||||
"show": "crwdns4255:0crwdne4255:0",
|
|
||||||
"hide": "crwdns4257:0crwdne4257:0"
|
|
||||||
},
|
},
|
||||||
"here": "crwdns552:0crwdne552:0",
|
"here": "crwdns552:0crwdne552:0",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "crwdns686:0crwdne686:0",
|
"create": "crwdns686:0crwdne686:0",
|
||||||
"changePosition": "crwdns688:0crwdne688:0",
|
"changePosition": "crwdns688:0crwdne688:0"
|
||||||
"settings": "crwdns4259:0crwdne4259:0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "crwdns1656:0crwdne1656:0",
|
"public": "crwdns1656:0crwdne1656:0",
|
||||||
"private": "crwdns1658:0crwdne1658:0"
|
"private": "crwdns1658:0crwdne1658:0"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": "crwdns4253:0crwdne4253:0"
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Přečtěte si dokumentaci",
|
"checkoutDocs": "Přečtěte si dokumentaci",
|
||||||
"checkLogs": "Pro více podrobností zkontrolujte logy",
|
"checkLogs": "Pro více podrobností zkontrolujte logy",
|
||||||
"tryAgain": "Zkusit znovu",
|
"tryAgain": "Zkusit znovu",
|
||||||
"loading": "Načítání",
|
"loading": "Načítání"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "zde",
|
"here": "zde",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Nová kategorie",
|
"create": "Nová kategorie",
|
||||||
"changePosition": "Změnit pozici",
|
"changePosition": "Změnit pozici"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Åben medie"
|
"label": "Åben medie"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Tjek dokumentationen",
|
"checkoutDocs": "Tjek dokumentationen",
|
||||||
"checkLogs": "Tjek logs for flere detaljer",
|
"checkLogs": "Tjek logs for flere detaljer",
|
||||||
"tryAgain": "Prøv igen",
|
"tryAgain": "Prøv igen",
|
||||||
"loading": "Indlæser",
|
"loading": "Indlæser"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "her",
|
"here": "her",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Ny kategori",
|
"create": "Ny kategori",
|
||||||
"changePosition": "Ændre placering",
|
"changePosition": "Ændre placering"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Denne tavle er offentlig",
|
"public": "Denne tavle er offentlig",
|
||||||
"private": "Denne tavle er privat"
|
"private": "Denne tavle er privat"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Medium öffnen"
|
"label": "Medium öffnen"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Die Dokumentation ansehen",
|
"checkoutDocs": "Die Dokumentation ansehen",
|
||||||
"checkLogs": "Logs für weitere Details prüfen",
|
"checkLogs": "Logs für weitere Details prüfen",
|
||||||
"tryAgain": "Erneut versuchen",
|
"tryAgain": "Erneut versuchen",
|
||||||
"loading": "Wird geladen",
|
"loading": "Wird geladen"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "Hier",
|
"here": "Hier",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Neue Kategorie",
|
"create": "Neue Kategorie",
|
||||||
"changePosition": "Position wechseln",
|
"changePosition": "Position wechseln"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Dieses Board ist öffentlich",
|
"public": "Dieses Board ist öffentlich",
|
||||||
"private": "Dieses Board ist privat"
|
"private": "Dieses Board ist privat"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Medium öffnen"
|
"label": "Medium öffnen"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Die Dokumentation ansehen",
|
"checkoutDocs": "Die Dokumentation ansehen",
|
||||||
"checkLogs": "Logs für weitere Details prüfen",
|
"checkLogs": "Logs für weitere Details prüfen",
|
||||||
"tryAgain": "Erneut versuchen",
|
"tryAgain": "Erneut versuchen",
|
||||||
"loading": "Wird geladen",
|
"loading": "Wird geladen"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "Hier",
|
"here": "Hier",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Neue Kategorie",
|
"create": "Neue Kategorie",
|
||||||
"changePosition": "Position wechseln",
|
"changePosition": "Position wechseln"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Dieses Board ist öffentlich",
|
"public": "Dieses Board ist öffentlich",
|
||||||
"private": "Dieses Board ist privat"
|
"private": "Dieses Board ist privat"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "Προσπαθήστε ξανά",
|
"tryAgain": "Προσπαθήστε ξανά",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "Αλλαγή θέσης",
|
"changePosition": "Αλλαγή θέσης"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Open media"
|
"label": "Open media"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Check the documentation",
|
"checkoutDocs": "Check the documentation",
|
||||||
"checkLogs": "Check logs for more information",
|
"checkLogs": "Check logs for more information",
|
||||||
"tryAgain": "Try again",
|
"tryAgain": "Try again",
|
||||||
"loading": "Loading",
|
"loading": "Loading"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "here",
|
"here": "here",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "New category",
|
"create": "New category",
|
||||||
"changePosition": "Change position",
|
"changePosition": "Change position"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
@@ -4551,23 +4542,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"media": {
|
"media": {
|
||||||
"help": "Search for movies or shows to request",
|
|
||||||
"requestMovie": "",
|
"requestMovie": "",
|
||||||
"requestSeries": "",
|
"requestSeries": "",
|
||||||
"openIn": "",
|
"openIn": ""
|
||||||
"group": {
|
|
||||||
"title": "Movies and shows"
|
|
||||||
},
|
|
||||||
"action": {
|
|
||||||
"search": {
|
|
||||||
"label": "Search for movies or shows",
|
|
||||||
"description": "Start typing to search your media request integrations",
|
|
||||||
"disabled": {
|
|
||||||
"noIntegration": "Add an Overseerr, Jellyseerr, or Seerr integration to enable media search.",
|
|
||||||
"scoped": "This widget does not have an accessible media request integration."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"external": {
|
"external": {
|
||||||
"help": "",
|
"help": "",
|
||||||
@@ -4843,11 +4820,7 @@
|
|||||||
"table": {
|
"table": {
|
||||||
"header": {
|
"header": {
|
||||||
"season": "Season",
|
"season": "Season",
|
||||||
"episodes": "Episodes",
|
"episodes": "Episodes"
|
||||||
"status": "Status"
|
|
||||||
},
|
|
||||||
"status": {
|
|
||||||
"requested": "Requested"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button": {
|
"button": {
|
||||||
|
|||||||
@@ -4551,23 +4551,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"media": {
|
"media": {
|
||||||
"help": "Search for movies or shows to request",
|
|
||||||
"requestMovie": "Request movie",
|
"requestMovie": "Request movie",
|
||||||
"requestSeries": "Request series",
|
"requestSeries": "Request series",
|
||||||
"openIn": "Open in {kind}",
|
"openIn": "Open in {kind}"
|
||||||
"group": {
|
|
||||||
"title": "Movies and shows"
|
|
||||||
},
|
|
||||||
"action": {
|
|
||||||
"search": {
|
|
||||||
"label": "Search for movies or shows",
|
|
||||||
"description": "Start typing to search your media request integrations",
|
|
||||||
"disabled": {
|
|
||||||
"noIntegration": "Add an Overseerr, Jellyseerr, or Seerr integration to enable media search.",
|
|
||||||
"scoped": "This widget does not have an accessible media request integration."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"external": {
|
"external": {
|
||||||
"help": "Use an external search engine",
|
"help": "Use an external search engine",
|
||||||
@@ -4843,11 +4829,7 @@
|
|||||||
"table": {
|
"table": {
|
||||||
"header": {
|
"header": {
|
||||||
"season": "Season",
|
"season": "Season",
|
||||||
"episodes": "Episodes",
|
"episodes": "Episodes"
|
||||||
"status": "Status"
|
|
||||||
},
|
|
||||||
"status": {
|
|
||||||
"requested": "Requested"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button": {
|
"button": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Abrir imagen"
|
"label": "Abrir imagen"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Consultar la documentación",
|
"checkoutDocs": "Consultar la documentación",
|
||||||
"checkLogs": "Comprueba los registros para más detalles",
|
"checkLogs": "Comprueba los registros para más detalles",
|
||||||
"tryAgain": "Intentar de nuevo",
|
"tryAgain": "Intentar de nuevo",
|
||||||
"loading": "Cargando",
|
"loading": "Cargando"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "aquí",
|
"here": "aquí",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Nueva Categoría",
|
"create": "Nueva Categoría",
|
||||||
"changePosition": "Cambiar posición",
|
"changePosition": "Cambiar posición"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Este tablero es público",
|
"public": "Este tablero es público",
|
||||||
"private": "Este tablero es privado"
|
"private": "Este tablero es privado"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "",
|
"tryAgain": "",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "",
|
"changePosition": ""
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Ouvrir le média"
|
"label": "Ouvrir le média"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Voir la documentation",
|
"checkoutDocs": "Voir la documentation",
|
||||||
"checkLogs": "Vérifiez les logs pour plus de détails",
|
"checkLogs": "Vérifiez les logs pour plus de détails",
|
||||||
"tryAgain": "Réessayer",
|
"tryAgain": "Réessayer",
|
||||||
"loading": "Chargement",
|
"loading": "Chargement"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "ici",
|
"here": "ici",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Nouvelle catégorie",
|
"create": "Nouvelle catégorie",
|
||||||
"changePosition": "Modifier la position",
|
"changePosition": "Modifier la position"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Ce tableau est public",
|
"public": "Ce tableau est public",
|
||||||
"private": "Ce tableau est privé"
|
"private": "Ce tableau est privé"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "פתיחת מדיה"
|
"label": "פתיחת מדיה"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "בדוק את התיעוד",
|
"checkoutDocs": "בדוק את התיעוד",
|
||||||
"checkLogs": "בדוק לוגים לפרטים נוספים",
|
"checkLogs": "בדוק לוגים לפרטים נוספים",
|
||||||
"tryAgain": "נא לנסות שוב",
|
"tryAgain": "נא לנסות שוב",
|
||||||
"loading": "טוען",
|
"loading": "טוען"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "כאן",
|
"here": "כאן",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "קטגוריה חדשה",
|
"create": "קטגוריה חדשה",
|
||||||
"changePosition": "שנה מיקום",
|
"changePosition": "שנה מיקום"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "הלוח הזה ציבורי",
|
"public": "הלוח הזה ציבורי",
|
||||||
"private": "הלוח הזה פרטי"
|
"private": "הלוח הזה פרטי"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "Pokušaj ponovno",
|
"tryAgain": "Pokušaj ponovno",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "Promijenjen položaj",
|
"changePosition": "Promijenjen položaj"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Média megnyitása"
|
"label": "Média megnyitása"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Tekintse meg a dokumentációt",
|
"checkoutDocs": "Tekintse meg a dokumentációt",
|
||||||
"checkLogs": "További részletekért ellenőrizze a naplókat",
|
"checkLogs": "További részletekért ellenőrizze a naplókat",
|
||||||
"tryAgain": "Próbálja újra",
|
"tryAgain": "Próbálja újra",
|
||||||
"loading": "Töltés",
|
"loading": "Töltés"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "itt",
|
"here": "itt",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Új kategória",
|
"create": "Új kategória",
|
||||||
"changePosition": "Pozíció módosítása",
|
"changePosition": "Pozíció módosítása"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Apri media"
|
"label": "Apri media"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Consulta la documentazione",
|
"checkoutDocs": "Consulta la documentazione",
|
||||||
"checkLogs": "Controlla i log per maggiori dettagli",
|
"checkLogs": "Controlla i log per maggiori dettagli",
|
||||||
"tryAgain": "Riprova",
|
"tryAgain": "Riprova",
|
||||||
"loading": "Caricamento",
|
"loading": "Caricamento"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "qui",
|
"here": "qui",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Nuova categoria",
|
"create": "Nuova categoria",
|
||||||
"changePosition": "Cambia posizione",
|
"changePosition": "Cambia posizione"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Questa board è pubblica",
|
"public": "Questa board è pubblica",
|
||||||
"private": "Questa board è privata"
|
"private": "Questa board è privata"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "メディアを開く"
|
"label": "メディアを開く"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "ドキュメントを確認する",
|
"checkoutDocs": "ドキュメントを確認する",
|
||||||
"checkLogs": "詳細はログを確認してください",
|
"checkLogs": "詳細はログを確認してください",
|
||||||
"tryAgain": "リトライ",
|
"tryAgain": "リトライ",
|
||||||
"loading": "読み込み中",
|
"loading": "読み込み中"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "こちら",
|
"here": "こちら",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "新しいカテゴリー",
|
"create": "新しいカテゴリー",
|
||||||
"changePosition": "ポジションを変更する",
|
"changePosition": "ポジションを変更する"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "このボードは公開中です",
|
"public": "このボードは公開中です",
|
||||||
"private": "このボードは非公開です"
|
"private": "このボードは非公開です"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "다시 시도",
|
"tryAgain": "다시 시도",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "위치 변경",
|
"changePosition": "위치 변경"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "",
|
"tryAgain": "",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "",
|
"changePosition": ""
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "Mēģiniet vēlreiz",
|
"tryAgain": "Mēģiniet vēlreiz",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "Mainīt pozīciju",
|
"changePosition": "Mainīt pozīciju"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Media openen"
|
"label": "Media openen"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "De documentatie bekijken",
|
"checkoutDocs": "De documentatie bekijken",
|
||||||
"checkLogs": "Controleer logs voor meer details",
|
"checkLogs": "Controleer logs voor meer details",
|
||||||
"tryAgain": "Probeer opnieuw",
|
"tryAgain": "Probeer opnieuw",
|
||||||
"loading": "Laden",
|
"loading": "Laden"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "hier",
|
"here": "hier",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Nieuwe categorie",
|
"create": "Nieuwe categorie",
|
||||||
"changePosition": "Positie wijzigen",
|
"changePosition": "Positie wijzigen"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Dit bord is openbaar",
|
"public": "Dit bord is openbaar",
|
||||||
"private": "Dit bord is privé"
|
"private": "Dit bord is privé"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Åpne medie"
|
"label": "Åpne medie"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Les dokumentasjonen",
|
"checkoutDocs": "Les dokumentasjonen",
|
||||||
"checkLogs": "Sjekk loggene for mer informasjon",
|
"checkLogs": "Sjekk loggene for mer informasjon",
|
||||||
"tryAgain": "Prøv igjen",
|
"tryAgain": "Prøv igjen",
|
||||||
"loading": "Laster",
|
"loading": "Laster"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "her",
|
"here": "her",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Ny kategori",
|
"create": "Ny kategori",
|
||||||
"changePosition": "Endre posisjon",
|
"changePosition": "Endre posisjon"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Denne tavlen er offentlig",
|
"public": "Denne tavlen er offentlig",
|
||||||
"private": "Denne tavlen er privat"
|
"private": "Denne tavlen er privat"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Otwórz media"
|
"label": "Otwórz media"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Sprawdź dokumentację",
|
"checkoutDocs": "Sprawdź dokumentację",
|
||||||
"checkLogs": "Sprawdź logi, aby uzyskać więcej informacji.",
|
"checkLogs": "Sprawdź logi, aby uzyskać więcej informacji.",
|
||||||
"tryAgain": "Spróbuj ponownie",
|
"tryAgain": "Spróbuj ponownie",
|
||||||
"loading": "Ładowanie",
|
"loading": "Ładowanie"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "tutaj",
|
"here": "tutaj",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Nowa kategoria",
|
"create": "Nowa kategoria",
|
||||||
"changePosition": "Zmiana pozycji",
|
"changePosition": "Zmiana pozycji"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Ta tablica jest publiczna",
|
"public": "Ta tablica jest publiczna",
|
||||||
"private": "Ta tablica jest prywatna"
|
"private": "Ta tablica jest prywatna"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Abrir mídia"
|
"label": "Abrir mídia"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Confira a documentação",
|
"checkoutDocs": "Confira a documentação",
|
||||||
"checkLogs": "Verifique os logs para mais detalhes",
|
"checkLogs": "Verifique os logs para mais detalhes",
|
||||||
"tryAgain": "Tente novamente",
|
"tryAgain": "Tente novamente",
|
||||||
"loading": "Carregando",
|
"loading": "Carregando"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "aqui",
|
"here": "aqui",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Nova categoria",
|
"create": "Nova categoria",
|
||||||
"changePosition": "Mudar de posição",
|
"changePosition": "Mudar de posição"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Este quadro é publico",
|
"public": "Este quadro é publico",
|
||||||
"private": "Este quadro é privado"
|
"private": "Este quadro é privado"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "",
|
"tryAgain": "",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "",
|
"changePosition": ""
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": ""
|
"label": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "",
|
"checkoutDocs": "",
|
||||||
"checkLogs": "",
|
"checkLogs": "",
|
||||||
"tryAgain": "Încearcă din nou",
|
"tryAgain": "Încearcă din nou",
|
||||||
"loading": "",
|
"loading": ""
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "",
|
"here": "",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "",
|
"create": "",
|
||||||
"changePosition": "Schimbă locația",
|
"changePosition": "Schimbă locația"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "",
|
"public": "",
|
||||||
"private": ""
|
"private": ""
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -1054,9 +1054,6 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Открыть медиа"
|
"label": "Открыть медиа"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1087,9 +1084,7 @@
|
|||||||
"checkoutDocs": "Посмотреть документацию",
|
"checkoutDocs": "Посмотреть документацию",
|
||||||
"checkLogs": "Проверить логи для подробностей",
|
"checkLogs": "Проверить логи для подробностей",
|
||||||
"tryAgain": "Попробовать снова",
|
"tryAgain": "Попробовать снова",
|
||||||
"loading": "Загрузка",
|
"loading": "Загрузка"
|
||||||
"show": "",
|
|
||||||
"hide": ""
|
|
||||||
},
|
},
|
||||||
"here": "здесь",
|
"here": "здесь",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1254,8 +1249,7 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "Новая категория",
|
"create": "Новая категория",
|
||||||
"changePosition": "Изменить позицию",
|
"changePosition": "Изменить позицию"
|
||||||
"settings": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3458,9 +3452,6 @@
|
|||||||
"public": "Эта панель публичная",
|
"public": "Эта панель публичная",
|
||||||
"private": "Эта панель приватная"
|
"private": "Эта панель приватная"
|
||||||
},
|
},
|
||||||
"noResults": {
|
|
||||||
"title": ""
|
|
||||||
},
|
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
Loaded 100 of 120 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user