StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow more values for remote field when creating a database; closes #3842

Browse source
This commit is contained in:
DaneEveritt 2022-05-07 14:17:10 -04:00
parent b07fdc100c
commit c751ce7f44
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/scripts/components/server/databases/CreateDatabaseButton.tsx
View file

@ -21,10 +21,8 @@ const schema = object().shape({
.required('A database name must be provided.')
.min(3, 'Database name must be at least 3 characters.')
.max(48, 'Database name must not exceed 48 characters.')
.matches(/^[A-Za-z0-9_\-.]{3,48}$/, 'Database name should only contain alphanumeric characters, underscores, dashes, and/or periods.'),
connectionsFrom: string()
.required('A connection value must be provided.')
.matches(/^([0-9]{1,3}|%)(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?(\.([0-9]{1,3}|%))?$/, 'A valid connection address must be provided.'),
.matches(/^[\w\-.]{3,48}$/, 'Database name should only contain alphanumeric characters, underscores, dashes, and/or periods.'),
connectionsFrom: string().matches(/^[\w\-/.%:]+$/, 'A valid host address must be provided.'),
});
export default () => {
@ -36,7 +34,10 @@ export default () => {
const submit = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
clearFlashes('database:create');
createServerDatabase(uuid, { ...values })
createServerDatabase(uuid, {
databaseName: values.databaseName,
connectionsFrom: values.connectionsFrom || '%',
})
.then(database => {
appendDatabase(database);
setVisible(false);
@ -51,7 +52,7 @@ export default () => {
<>
<Formik
onSubmit={submit}
initialValues={{ databaseName: '', connectionsFrom: '%' }}
initialValues={{ databaseName: '', connectionsFrom: '' }}
validationSchema={schema}
>
{
@ -81,7 +82,7 @@ export default () => {
id={'connections_from'}
name={'connectionsFrom'}
label={'Connections From'}
description={'Where connections should be allowed from. Use % for wildcards.'}
description={'Where connections should be allowed from. Leave blank to allow connections from anywhere.'}
/>
</div>
<div css={tw`flex flex-wrap justify-end mt-6`}>