Skip to content

Commit 7e0ac2c

Browse files
DaneEverittDaneEveritt
committed
Show error message when attempting to change a server's name
1 parent 1f92a7d commit 7e0ac2c

File tree

2 files changed

+89
-82
lines changed

2 files changed

+89
-82
lines changed

‎resources/scripts/components/server/settings/RenameServerBox.tsx‎

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,69 @@
11
import React from 'react';
22
import { ServerContext } from '@/state/server';
33
import TitledGreyBox from '@/components/elements/TitledGreyBox';
4-
import { Form, FormikProps, withFormik } from 'formik';
5-
import { Server } from '@/api/server/getServer';
6-
import { ActionCreator } from 'easy-peasy';
4+
import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
5+
import { Actions, useStoreActions } from 'easy-peasy';
76
import renameServer from '@/api/server/renameServer';
87
import Field from '@/components/elements/Field';
98
import { object, string } from 'yup';
109
import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
11-
12-
interface OwnProps {
13-
server: Server;
14-
setServer: ActionCreator<Server>;
15-
}
10+
import { ApplicationStore } from '@/state';
11+
import { httpErrorToHuman } from '@/api/http';
1612

1713
interface Values {
1814
name: string;
1915
}
2016

21-
const RenameServerBox = ({ isSubmitting, ...props }: OwnProps & FormikProps<Values>) => (
22-
<TitledGreyBox title={'Change Server Name'} className={'relative'}>
23-
<SpinnerOverlay size={'normal'} visible={isSubmitting}/>
24-
<Form className={'mb-0'}>
25-
<Field
26-
id={'name'}
27-
name={'name'}
28-
label={'Server Name'}
29-
type={'text'}
30-
/>
31-
<div className={'mt-6 text-right'}>
32-
<button type={'submit'} className={'btn btn-sm btn-primary'}>
33-
Save
34-
</button>
35-
</div>
36-
</Form>
37-
</TitledGreyBox>
38-
);
39-
40-
const EnhancedForm = withFormik<OwnProps, Values>({
41-
displayName: 'RenameServerBoxForm',
17+
const RenameServerBox = () => {
18+
const { isSubmitting } = useFormikContext<Values>();
4219

43-
mapPropsToValues: props => ({
44-
name: props.server.name,
45-
}),
20+
return (
21+
<TitledGreyBox title={'Change Server Name'} className={'relative'}>
22+
<SpinnerOverlay size={'normal'} visible={isSubmitting}/>
23+
<Form className={'mb-0'}>
24+
<Field
25+
id={'name'}
26+
name={'name'}
27+
label={'Server Name'}
28+
type={'text'}
29+
/>
30+
<div className={'mt-6 text-right'}>
31+
<button type={'submit'} className={'btn btn-sm btn-primary'}>
32+
Save
33+
</button>
34+
</div>
35+
</Form>
36+
</TitledGreyBox>
37+
);
38+
};
4639

47-
validationSchema: () => object().shape({
48-
name: string().required().min(1),
49-
}),
40+
export default () => {
41+
const server = ServerContext.useStoreState(state => state.server.data!);
42+
const setServer = ServerContext.useStoreActions(actions => actions.server.setServer);
43+
const { addError, clearFlashes } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
5044

51-
handleSubmit: (values, { props, setSubmitting }) => {
52-
renameServer(props.server.uuid, values.name)
53-
.then(() => props.setServer({ ...props.server, name: values.name }))
45+
const submit = ({ name }: Values, { setSubmitting }: FormikHelpers<Values>) => {
46+
clearFlashes('settings');
47+
renameServer(server.uuid, name)
48+
.then(() => setServer({ ...server, name }))
5449
.catch(error => {
5550
console.error(error);
51+
addError({ key: 'settings', message: httpErrorToHuman(error) });
5652
})
5753
.then(() => setSubmitting(false));
58-
},
59-
})(RenameServerBox);
60-
61-
export default () => {
62-
const server = ServerContext.useStoreState(state => state.server.data!);
63-
const setServer = ServerContext.useStoreActions(actions => actions.server.setServer);
54+
};
6455

65-
return <EnhancedForm server={server} setServer={setServer}/>;
56+
return (
57+
<Formik
58+
onSubmit={submit}
59+
initialValues={{
60+
name: server.name,
61+
}}
62+
validationSchema={object().shape({
63+
name: string().required().min(1),
64+
})}
65+
>
66+
<RenameServerBox/>
67+
</Formik>
68+
);
6669
};

‎resources/scripts/components/server/settings/SettingsContainer.tsx‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,56 @@ import { useStoreState } from 'easy-peasy';
55
import { ApplicationStore } from '@/state';
66
import { UserData } from '@/state/user';
77
import RenameServerBox from '@/components/server/settings/RenameServerBox';
8+
import FlashMessageRender from '@/components/FlashMessageRender';
89

910
export default () => {
1011
const user = useStoreState<ApplicationStore, UserData>(state => state.user.data!);
1112
const server = ServerContext.useStoreState(state => state.server.data!);
1213

1314
return (
14-
<div className={'my-10 mb-6 md:flex'}>
15-
<TitledGreyBox title={'SFTP Details'} className={'w-full md:flex-1 md:mr-6'}>
16-
<div>
17-
<label className={'input-dark-label'}>Server Address</label>
18-
<input
19-
type={'text'}
20-
className={'input-dark'}
21-
value={`sftp://${server.sftpDetails.ip}:${server.sftpDetails.port}`}
22-
readOnly={true}
23-
/>
24-
</div>
25-
<div className={'mt-6'}>
26-
<label className={'input-dark-label'}>Username</label>
27-
<input
28-
type={'text'}
29-
className={'input-dark'}
30-
value={`${user.username}.${server.id}`}
31-
readOnly={true}
32-
/>
33-
</div>
34-
<div className={'mt-6 flex items-center'}>
35-
<div className={'flex-1'}>
36-
<div className={'border-l-4 border-cyan-500 p-3'}>
37-
<p className={'text-xs text-neutral-200'}>
38-
Your SFTP password is the same as the password you use to access this panel.
39-
</p>
40-
</div>
15+
<div className={'my-10 mb-6'}>
16+
<FlashMessageRender byKey={'settings'} className={'mb-4'}/>
17+
<div className={'md:flex'}>
18+
<TitledGreyBox title={'SFTP Details'} className={'w-full md:flex-1 md:mr-6'}>
19+
<div>
20+
<label className={'input-dark-label'}>Server Address</label>
21+
<input
22+
type={'text'}
23+
className={'input-dark'}
24+
value={`sftp://${server.sftpDetails.ip}:${server.sftpDetails.port}`}
25+
readOnly={true}
26+
/>
4127
</div>
42-
<div className={'ml-4'}>
43-
<a
44-
href={`sftp://${user.username}.${server.id}@${server.sftpDetails.ip}:${server.sftpDetails.port}`}
45-
className={'btn btn-sm btn-secondary'}
46-
>
47-
Launch SFTP
48-
</a>
28+
<div className={'mt-6'}>
29+
<label className={'input-dark-label'}>Username</label>
30+
<input
31+
type={'text'}
32+
className={'input-dark'}
33+
value={`${user.username}.${server.id}`}
34+
readOnly={true}
35+
/>
36+
</div>
37+
<div className={'mt-6 flex items-center'}>
38+
<div className={'flex-1'}>
39+
<div className={'border-l-4 border-cyan-500 p-3'}>
40+
<p className={'text-xs text-neutral-200'}>
41+
Your SFTP password is the same as the password you use to access this panel.
42+
</p>
43+
</div>
44+
</div>
45+
<div className={'ml-4'}>
46+
<a
47+
href={`sftp://${user.username}.${server.id}@${server.sftpDetails.ip}:${server.sftpDetails.port}`}
48+
className={'btn btn-sm btn-secondary'}
49+
>
50+
Launch SFTP
51+
</a>
52+
</div>
4953
</div>
54+
</TitledGreyBox>
55+
<div className={'w-full mt-6 md:flex-1 md:mt-0'}>
56+
<RenameServerBox/>
5057
</div>
51-
</TitledGreyBox>
52-
<div className={'w-full mt-6 md:flex-1 md:mt-0'}>
53-
<RenameServerBox/>
5458
</div>
5559
</div>
5660
);

0 commit comments

Comments
 (0)