pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-10-29 23:19:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

♻️ rename destinationDomain to destinationHost to include the Scheme

Browse Source
This commit is contained in:
Fred KISSIE
2026-09-18 23:55:51 +02:00
parent 57b80bf74e
commit 97c91fbdc9
13 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/[orgId]/settings/redirects/page.tsx
+1 -1
View File
@@ -49,7 +49,7 @@ export default async function RedirectIndexPage(props: RedirectIndexPageProps) {
niceId: redirect.niceId,
name: redirect.name,
subdomain: redirect.subdomain,
destinationDomain: redirect.destinationDomain,
destinationHost: redirect.destinationHost,
pathMatchType: redirect.pathMatchType,
matchPath: redirect.matchPath,
rewritePath: redirect.rewritePath,
src/components/RedirectForm.tsx
+25 -20
View File
@@ -40,8 +40,10 @@ import {
import { useEnvContext } from "@app/hooks/useEnvContext";
import { toast } from "@app/hooks/useToast";
import { createApiClient, formatAxiosError } from "@app/lib/api";
import { isValidDomain } from "@server/lib/validators";
import { isValidRegex } from "@server/routers/redirect/validation";
import {
isValidDestinationHost,
isValidRegex
} from "@server/routers/redirect/validation";
import { build } from "@server/build";
import { cn } from "@app/lib/cn";
import { CaretSortIcon } from "@radix-ui/react-icons";
@@ -119,14 +121,14 @@ export default function RedirectForm({
domainId: z.string().nullable(),
subdomain: z.string().nullable(),
resourceId: z.number().int().positive().nullable(),
destinationDomain: z
destinationHost: z
.string()
.trim()
.min(1, {
message: t("redirectDestinationDomainRequired")
message: t("redirectDestinationHostRequired")
})
.refine(isValidDomain, {
message: t("redirectDestinationDomainInvalid")
.refine(isValidDestinationHost, {
message: t("redirectDestinationHostInvalid")
}),
pathMatchType: z.enum(["exact", "prefix", "regex"]),
matchPath: z.string().trim().nullable(),
@@ -196,7 +198,7 @@ export default function RedirectForm({
domainId: redirect?.domainId ?? null,
subdomain: redirect?.subdomain ?? null,
resourceId: redirect?.resourceId ?? null,
destinationDomain: redirect?.destinationDomain ?? "",
destinationHost: redirect?.destinationHost ?? "",
pathMatchType: redirect?.pathMatchType ?? DEFAULT_PATH_MATCH_TYPE,
matchPath: redirect?.matchPath ?? null,
rewritePath: redirect?.rewritePath ?? null,
@@ -209,29 +211,32 @@ export default function RedirectForm({
});
const attachTo = form.watch("attachTo");
const ssl = form.watch("ssl");
const sourceFullDomain =
attachTo === "domain"
? domainFullDomain
: (selectedResource?.fullDomain ?? null);
// Resource-attached redirects inherit the resource's ssl setting
const sourceSsl =
attachTo === "domain" ? ssl : (selectedResource?.ssl ?? true);
const sourceHost = sourceFullDomain
? `${sourceSsl ? "https" : "http"}://${sourceFullDomain}`
: null;
// Mirror is UI-only state; on edit, infer it from whether the saved
// destination already equals the source host.
const [sameDomainAsSource, setSameDomainAsSource] = useState(
Boolean(
redirect &&
sourceFullDomain &&
redirect.destinationDomain === sourceFullDomain
)
Boolean(redirect && sourceHost && redirect.destinationHost === sourceHost)
);
useEffect(() => {
if (sameDomainAsSource && sourceFullDomain) {
form.setValue("destinationDomain", sourceFullDomain, {
if (sameDomainAsSource && sourceHost) {
form.setValue("destinationHost", sourceHost, {
shouldValidate: true
});
}
}, [sameDomainAsSource, sourceFullDomain, form]);
}, [sameDomainAsSource, sourceHost, form]);
const pathMatchType = form.watch("pathMatchType");
const rewritePath = form.watch("rewritePath");
const rewritePathType = form.watch("rewritePathType");
@@ -253,7 +258,7 @@ export default function RedirectForm({
values.attachTo === "domain" ? values.subdomain || null : null,
resourceId:
values.attachTo === "resource" ? values.resourceId : null,
destinationDomain: values.destinationDomain.trim(),
destinationHost: values.destinationHost.trim(),
pathMatchType: values.pathMatchType,
matchPath: values.matchPath?.trim() || null,
rewritePath: values.rewritePath?.trim() || null,
@@ -674,18 +679,18 @@ export default function RedirectForm({
<SettingsFormCell span="full">
<FormField
control={form.control}
name="destinationDomain"
name="destinationHost"
render={({ field }) => (
<FormItem>
<FormLabel>
{t(
"redirectDestinationDomain"
"redirectDestinationHost"
)}
</FormLabel>
<FormControl>
<Input
autoComplete="off"
placeholder="example.com"
placeholder="https://example.com"
readOnly={
sameDomainAsSource
}
@@ -694,7 +699,7 @@ export default function RedirectForm({
</FormControl>
<FormDescription>
{t(
"redirectDestinationDomainDescription"
"redirectDestinationHostDescription"
)}
</FormDescription>
<FormMessage />
src/components/RedirectsTable.tsx
+3 -3
View File
@@ -50,7 +50,7 @@ export type RedirectRow = {
niceId: string;
name: string;
subdomain: string | null;
destinationDomain: string;
destinationHost: string;
pathMatchType: "exact" | "prefix" | "regex";
matchPath: string | null;
rewritePath: string | null;
@@ -301,7 +301,7 @@ export default function RedirectsTable({
},
{
id: "destination",
accessorKey: "destinationDomain",
accessorKey: "destinationHost",
friendlyName: t("redirectDestination"),
header: () => (
<span className="p-3">{t("redirectDestination")}</span>
@@ -310,7 +310,7 @@ export default function RedirectsTable({
const redirect = row.original;
return (
<code className="text-sm truncate">
{redirect.destinationDomain}
{redirect.destinationHost}
{redirect.rewritePath && (
<span className="text-muted-foreground">
{redirect.rewritePathType === "prefix"