From fbb8311af7ffd982ff7e346d7152e6e7ec85514c Mon Sep 17 00:00:00 2001
From: Valeriy <ValeraS@users.noreply.github.com>
Date: Mon, 17 Jun 2019 23:40:47 +0300
Subject: [PATCH] fix(client):format url values on form submit

---
 client/src/components/formHelpers/Form.js     | 11 +++-
 client/src/components/formHelpers/index.js    | 10 ++++
 .../src/templates/Challenges/backend/Show.js  | 55 +++++++------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/client/src/components/formHelpers/Form.js b/client/src/components/formHelpers/Form.js
index 76bf71d5ab..53fafbdff9 100644
--- a/client/src/components/formHelpers/Form.js
+++ b/client/src/components/formHelpers/Form.js
@@ -2,7 +2,12 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { reduxForm } from 'redux-form';
 
-import { FormFields, BlockSaveButton, BlockSaveWrapper } from './';
+import {
+  FormFields,
+  BlockSaveButton,
+  BlockSaveWrapper,
+  formatUrlValues
+} from './';
 
 const propTypes = {
   buttonText: PropTypes.string,
@@ -48,7 +53,9 @@ export function DynamicForm({
   return (
     <form
       id={`dynamic-${id}`}
-      onSubmit={handleSubmit(submit)}
+      onSubmit={handleSubmit((values, ...args) =>
+        submit(formatUrlValues(values, options), ...args)
+      )}
       style={{ width: '100%' }}
     >
       <FormFields
diff --git a/client/src/components/formHelpers/index.js b/client/src/components/formHelpers/index.js
index ec9c9e182c..52c5b07b9b 100644
--- a/client/src/components/formHelpers/index.js
+++ b/client/src/components/formHelpers/index.js
@@ -15,6 +15,16 @@ export function callIfDefined(fn) {
   return value => (value ? fn(value) : value);
 }
 
+export function formatUrlValues(values, options) {
+  return Object.keys(values).reduce((result, key) => {
+    let value = values[key];
+    if (options.types[key] === 'url') {
+      value = normalizeUrl(value, normalizeOptions);
+    }
+    return { ...result, [key]: value };
+  }, {});
+}
+
 // formatUrl(url: String) => String
 export function formatUrl(url) {
   if (typeof url === 'string' && url.length > 4 && url.indexOf('.') !== -1) {
diff --git a/client/src/templates/Challenges/backend/Show.js b/client/src/templates/Challenges/backend/Show.js
index 144f306f38..cafbf692b9 100644
--- a/client/src/templates/Challenges/backend/Show.js
+++ b/client/src/templates/Challenges/backend/Show.js
@@ -2,9 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Grid, Col, Row } from '@freecodecamp/react-bootstrap';
 import { createSelector } from 'reselect';
-import { reduxForm } from 'redux-form';
+import { connect } from 'react-redux';
 import { graphql } from 'gatsby';
-import normalizeUrl from 'normalize-url';
 
 import {
   executeChallenge,
@@ -28,53 +27,44 @@ import CompletionModal from '../components/CompletionModal';
 import HelpModal from '../components/HelpModal';
 import ProjectToolPanel from '../project/Tool-Panel';
 import ProjectForm from '../project/ProjectForm';
-import {
-  createFormValidator,
-  isValidURL,
-  makeRequired,
-  Form
-} from '../../../components/formHelpers';
+import { Form } from '../../../components/formHelpers';
 import Spacer from '../../../components/helpers/Spacer';
+import { ChallengeNode } from '../../../redux/propTypes';
+import { isSignedInSelector } from '../../../redux';
 
 import { backend } from '../../../../utils/challengeTypes';
 
 import '../components/test-frame.css';
 
-// provided by redux form
-const reduxFormPropTypes = {
-  fields: PropTypes.object,
-  handleSubmit: PropTypes.func.isRequired,
-  resetForm: PropTypes.func.isRequired,
-  submitting: PropTypes.bool
-};
-
 const propTypes = {
   challengeMounted: PropTypes.func.isRequired,
+  data: PropTypes.shape({
+    challengeNode: ChallengeNode
+  }),
   description: PropTypes.string,
   executeChallenge: PropTypes.func.isRequired,
   id: PropTypes.string,
   initTests: PropTypes.func.isRequired,
+  isSignedIn: PropTypes.bool,
   output: PropTypes.string,
+  pageContext: PropTypes.shape({
+    challengeMeta: PropTypes.object
+  }),
   tests: PropTypes.array,
   title: PropTypes.string,
   updateBackendFormValues: PropTypes.func.isRequired,
   updateChallengeMeta: PropTypes.func.isRequired,
-  updateProjectFormValues: PropTypes.func.isRequired,
-  ...reduxFormPropTypes
-};
-
-const fields = ['solution'];
-
-const fieldValidators = {
-  solution: makeRequired(isValidURL)
+  updateProjectFormValues: PropTypes.func.isRequired
 };
 
 const mapStateToProps = createSelector(
   consoleOutputSelector,
   challengeTestsSelector,
-  (output, tests) => ({
+  isSignedInSelector,
+  (output, tests, isSignedIn) => ({
     tests,
-    output
+    output,
+    isSignedIn
   })
 );
 
@@ -158,7 +148,6 @@ export class BackEnd extends Component {
 
   handleSubmit(values) {
     const { updateBackendFormValues, executeChallenge } = this.props;
-    values.solution = normalizeUrl(values.solution);
     updateBackendFormValues(values);
     executeChallenge();
   }
@@ -176,13 +165,12 @@ export class BackEnd extends Component {
       },
       output,
       tests,
-      submitting,
+      isSignedIn,
       executeChallenge,
       updateProjectFormValues
     } = this.props;
 
-    // TODO: Should be tied to user.isSignedIn
-    const buttonCopy = submitting
+    const buttonCopy = isSignedIn
       ? 'Submit and go to my next challenge'
       : "I've completed this challenge";
     const blockNameTitle = `${blockName} - ${title}`;
@@ -242,12 +230,7 @@ export class BackEnd extends Component {
 BackEnd.displayName = 'BackEnd';
 BackEnd.propTypes = propTypes;
 
-export default reduxForm(
-  {
-    form: 'BackEndChallenge',
-    fields,
-    validate: createFormValidator(fieldValidators)
-  },
+export default connect(
   mapStateToProps,
   mapDispatchToActions
 )(BackEnd);