Skip to content

Commit edb9657

Browse files
DaneEverittDaneEveritt
committed
Upgrade to formik@2
1 parent 78ed343 commit edb9657

File tree

11 files changed

+42
-90
lines changed

11 files changed

+42
-90
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"date-fns": "^1.29.0",
1414
"easy-peasy": "^3.2.3",
1515
"events": "^3.0.0",
16-
"formik": "^1.5.7",
16+
"formik": "^2.1.4",
1717
"i18next": "^19.0.0",
1818
"i18next-chained-backend": "^2.0.0",
1919
"i18next-localstorage-backend": "^3.0.0",

‎resources/scripts/components/dashboard/forms/DisableTwoFactorModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { Form, Formik, FormikActions } from 'formik';
2+
import { Form, Formik, FormikHelpers } from 'formik';
33
import Modal, { RequiredModalProps } from '@/components/elements/Modal';
44
import FlashMessageRender from '@/components/FlashMessageRender';
55
import Field from '@/components/elements/Field';
@@ -17,7 +17,7 @@ export default ({ ...props }: RequiredModalProps) => {
1717
const { addError, clearFlashes } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
1818
const updateUserData = useStoreActions((actions: Actions<ApplicationStore>) => actions.user.updateUserData);
1919

20-
const submit = ({ password }: Values, { setSubmitting }: FormikActions<Values>) => {
20+
const submit = ({ password }: Values, { setSubmitting }: FormikHelpers<Values>) => {
2121
clearFlashes('account:two-factor');
2222
disableAccountTwoFactor(password)
2323
.then(() => {

‎resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useEffect, useState } from 'react';
22
import Modal, { RequiredModalProps } from '@/components/elements/Modal';
3-
import { Form, Formik, FormikActions } from 'formik';
3+
import { Form, Formik, FormikHelpers } from 'formik';
44
import { object, string } from 'yup';
55
import Field from '@/components/elements/Field';
66
import getTwoFactorTokenUrl from '@/api/account/getTwoFactorTokenUrl';
@@ -30,7 +30,7 @@ export default ({ ...props }: RequiredModalProps) => {
3030
});
3131
}, []);
3232

33-
const submit = ({ code }: Values, { setSubmitting }: FormikActions<Values>) => {
33+
const submit = ({ code }: Values, { setSubmitting }: FormikHelpers<Values>) => {
3434
clearFlashes('account:two-factor');
3535
enableAccountTwoFactor(code)
3636
.then(() => {

‎resources/scripts/components/dashboard/forms/UpdateEmailAddressForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Actions, State, useStoreActions, useStoreState } from 'easy-peasy';
3-
import { Form, Formik, FormikActions } from 'formik';
3+
import { Form, Formik, FormikHelpers } from 'formik';
44
import * as Yup from 'yup';
55
import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
66
import Field from '@/components/elements/Field';
@@ -23,7 +23,7 @@ export default () => {
2323

2424
const { clearFlashes, addFlash } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
2525

26-
const submit = (values: Values, { resetForm, setSubmitting }: FormikActions<Values>) => {
26+
const submit = (values: Values, { resetForm, setSubmitting }: FormikHelpers<Values>) => {
2727
clearFlashes('account:email');
2828

2929
updateEmail({ ...values })

‎resources/scripts/components/dashboard/forms/UpdatePasswordForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Actions, State, useStoreActions, useStoreState } from 'easy-peasy';
3-
import { Form, Formik, FormikActions } from 'formik';
3+
import { Form, Formik, FormikHelpers } from 'formik';
44
import Field from '@/components/elements/Field';
55
import * as Yup from 'yup';
66
import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
@@ -30,7 +30,7 @@ export default () => {
3030
return null;
3131
}
3232

33-
const submit = (values: Values, { resetForm, setSubmitting }: FormikActions<Values>) => {
33+
const submit = (values: Values, { resetForm, setSubmitting }: FormikHelpers<Values>) => {
3434
clearFlashes('account:password');
3535
updateAccountPassword({ ...values })
3636
.then(() => {

‎resources/scripts/components/server/databases/CreateDatabaseButton.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState } from 'react';
22
import { ServerDatabase } from '@/api/server/getServerDatabases';
33
import Modal from '@/components/elements/Modal';
4-
import { Form, Formik, FormikActions } from 'formik';
4+
import { Form, Formik, FormikHelpers } from 'formik';
55
import Field from '@/components/elements/Field';
66
import { object, string } from 'yup';
77
import createServerDatabase from '@/api/server/createServerDatabase';
@@ -32,7 +32,7 @@ export default ({ onCreated }: { onCreated: (database: ServerDatabase) => void }
3232
const { addFlash, clearFlashes } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
3333
const server = ServerContext.useStoreState(state => state.server.data!);
3434

35-
const submit = (values: Values, { setSubmitting }: FormikActions<Values>) => {
35+
const submit = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
3636
clearFlashes();
3737
createServerDatabase(server.uuid, { ...values })
3838
.then(database => {

‎resources/scripts/components/server/databases/DatabaseRow.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { faTrashAlt } from '@fortawesome/free-solid-svg-icons/faTrashAlt';
66
import { faEye } from '@fortawesome/free-solid-svg-icons/faEye';
77
import classNames from 'classnames';
88
import Modal from '@/components/elements/Modal';
9-
import { Form, Formik, FormikActions } from 'formik';
9+
import { Form, Formik, FormikHelpers } from 'formik';
1010
import Field from '@/components/elements/Field';
1111
import { object, string } from 'yup';
1212
import FlashMessageRender from '@/components/FlashMessageRender';
@@ -41,7 +41,7 @@ export default ({ databaseId, className, onDelete }: Props) => {
4141
.oneOf([database.name.split('_', 2)[1], database.name], 'The database name must be provided.'),
4242
});
4343

44-
const submit = (values: { confirm: string }, { setSubmitting }: FormikActions<{ confirm: string }>) => {
44+
const submit = (values: { confirm: string }, { setSubmitting }: FormikHelpers<{ confirm: string }>) => {
4545
clearFlashes();
4646
deleteServerDatabase(server.uuid, database.id)
4747
.then(() => {

‎resources/scripts/components/server/files/FileNameModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import Modal, { RequiredModalProps } from '@/components/elements/Modal';
3-
import { Form, Formik, FormikActions } from 'formik';
3+
import { Form, Formik, FormikHelpers } from 'formik';
44
import { object, string } from 'yup';
55
import Field from '@/components/elements/Field';
66
import { ServerContext } from '@/state/server';
@@ -17,7 +17,7 @@ interface Values {
1717
export default ({ onFileNamed, onDismissed, ...props }: Props) => {
1818
const directory = ServerContext.useStoreState(state => state.files.directory);
1919

20-
const submit = (values: Values, { setSubmitting }: FormikActions<Values>) => {
20+
const submit = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
2121
onFileNamed(join(directory, values.fileName));
2222
setSubmitting(false);
2323
};

‎resources/scripts/components/server/files/NewDirectoryButton.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState } from 'react';
22
import Modal from '@/components/elements/Modal';
33
import { ServerContext } from '@/state/server';
4-
import { Form, Formik, FormikActions } from 'formik';
4+
import { Form, Formik, FormikHelpers } from 'formik';
55
import Field from '@/components/elements/Field';
66
import { join } from 'path';
77
import { object, string } from 'yup';
@@ -22,7 +22,7 @@ export default () => {
2222
const directory = ServerContext.useStoreState(state => state.files.directory);
2323
const pushFile = ServerContext.useStoreActions(actions => actions.files.pushFile);
2424

25-
const submit = (values: Values, { setSubmitting }: FormikActions<Values>) => {
25+
const submit = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
2626
createDirectory(uuid, directory, values.directoryName)
2727
.then(() => {
2828
pushFile({

‎resources/scripts/components/server/files/RenameFileModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import Modal, { RequiredModalProps } from '@/components/elements/Modal';
3-
import { Form, Formik, FormikActions } from 'formik';
3+
import { Form, Formik, FormikHelpers } from 'formik';
44
import Field from '@/components/elements/Field';
55
import { join } from 'path';
66
import renameFile from '@/api/server/files/renameFile';
@@ -19,7 +19,7 @@ export default ({ file, useMoveTerminology, ...props }: Props) => {
1919
const directory = ServerContext.useStoreState(state => state.files.directory);
2020
const { pushFile, removeFile } = ServerContext.useStoreActions(actions => actions.files);
2121

22-
const submit = (values: FormikValues, { setSubmitting }: FormikActions<FormikValues>) => {
22+
const submit = (values: FormikValues, { setSubmitting }: FormikHelpers<FormikValues>) => {
2323
const renameFrom = join(directory, file.name);
2424
const renameTo = join(directory, values.name);
2525

0 commit comments

Comments
 (0)