Merge branch 'release/v1.1.1'

Author: Vikas Agarwal

package.json

@@ -39,6 +39,7 @@
     "fbemitter": "^2.1.1",
     "filepicker-js": "^2.4.17",
     "filesize": "^3.3.0",
+    "flat": "^2.0.1",
     "formsy-react": "^0.18.1",
     "history": "^1.17.0",
     "isomorphic-fetch": "^2.2.1",

src/components/ConnectTerms/ConnectTerms.jsx

@@ -8,7 +8,7 @@ const ConnectTerms = () => (
       <h1>Terms</h1>
       <p>This User Agreement (the "<strong>Agreement</strong>") is a contract between you (referred to herein as "<strong>User</strong>") and Topcoder Inc. ("Topcoder") and applies to User's use and viewing of <a href="http://connect.topcoder.com">connect.topcoder.com</a> and related sub-domains ("<strong>Topcoder Connect</strong>") and all services available through Topcoder Connect (the "<strong>Services</strong>"). By visiting Topcoder Connect, User has accepted this Agreement and has agreed to be bound by the terms of this Agreement. Any Custom Software ordered (as defined below) or Services used through Topcoder Connect are also governed by these Terms. Topcoder may amend this Agreement at any time by posting a revised version on Topcoder Connect. The revised version will be effective at the time Topcoder posts it.</p>
       <h2>1. Services and Specifications.</h2>
-      <p>The Services provide for the creation of certain types of mock-ups, prototypes, and application development of computer software applications (the "<b>Deliverables</b>") through Topcoder's crowdsourcing platform (as defined below) through a Topcoder representative or co-pilot (referred to herein as a "<b>User Success Manager</b>"), as further described on Topcoder Connect. To utilize the Services, User has provided specifications with respect to the Deliverables in reasonable detail as prompted in several fields on webpages associated with Topcoder Connect where the User was requested to enter information regarding the intended Deliverable (such information, the "<b>Preliminary Specifications</b>"). After payment of Project Fees (as defined below) associated with the Deliverable, a User Success Manager shall contact User to gather additional information regarding the Deliverables, as may be necessary in Topcoder's sole discretion. Topcoder and User shall mutually agree on a final set of specifications, which shall be referred to herein as the "<b>Specifications</b>". To the extent the parties are not able to reach agreement on the Specifications, including, but not limited to situations where the information provided by User is insufficient to create Specifications or the Preliminary Specifications are outside the scope of the services described on Topcoder Connect, Topcoder shall refund to User any Project Fees paid by User and Topcoder shall have no further liability or obligations under this Agreement.</p>
+      <p>The Services provide for the creation of certain types of mock-ups, prototypes, and application development of computer software applications (the "<b>Deliverables</b>") through Topcoder's crowdsourcing platform (as defined below) through a Topcoder representative or co-pilot (referred to herein as a "<b>User Success Manager</b>"), as further described on Topcoder Connect. To utilize the Services, User has provided specifications with respect to the Deliverables in reasonable detail as prompted in several fields on webpages associated with Topcoder Connect where the User was requested to enter information regarding the intended Deliverable (such information, the "<b>Preliminary Specifications</b>"). After payment of Project Fees (as defined below) associated with the Deliverable, a User Success Manager shall contact User to gather additional information regarding the Deliverables, as may be necessary in Topcoder's sole discretion. Topcoder and User shall mutually agree on a final set of specifications, which shall be referred to herein as the "<b>Specifications</b>". As part of this process, Topcoder may provide services to User on an hourly basis. To the extent the parties are not able to reach agreement on the Specifications, including, but not limited to situations where the information provided by User is insufficient to create Specifications or the Preliminary Specifications are outside the scope of the services described on Topcoder Connect, Topcoder shall refund to User any Project Fees paid by User (excluding fees associated with hourly services previously provided) and Topcoder shall have no further liability or obligations under this Agreement.</p>
       <h2>2. Definitions.</h2>
       <p>For the purposes of this Agreement, the following capitalized terms have the meanings assigned to them in this Section 2. Any capitalized terms used in this Agreement but not otherwise defined in this Section shall have the meanings assigned to them elsewhere in this Agreement.</p>
       <ul>

src/components/TextInput/TextInput.scss

@@ -45,6 +45,11 @@
     border-bottom: 1px solid $tc-gray-40;
     color: $tc-gray-30;
   }
+  &.error{
+    border-left: 3px solid $tc-red-70!important;
+    border-bottom: 1px solid $tc-red-70!important;
+    background: $tc-gray-neutral-light!important;
+  }
 }
 
 .input-lg,

src/config/constants.js

@@ -100,6 +100,9 @@ export const UPDATE_PROJECT_PENDING   = 'UPDATE_PROJECT_PENDING'
 export const UPDATE_PROJECT_SUCCESS   = 'UPDATE_PROJECT_SUCCESS'
 export const UPDATE_PROJECT_FAILURE   = 'UPDATE_PROJECT_FAILURE'
 
+export const PROJECT_DIRTY            = 'PROJECT_DIRTY'
+export const PROJECT_DIRTY_UNDO       = 'PROJECT_DIRTY_UNDO'
+
 export const LOAD_MEMBERS             = 'LOAD_MEMBERS'
 export const LOAD_MEMBERS_PENDING     = 'LOAD_MEMBERS_PENDING'
 export const LOAD_MEMBERS_SUCCESS     = 'LOAD_MEMBERS_SUCCESS'

src/projects/actions/project.js

@@ -3,7 +3,7 @@ import { getProjectById, createProject as createProjectAPI,
   deleteProject as deleteProjectAPI,
   getDirectProjectData } from '../../api/projects'
 import { LOAD_PROJECT, CREATE_PROJECT, CLEAR_LOADED_PROJECT, UPDATE_PROJECT,
-  LOAD_DIRECT_PROJECT, DELETE_PROJECT } from '../../config/constants'
+  LOAD_DIRECT_PROJECT, DELETE_PROJECT, PROJECT_DIRTY, PROJECT_DIRTY_UNDO } from '../../config/constants'
 
 
 export function loadProject(projectId) {
@@ -58,3 +58,21 @@ export function loadDirectProjectData(directProjectId) {
     })
   }
 }
+
+export function fireProjectDirty(dirtyProject) {
+  return (dispatch) => {
+    return dispatch({
+      type: PROJECT_DIRTY,
+      payload: dirtyProject
+
+    })
+  }
+}
+
+export function fireProjectDirtyUndo() {
+  return (dispatch) => {
+    return dispatch({
+      type: PROJECT_DIRTY_UNDO
+    })
+  }
+}

src/projects/detail/components/EditProjectForm.jsx

@@ -20,6 +20,7 @@ class EditProjectForm extends Component {
     this.onFeaturesSaveAttachedClick = this.onFeaturesSaveAttachedClick.bind(this)
     this.submit = this.submit.bind(this)
     this.onLeave = this.onLeave.bind(this)
+    this.handleChange = this.handleChange.bind(this)
   }
 
   componentWillMount() {
@@ -33,6 +34,8 @@ class EditProjectForm extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
+    // we receipt property updates from PROJECT_DIRTY REDUX state
+    if (nextProps.project.isDirty) return
     let updatedProject = Object.assign({}, nextProps.project)
     if (this.state.isFeaturesDirty && !this.state.isSaving) {
       updatedProject = update(updatedProject, {
@@ -59,6 +62,7 @@ class EditProjectForm extends Component {
   }
 
   componentWillUnmount() {
+    this.props.fireProjectDirtyUndo()
     window.removeEventListener('beforeunload', this.onLeave)
   }
 
@@ -131,6 +135,17 @@ class EditProjectForm extends Component {
     this.props.submitHandler(model)
   }
 
+  /**
+   * Handles the change event of the form.
+   *
+   * @param change changed form model in flattened form
+   * @param isChanged flag that indicates if form actually changed from initial model values
+   */
+  handleChange(change) {
+    // removed check for isChanged argument to fire the PROJECT_DIRTY event for every change in the form
+    this.props.fireProjectDirty(change)
+  }
+
 
   render() {
     const { isEdittable, sections } = this.props
@@ -165,6 +180,7 @@ class EditProjectForm extends Component {
           onInvalid={this.disableButton}
           onValid={this.enableButton}
           onValidSubmit={this.submit}
+          onChange={ this.handleChange }
         >
           {sections.map(renderSection)}
         </Formsy.Form>
@@ -192,7 +208,9 @@ EditProjectForm.propTypes = {
   saving: PropTypes.bool.isRequired,
   sections: PropTypes.arrayOf(PropTypes.object).isRequired,
   isEdittable: PropTypes.bool.isRequired,
-  submitHandler: PropTypes.func.isRequired
+  submitHandler: PropTypes.func.isRequired,
+  fireProjectDirty: PropTypes.func.isRequired,
+  fireProjectDirtyUndo: PropTypes.func.isRequired
 }
 
 export default withRouter(EditProjectForm)

src/projects/detail/containers/ProjectInfoContainer.js

@@ -124,7 +124,7 @@ class ProjectInfoContainer extends React.Component {
       if (project.directProjectId) {
         directLinks.push({name: 'Project in Topcoder Direct', href: `${DIRECT_PROJECT_URL}${project.directProjectId}`})
       } else {
-        directLinks.push({name: 'No Direct project created. Please contact support.', href: 'mailto:[email protected]'})
+        directLinks.push({name: 'Direct project not linked. Contact support.', href: 'mailto:[email protected]'})
       }
       directLinks.push({name: 'Salesforce Lead', href: `${SALESFORCE_PROJECT_LEAD_LINK}${project.id}`})
     }

src/projects/detail/containers/SpecificationContainer.jsx

@@ -8,7 +8,7 @@ import Sticky from 'react-stickynode'
 import ProjectSpecSidebar from '../components/ProjectSpecSidebar'
 import FooterV2 from '../../../components/FooterV2/FooterV2'
 import EditProjectForm from '../components/EditProjectForm'
-import { updateProject } from '../../actions/project'
+import { updateProject, fireProjectDirty, fireProjectDirtyUndo } from '../../actions/project'
 import spinnerWhileLoading from '../../../components/LoadingSpinner'
 // import { Icons } from 'appirio-tech-react-components'
 import typeToSpecification from '../../../config/projectSpecification/typeToSpecification'
@@ -73,6 +73,8 @@ class SpecificationContainer extends Component {
               submitHandler={this.saveProject}
               saving={processing}
               route={this.props.route}
+              fireProjectDirty={ this.props.fireProjectDirty }
+              fireProjectDirtyUndo= { this.props.fireProjectDirtyUndo }
             />
           </div>
 
@@ -100,6 +102,6 @@ const mapStateToProps = ({projectState, loadUser}) => {
   }
 }
 
-const mapDispatchToProps = { updateProject }
+const mapDispatchToProps = { updateProject, fireProjectDirty, fireProjectDirtyUndo }
 
 export default connect(mapStateToProps, mapDispatchToProps)(SpecificationContainer)

src/projects/reducers/project.js

@@ -1,4 +1,4 @@
-
+import { unflatten } from 'flat'
 import {
   LOAD_PROJECT_PENDING, LOAD_PROJECT_SUCCESS, LOAD_PROJECT_FAILURE, LOAD_DIRECT_PROJECT_SUCCESS,
   CREATE_PROJECT_PENDING, CREATE_PROJECT_SUCCESS, CREATE_PROJECT_FAILURE, CLEAR_LOADED_PROJECT,
@@ -10,7 +10,7 @@ import {
   ADD_PROJECT_MEMBER_PENDING, ADD_PROJECT_MEMBER_SUCCESS, ADD_PROJECT_MEMBER_FAILURE,
   UPDATE_PROJECT_MEMBER_PENDING, UPDATE_PROJECT_MEMBER_SUCCESS, UPDATE_PROJECT_MEMBER_FAILURE,
   REMOVE_PROJECT_MEMBER_PENDING, REMOVE_PROJECT_MEMBER_SUCCESS, REMOVE_PROJECT_MEMBER_FAILURE,
-  GET_PROJECTS_SUCCESS
+  GET_PROJECTS_SUCCESS, PROJECT_DIRTY, PROJECT_DIRTY_UNDO
 } from '../../config/constants'
 import _ from 'lodash'
 import update from 'react-addons-update'
@@ -47,6 +47,7 @@ export const projectState = function (state=initialState, action) {
     return Object.assign({}, state, {
       isLoading: false,
       project: action.payload,
+      projectNonDirty: _.cloneDeep(action.payload),
       lastUpdated: new Date()
     })
 
@@ -87,7 +88,8 @@ export const projectState = function (state=initialState, action) {
     return Object.assign({}, state, {
       processing: false,
       error: false,
-      project: action.payload
+      project: action.payload,
+      projectNonDirty: _.cloneDeep(action.payload)
     })
 
   case DELETE_PROJECT_SUCCESS:
@@ -167,6 +169,18 @@ export const projectState = function (state=initialState, action) {
     })
   }
 
+  case PROJECT_DIRTY: {
+    return Object.assign({}, state, {
+      project: _.merge({}, state.project, unflatten(action.payload), { isDirty : true})
+    })
+  }
+
+  case PROJECT_DIRTY_UNDO: {
+    return Object.assign({}, state, {
+      project: _.cloneDeep(state.projectNonDirty)
+    })
+  }
+
   case LOAD_PROJECT_FAILURE:
   case CREATE_PROJECT_FAILURE:
   case DELETE_PROJECT_FAILURE: