Merge branch 'dev' into feat/option-to-regenerate-keys

2026-02-26 23:06:37 +00:00 · 2025-11-09 10:43:26 -08:00
parent b6e98632b5 fa7aa508ea
commit 0a5dc17800
40 changed files with 1669 additions and 1313 deletions
--- a/src/app/[orgId]/settings/domains/[domainId]/page.tsx
+++ b/src/app/[orgId]/settings/domains/[domainId]/page.tsx
@@ -73,7 +73,7 @@ export default async function DomainSettingsPage({

                <DNSRecordsTable records={dnsRecords} type={domain.type} />

-                {domain.type == "wildcard" && (
+                {domain.type == "wildcard" && !domain.configManaged && (
                    <DomainCertForm
                        orgId={orgId}
                        domainId={domain.domainId}
--- a/src/app/[orgId]/settings/resources/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/resources/[niceId]/general/page.tsx
@@ -68,9 +68,9 @@ export default function GeneralForm() {
    const router = useRouter();
    const t = useTranslations();
    const [editDomainOpen, setEditDomainOpen] = useState(false);
-    const {licenseStatus } = useLicenseStatusContext();
+    const { licenseStatus } = useLicenseStatusContext();
    const subscriptionStatus = useSubscriptionStatusContext();
-    const {user} = useUserContext();
+    const { user } = useUserContext();

    const { env } = useEnvContext();

@@ -102,6 +102,7 @@ export default function GeneralForm() {
            enabled: z.boolean(),
            subdomain: z.string().optional(),
            name: z.string().min(1).max(255),
+            niceId: z.string().min(1).max(255).optional(),
            domainId: z.string().optional(),
            proxyPort: z.number().int().min(1).max(65535).optional(),
            // enableProxy: z.boolean().optional()
@@ -130,6 +131,7 @@ export default function GeneralForm() {
        defaultValues: {
            enabled: resource.enabled,
            name: resource.name,
+            niceId: resource.niceId,
            subdomain: resource.subdomain ? resource.subdomain : undefined,
            domainId: resource.domainId || undefined,
            proxyPort: resource.proxyPort || undefined,
@@ -192,6 +194,7 @@ export default function GeneralForm() {
                {
                    enabled: data.enabled,
                    name: data.name,
+                    niceId: data.niceId,
                    subdomain: data.subdomain ? toASCII(data.subdomain) : undefined,
                    domainId: data.domainId,
                    proxyPort: data.proxyPort,
@@ -212,16 +215,12 @@ export default function GeneralForm() {
            });

        if (res && res.status === 200) {
-            toast({
-                title: t("resourceUpdated"),
-                description: t("resourceUpdatedDescription")
-            });
-
-            const resource = res.data.data;
+            const updated = res.data.data;

            updateResource({
                enabled: data.enabled,
                name: data.name,
+                niceId: data.niceId,
                subdomain: data.subdomain,
                fullDomain: resource.fullDomain,
                proxyPort: data.proxyPort,
@@ -230,8 +229,20 @@ export default function GeneralForm() {
                // })
            });

-            router.refresh();
+            toast({
+                title: t("resourceUpdated"),
+                description: t("resourceUpdatedDescription")
+            });
+
+            if (data.niceId && data.niceId !== resource?.niceId) {
+                router.replace(`/${updated.orgId}/settings/resources/${data.niceId}/general`);
+            } else {
+                router.refresh();
+            }
+
+            setSaveLoading(false);
        }
+
        setSaveLoading(false);
    }

@@ -304,6 +315,24 @@ export default function GeneralForm() {
                                            )}
                                        />

+                                        <FormField
+                                            control={form.control}
+                                            name="niceId"
+                                            render={({ field }) => (
+                                                <FormItem>
+                                                    <FormLabel>{t("identifier")}</FormLabel>
+                                                    <FormControl>
+                                                        <Input
+                                                            {...field}
+                                                            placeholder={t("enterIdentifier")}
+                                                            className="flex-1"
+                                                        />
+                                                    </FormControl>
+                                                    <FormMessage />
+                                                </FormItem>
+                                            )}
+                                        />
+
                                        {!resource.http && (
                                            <>
                                                <FormField
--- a/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx
+++ b/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx
@@ -501,25 +501,6 @@ export default function ReverseProxyTargets(props: {
            return;
        }

-        // Check if target with same IP, port and method already exists
-        const isDuplicate = targets.some(
-            (t) =>
-                t.targetId !== target.targetId &&
-                t.ip === target.ip &&
-                t.port === target.port &&
-                t.method === target.method &&
-                t.siteId === target.siteId
-        );
-
-        if (isDuplicate) {
-            toast({
-                variant: "destructive",
-                title: t("targetErrorDuplicate"),
-                description: t("targetErrorDuplicateDescription")
-            });
-            return;
-        }
-
        try {
            setTargetsLoading(true);

@@ -585,24 +566,6 @@ export default function ReverseProxyTargets(props: {
    }

    async function addTarget(data: z.infer<typeof addTargetSchema>) {
-        // Check if target with same IP, port and method already exists
-        const isDuplicate = targets.some(
-            (target) =>
-                target.ip === data.ip &&
-                target.port === data.port &&
-                target.method === data.method &&
-                target.siteId === data.siteId
-        );
-
-        if (isDuplicate) {
-            toast({
-                variant: "destructive",
-                title: t("targetErrorDuplicate"),
-                description: t("targetErrorDuplicateDescription")
-            });
-            return;
-        }
-
        // if (site && site.type == "wireguard" && site.subnet) {
        //     // make sure that the target IP is within the site subnet
        //     const targetIp = data.ip;
@@ -899,7 +862,7 @@ export default function ReverseProxyTargets(props: {

        const healthCheckColumn: ColumnDef<LocalTarget> = {
            accessorKey: "healthCheck",
-            header: t("healthCheck"),
+            header: () => (<span className="p-3">{t("healthCheck")}</span>),
            cell: ({ row }) => {
                const status = row.original.hcHealth || "unknown";
                const isEnabled = row.original.hcEnabled;
@@ -971,7 +934,7 @@ export default function ReverseProxyTargets(props: {

        const matchPathColumn: ColumnDef<LocalTarget> = {
            accessorKey: "path",
-            header: t("matchPath"),
+            header: () => (<span className="p-3">{t("matchPath")}</span>),
            cell: ({ row }) => {
                const hasPathMatch = !!(
                    row.original.path || row.original.pathMatchType
@@ -1033,7 +996,7 @@ export default function ReverseProxyTargets(props: {

        const addressColumn: ColumnDef<LocalTarget> = {
            accessorKey: "address",
-            header: t("address"),
+            header: () => (<span className="p-3">{t("address")}</span>),
            cell: ({ row }) => {
                const selectedSite = sites.find(
                    (site) => site.siteId === row.original.siteId
@@ -1052,7 +1015,7 @@ export default function ReverseProxyTargets(props: {

                return (
                    <div className="flex items-center w-full">
-                        <div className="flex items-center w-full justify-start py-0 space-x-2 px-0 cursor-default border border-input shadow-2xs rounded-md">
+                        <div className="flex items-center w-full justify-start py-0 space-x-2 px-0 cursor-default border border-input rounded-md">
                            {selectedSite &&
                                selectedSite.type === "newt" &&
                                (() => {
@@ -1247,7 +1210,7 @@ export default function ReverseProxyTargets(props: {

        const rewritePathColumn: ColumnDef<LocalTarget> = {
            accessorKey: "rewritePath",
-            header: t("rewritePath"),
+            header: () => (<span className="p-3">{t("rewritePath")}</span>),
            cell: ({ row }) => {
                const hasRewritePath = !!(
                    row.original.rewritePath || row.original.rewritePathType
@@ -1317,7 +1280,7 @@ export default function ReverseProxyTargets(props: {

        const enabledColumn: ColumnDef<LocalTarget> = {
            accessorKey: "enabled",
-            header: t("enabled"),
+            header: () => (<span className="p-3">{t("enabled")}</span>),
            cell: ({ row }) => (
                <div className="flex items-center justify-center w-full">
                    <Switch
@@ -1338,8 +1301,9 @@ export default function ReverseProxyTargets(props: {

        const actionsColumn: ColumnDef<LocalTarget> = {
            id: "actions",
+            header: () => (<span className="p-3">{t("actions")}</span>),
            cell: ({ row }) => (
-                <div className="flex items-center justify-end w-full">
+                <div className="flex items-center w-full">
                    <Button
                        variant="outline"
                        onClick={() => removeTarget(row.original.targetId)}
--- a/src/app/[orgId]/settings/resources/create/page.tsx
+++ b/src/app/[orgId]/settings/resources/create/page.tsx
@@ -425,24 +425,6 @@ export default function Page() {
    };

    async function addTarget(data: z.infer<typeof addTargetSchema>) {
-        // Check if target with same IP, port and method already exists
-        const isDuplicate = targets.some(
-            (target) =>
-                target.ip === data.ip &&
-                target.port === data.port &&
-                target.method === data.method &&
-                target.siteId === data.siteId
-        );
-
-        if (isDuplicate) {
-            toast({
-                variant: "destructive",
-                title: t("targetErrorDuplicate"),
-                description: t("targetErrorDuplicateDescription")
-            });
-            return;
-        }
-
        const site = sites.find((site) => site.siteId === data.siteId);

        const isHttp = baseForm.watch("http");
--- a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
@@ -15,7 +15,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { useSiteContext } from "@app/hooks/useSiteContext";
 import { useForm } from "react-hook-form";
-import { toast } from "@app/hooks/useToast";
+import { toast, useToast } from "@app/hooks/useToast";
 import { useRouter } from "next/navigation";
 import {
    SettingsContainer,
@@ -37,6 +37,7 @@ import { Tag, TagInput } from "@app/components/tags/tag-input";

 const GeneralFormSchema = z.object({
    name: z.string().nonempty("Name is required"),
+    niceId: z.string().min(1).max(255).optional(),
    dockerSocketEnabled: z.boolean().optional(),
    remoteSubnets: z
        .array(
@@ -55,19 +56,18 @@ export default function GeneralPage() {

    const { env } = useEnvContext();
    const api = createApiClient(useEnvContext());
-
-    const [loading, setLoading] = useState(false);
-    const [activeCidrTagIndex, setActiveCidrTagIndex] = useState<number | null>(
-        null
-    );
-
    const router = useRouter();
    const t = useTranslations();
+    const { toast } = useToast();
+
+    const [loading, setLoading] = useState(false);
+    const [activeCidrTagIndex, setActiveCidrTagIndex] = useState<number | null>(null);

    const form = useForm({
        resolver: zodResolver(GeneralFormSchema),
        defaultValues: {
            name: site?.name,
+            niceId: site?.niceId || "",
            dockerSocketEnabled: site?.dockerSocketEnabled ?? false,
            remoteSubnets: site?.remoteSubnets
                ? site.remoteSubnets.split(",").map((subnet, index) => ({
@@ -82,37 +82,40 @@ export default function GeneralPage() {
    async function onSubmit(data: GeneralFormValues) {
        setLoading(true);

-        await api
-            .post(`/site/${site?.siteId}`, {
+        try {
+            await api.post(`/site/${site?.siteId}`, {
                name: data.name,
+                niceId: data.niceId,
                dockerSocketEnabled: data.dockerSocketEnabled,
                remoteSubnets:
                    data.remoteSubnets
-                        ?.map((subnet) => subnet.text)
-                        .join(",") || ""
-            })
-            .catch((e) => {
-                toast({
-                    variant: "destructive",
-                    title: t("siteErrorUpdate"),
-                    description: formatAxiosError(
-                        e,
-                        t("siteErrorUpdateDescription")
-                    )
-                });
+                    ?.map((subnet) => subnet.text)
+                    .join(",") || ""
            });

-        updateSite({
-            name: data.name,
-            dockerSocketEnabled: data.dockerSocketEnabled,
-            remoteSubnets:
-                data.remoteSubnets?.map((subnet) => subnet.text).join(",") || ""
-        });
+            updateSite({
+                name: data.name,
+                niceId: data.niceId,
+                dockerSocketEnabled: data.dockerSocketEnabled,
+                remoteSubnets:
+                    data.remoteSubnets?.map((subnet) => subnet.text).join(",") || ""
+            });

-        toast({
-            title: t("siteUpdated"),
-            description: t("siteUpdatedDescription")
-        });
+            if (data.niceId && data.niceId !== site?.niceId) {
+                router.replace(`/${site?.orgId}/settings/sites/${data.niceId}/general`);
+            }
+
+            toast({
+                title: t("siteUpdated"),
+                description: t("siteUpdatedDescription")
+            });
+        } catch (e) {
+            toast({
+                variant: "destructive",
+                title: t("siteErrorUpdate"),
+                description: formatAxiosError(e, t("siteErrorUpdateDescription"))
+            });
+        }

        setLoading(false);

@@ -153,8 +156,25 @@ export default function GeneralPage() {
                                    )}
                                />

-                                {env.flags.enableClients &&
-                                site.type === "newt" ? (
+                                <FormField
+                                    control={form.control}
+                                    name="niceId"
+                                    render={({ field }) => (
+                                        <FormItem>
+                                            <FormLabel>{t("identifier")}</FormLabel>
+                                            <FormControl>
+                                                <Input
+                                                    {...field}
+                                                    placeholder={t("enterIdentifier")}
+                                                    className="flex-1"
+                                                />
+                                            </FormControl>
+                                            <FormMessage />
+                                        </FormItem>
+                                    )}
+                                />
+
+                                {env.flags.enableClients && site.type === "newt" ? (
                                    <FormField
                                        control={form.control}
                                        name="remoteSubnets"