refactor: make database root password optional in schema and mutation logic, enhancing flexibility in database configuration

This commit is contained in:
Mauricio Siu
2025-09-05 01:01:26 -06:00
parent e3f3426f1c
commit 392e3434c4
@@ -122,7 +122,8 @@ const mySchema = z.discriminatedUnion("type", [
.regex(/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/, { .regex(/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/, {
message: message:
"Password contains invalid characters. Please avoid: $ ! ' \" \\ / and space characters for database compatibility", "Password contains invalid characters. Please avoid: $ ! ' \" \\ / and space characters for database compatibility",
}), })
.optional(),
databaseUser: z.string().default("mysql"), databaseUser: z.string().default("mysql"),
databaseName: z.string().default("mysql"), databaseName: z.string().default("mysql"),
}) })
@@ -136,7 +137,8 @@ const mySchema = z.discriminatedUnion("type", [
.regex(/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/, { .regex(/^[a-zA-Z0-9@#%^&*()_+\-=[\]{}|;:,.<>?~`]*$/, {
message: message:
"Password contains invalid characters. Please avoid: $ ! ' \" \\ / and space characters for database compatibility", "Password contains invalid characters. Please avoid: $ ! ' \" \\ / and space characters for database compatibility",
}), })
.optional(),
databaseUser: z.string().default("mariadb"), databaseUser: z.string().default("mariadb"),
databaseName: z.string().default("mariadb"), databaseName: z.string().default("mariadb"),
}) })
@@ -256,7 +258,7 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
promise = mariadbMutation.mutateAsync({ promise = mariadbMutation.mutateAsync({
...commonParams, ...commonParams,
databasePassword: data.databasePassword, databasePassword: data.databasePassword,
databaseRootPassword: data.databaseRootPassword, databaseRootPassword: data.databaseRootPassword || "",
databaseName: data.databaseName || "mariadb", databaseName: data.databaseName || "mariadb",
databaseUser: databaseUser:
data.databaseUser || databasesUserDefaultPlaceholder[data.type], data.databaseUser || databasesUserDefaultPlaceholder[data.type],
@@ -269,7 +271,7 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
databaseName: data.databaseName || "mysql", databaseName: data.databaseName || "mysql",
databaseUser: databaseUser:
data.databaseUser || databasesUserDefaultPlaceholder[data.type], data.databaseUser || databasesUserDefaultPlaceholder[data.type],
databaseRootPassword: data.databaseRootPassword, databaseRootPassword: data.databaseRootPassword || "",
serverId: data.serverId, serverId: data.serverId,
}); });
} }