Remove redux-form as a dependency, change onSubmit errors from reject to resolve

Author: catarak

client/modules/IDE/actions/files.js

@@ -79,7 +79,7 @@ export function handleCreateFile(formProps) {
     const { files } = state;
     const { parentId } = state.ide;
     const projectId = state.project.id;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       submitFile(formProps, files, parentId, projectId).then((response) => {
         const { file, updatedAt } = response;
         dispatch(createFile(file, parentId));
@@ -90,7 +90,7 @@ export function handleCreateFile(formProps) {
       }).catch((error) => {
         const { response } = error;
         dispatch(createError(response.data));
-        reject();
+        resolve({ error });
       });
     });
   };
@@ -133,7 +133,7 @@ export function handleCreateFolder(formProps) {
     const { files } = state;
     const { parentId } = state.ide;
     const projectId = state.project.id;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       submitFolder(formProps, files, parentId, projectId).then((response) => {
         const { file, updatedAt } = response;
         dispatch(createFile(file, parentId));
@@ -144,7 +144,7 @@ export function handleCreateFolder(formProps) {
       }).catch((error) => {
         const { response } = error;
         dispatch(createError(response.data));
-        reject();
+        resolve({ error });
       });
     });
   };

client/modules/User/actions.js

@@ -52,7 +52,7 @@ export function validateAndLoginUser(formProps) {
   return (dispatch, getState) => {
     const state = getState();
     const { previousPath } = state.ide;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       loginUser(formProps)
         .then((response) => {
           dispatch(loginUserSuccess(response.data));
@@ -63,7 +63,7 @@ export function validateAndLoginUser(formProps) {
           resolve();
         })
         .catch(error =>
-          reject({ password: error.response.data.message, _error: 'Login failed!' })); // eslint-disable-line
+          resolve({ password: error.response.data.message, _error: 'Login failed!' }));
     });
   };
 }
@@ -72,7 +72,7 @@ export function validateAndSignUpUser(formValues) {
   return (dispatch, getState) => {
     const state = getState();
     const { previousPath } = state.ide;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       signUpUser(formValues)
         .then((response) => {
           dispatch(authenticateUser(response.data));
@@ -83,7 +83,7 @@ export function validateAndSignUpUser(formValues) {
         .catch((error) => {
           const { response } = error;
           dispatch(authError(response.data.error));
-          reject();
+          resolve({ error });
         });
     });
   };
@@ -144,7 +144,7 @@ export function logoutUser() {
 }
 
 export function initiateResetPassword(formValues) {
-  return dispatch => new Promise((resolve, reject) => {
+  return dispatch => new Promise((resolve) => {
     dispatch({
       type: ActionTypes.RESET_PASSWORD_INITIATE
     });
@@ -156,7 +156,7 @@ export function initiateResetPassword(formValues) {
           type: ActionTypes.ERROR,
           message: response.data
         });
-        reject();
+        resolve({ error });
       });
   });
 }
@@ -221,18 +221,18 @@ export function validateResetPasswordToken(token) {
 }
 
 export function updatePassword(formValues, token) {
-  return dispatch => new Promise((resolve, reject) =>
+  return dispatch => new Promise(resolve =>
     apiClient.post(`/reset-password/${token}`, formValues)
       .then((response) => {
         dispatch(loginUserSuccess(response.data));
         browserHistory.push('/');
         resolve();
       })
-      .catch(() => {
+      .catch((error) => {
         dispatch({
           type: ActionTypes.INVALID_RESET_PASSWORD_TOKEN
         });
-        reject();
+        resolve({ error });
       }));
 }
 
@@ -249,15 +249,15 @@ export function submitSettings(formValues) {
 
 export function updateSettings(formValues) {
   return dispatch =>
-    new Promise((resolve, reject) =>
+    new Promise(resolve =>
       submitSettings(formValues).then((response) => {
         dispatch(updateSettingsSuccess(response.data));
         dispatch(showToast(5500));
         dispatch(setToastText('Toast.SettingsSaved'));
         resolve();
       }).catch((error) => {
         const { response } = error;
-        reject(response.data.error);
+        resolve({ error });
       }));
 }
 

client/modules/User/components/ResetPasswordForm.jsx

@@ -11,15 +11,15 @@ function ResetPasswordForm(props) {
   const resetPasswordInitiate = useSelector(state => state.user.resetPasswordInitiate);
   const dispatch = useDispatch();
 
-  function submitInitiateResetPassword(formProps) {
+  function onSubmit(formProps) {
     dispatch(initiateResetPassword(formProps));
   }
 
   return (
     <Form
       fields={['email']}
       validate={validateResetPassword}
-      onSubmit={submitInitiateResetPassword}
+      onSubmit={onSubmit}
     >
       {({
         handleSubmit, submitting, pristine, invalid

client/reducers.js

@@ -1,5 +1,4 @@
 import { combineReducers } from 'redux';
-import { reducer as form } from 'redux-form';
 import files from './modules/IDE/reducers/files';
 import ide from './modules/IDE/reducers/ide';
 import preferences from './modules/IDE/reducers/preferences';
@@ -16,7 +15,6 @@ import loading from './modules/IDE/reducers/loading';
 import collections from './modules/IDE/reducers/collections';
 
 const rootReducer = combineReducers({
-  form,
   ide,
   files,
   preferences,

package-lock.json

@@ -214,7 +214,6 @@
     "redux-devtools": "^3.4.2",
     "redux-devtools-dock-monitor": "^1.1.3",
     "redux-devtools-log-monitor": "^1.4.0",
-    "redux-form": "^5.3.3",
     "redux-thunk": "^2.3.0",
     "request": "^2.88.2",
     "request-promise": "^4.2.5",