Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enhance domain validation feedback in ShowDomains and AddDomain components. Add descriptive tooltips for container port input and improve validation state messaging to indicate Cloudflare status. Remove unnecessary console logs for cleaner code.

Browse Source
This commit is contained in:
Mauricio Siu 2025-04-30 01:23:54 -06:00
parent bcebcfdfdf
commit 8ba4ac22cc
5 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/dokploy/components/dashboard/application/domains/add-domain.tsx
View File

@ -89,8 +89,6 @@ export const AddDomain = ({
serverId: application?.serverId || "",
});
console.log("canGenerateTraefikMeDomains", canGenerateTraefikMeDomains);
const form = useForm<Domain>({
resolver: zodResolver(domain),
defaultValues: {
@ -276,6 +274,11 @@ export const AddDomain = ({
return (
<FormItem>
<FormLabel>Container Port</FormLabel>
<FormDescription>
The port where your application is running inside the
container (e.g., 3000 for Node.js, 80 for Nginx, 8080
for Java)
</FormDescription>
<FormControl>
<NumberInput placeholder={"3000"} {...field} />
</FormControl>

5
apps/dokploy/components/dashboard/application/domains/show-domains.tsx
View File

@ -84,6 +84,7 @@ export const ShowDomains = ({ applicationId }: Props) => {
isValid: result.isValid,
error: result.error,
resolvedIp: result.resolvedIp,
message: result.error && result.isValid ? result.error : undefined,
},
}));
} catch (err) {
@ -304,7 +305,9 @@ export const ShowDomains = ({ applicationId }: Props) => {
) : validationState?.isValid ? (
<>
<CheckCircle2 className="size-3 mr-1" />
{"DNS Valid"}
{validationState.message
? "Behind Cloudflare"
: "DNS Valid"}
</>
) : validationState?.error ? (
<>

5
apps/dokploy/components/dashboard/compose/domains/add-domain.tsx
View File

@ -401,6 +401,11 @@ export const AddDomainCompose = ({
return (
<FormItem>
<FormLabel>Container Port</FormLabel>
<FormDescription>
The port where your application is running inside the
container (e.g., 3000 for Node.js, 80 for Nginx, 8080
for Java)
</FormDescription>
<FormControl>
<NumberInput placeholder={"3000"} {...field} />
</FormControl>

23
apps/dokploy/components/dashboard/compose/domains/show-domains.tsx
View File

@ -42,6 +42,7 @@ export type ValidationState = {
isValid?: boolean;
error?: string;
resolvedIp?: string;
message?: string;
};
export type ValidationStates = {
@ -98,6 +99,7 @@ export const ShowDomainsCompose = ({ composeId }: Props) => {
isValid: result.isValid,
error: result.error,
resolvedIp: result.resolvedIp,
message: result.error && result.isValid ? result.error : undefined,
},
}));
} catch (err) {
@ -322,12 +324,14 @@ export const ShowDomainsCompose = ({ composeId }: Props) => {
) : validationState?.isValid ? (
<>
<CheckCircle2 className="size-3 mr-1" />
{"DNS Valid"}
{validationState.message
? "Behind Cloudflare"
: "DNS Valid"}
</>
) : validationState?.error ? (
<>
<XCircle className="size-3 mr-1" />
{validationState.error}
DNS Invalid
</>
) : (
<>
@ -338,13 +342,26 @@ export const ShowDomainsCompose = ({ composeId }: Props) => {
</Badge>
</TooltipTrigger>
<TooltipContent className="max-w-xs">
{validationState?.error ? (
{validationState?.error &&
!validationState.isValid ? (
<div className="flex flex-col gap-1">
<p className="font-medium text-red-500">
Error:
</p>
<p>{validationState.error}</p>
</div>
) : validationState?.isValid ? (
<div className="flex flex-col gap-1">
<p className="font-medium text-green-500">
{validationState.message
? "Info:"
: "Valid Configuration:"}
</p>
<p>
{validationState.message ||
`Domain points to ${validationState.resolvedIp}`}
</p>
</div>
) : (
"Click to validate DNS configuration"
)}

17
packages/server/src/services/domain.ts
View File

@ -180,7 +180,7 @@ export const validateDomain = async (
// Resolve the domain to get its IP
const ips = await resolveDns(cleanDomain || "");
const resolvedIp = ips[0];
const resolvedIps = ips.map((ip) => ip.toString());
// Check if it's a Cloudflare IP
const behindCloudflare = ips.some((ip) => isCloudflareIp(ip));
@ -189,7 +189,7 @@ export const validateDomain = async (
if (behindCloudflare) {
return {
isValid: true,
resolvedIp,
resolvedIp: resolvedIps.join(", "),
isCloudflare: true,
error:
"Domain is behind Cloudflare - actual IP is masked by Cloudflare proxy",
@ -199,19 +199,18 @@ export const validateDomain = async (
// If we have an expected IP, validate against it
if (expectedIp) {
return {
isValid: resolvedIp === expectedIp,
resolvedIp,
error:
resolvedIp !== expectedIp
? `Domain resolves to ${resolvedIp} but should point to ${expectedIp}`
: undefined,
isValid: resolvedIps.includes(expectedIp),
resolvedIp: resolvedIps.join(", "),
error: !resolvedIps.includes(expectedIp)
? `Domain resolves to ${resolvedIps.join(", ")} but should point to ${expectedIp}`
: undefined,
};
}
// If no expected IP, just return the resolved IP
return {
isValid: true,
resolvedIp,
resolvedIp: resolvedIps.join(", "),
};
} catch (error) {
return {