refactor(ui): simplify server selection logic across components - Remove redundant server count check in server selection dropdowns across multiple components (AddApplication, AddCompose, AddDatabase, AddTemplate, StepOne, AddCertificate) to streamline UI behavior.

This commit is contained in:
Mauricio Siu
2025-09-03 20:45:47 -06:00
parent 4a3a7fa47b
commit 52e21dab4e
6 changed files with 11 additions and 11 deletions
@@ -157,7 +157,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
</FormItem> </FormItem>
)} )}
/> />
{hasServers && servers.length > 1 && ( {hasServers && (
<FormField <FormField
control={form.control} control={form.control}
name="serverId" name="serverId"
@@ -165,7 +165,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
)} )}
/> />
</div> </div>
{hasServers && servers.length > 1 && ( {hasServers && (
<FormField <FormField
control={form.control} control={form.control}
name="serverId" name="serverId"
@@ -232,7 +232,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
databaseUser: databaseUser:
data.databaseUser || databasesUserDefaultPlaceholder[data.type], data.databaseUser || databasesUserDefaultPlaceholder[data.type],
serverId: data.serverId === "dokploy" ? undefined : data.serverId, serverId: data.serverId === "dokploy" ? null : data.serverId,
}); });
} else if (data.type === "mongo") { } else if (data.type === "mongo") {
promise = mongoMutation.mutateAsync({ promise = mongoMutation.mutateAsync({
@@ -240,14 +240,14 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
databasePassword: data.databasePassword, databasePassword: data.databasePassword,
databaseUser: databaseUser:
data.databaseUser || databasesUserDefaultPlaceholder[data.type], data.databaseUser || databasesUserDefaultPlaceholder[data.type],
serverId: data.serverId === "dokploy" ? undefined : data.serverId, serverId: data.serverId === "dokploy" ? null : data.serverId,
replicaSets: data.replicaSets, replicaSets: data.replicaSets,
}); });
} else if (data.type === "redis") { } else if (data.type === "redis") {
promise = redisMutation.mutateAsync({ promise = redisMutation.mutateAsync({
...commonParams, ...commonParams,
databasePassword: data.databasePassword, databasePassword: data.databasePassword,
serverId: data.serverId === "dokploy" ? undefined : data.serverId, serverId: data.serverId === "dokploy" ? null : data.serverId,
projectId, projectId,
}); });
} else if (data.type === "mariadb") { } else if (data.type === "mariadb") {
@@ -258,7 +258,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
databaseName: data.databaseName || "mariadb", databaseName: data.databaseName || "mariadb",
databaseUser: databaseUser:
data.databaseUser || databasesUserDefaultPlaceholder[data.type], data.databaseUser || databasesUserDefaultPlaceholder[data.type],
serverId: data.serverId === "dokploy" ? undefined : data.serverId, serverId: data.serverId === "dokploy" ? null : data.serverId,
}); });
} else if (data.type === "mysql") { } else if (data.type === "mysql") {
promise = mysqlMutation.mutateAsync({ promise = mysqlMutation.mutateAsync({
@@ -268,7 +268,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
databaseUser: databaseUser:
data.databaseUser || databasesUserDefaultPlaceholder[data.type], data.databaseUser || databasesUserDefaultPlaceholder[data.type],
databaseRootPassword: data.databaseRootPassword, databaseRootPassword: data.databaseRootPassword,
serverId: data.serverId === "dokploy" ? undefined : data.serverId, serverId: data.serverId === "dokploy" ? null : data.serverId,
}); });
} }
@@ -398,7 +398,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
</FormItem> </FormItem>
)} )}
/> />
{hasServers && servers.length > 1 && ( {hasServers && (
<FormField <FormField
control={form.control} control={form.control}
name="serverId" name="serverId"
@@ -427,7 +427,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
project. project.
</AlertDialogDescription> </AlertDialogDescription>
{hasServers && servers.length > 1 && ( {hasServers && (
<div> <div>
<TooltipProvider delayDuration={0}> <TooltipProvider delayDuration={0}>
<Tooltip> <Tooltip>
@@ -48,7 +48,7 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
/> />
</div> </div>
{hasServers && servers.length > 1 && ( {hasServers && (
<div className="space-y-2"> <div className="space-y-2">
<Label htmlFor="server-deploy"> <Label htmlFor="server-deploy">
Select the server where you want to deploy (optional) Select the server where you want to deploy (optional)
@@ -175,7 +175,7 @@ export const AddCertificate = () => {
</FormItem> </FormItem>
)} )}
/> />
{hasServers && servers.length > 1 && ( {hasServers && (
<FormField <FormField
control={form.control} control={form.control}
name="serverId" name="serverId"