Merge branch 'dev'

Author: Parth Shah

package.json

@@ -45,6 +45,7 @@
     "lodash": "^4.16.4",
     "moment": "^2.14.1",
     "react": "^15.3.1",
+    "react-datetime": "2.7.1",
     "react-addons-css-transition-group": "^15.3.1",
     "react-addons-pure-render-mixin": "^15.3.1",
     "react-color": "^2.2.7",

src/components/LinksMenu/AddLink.jsx

@@ -34,18 +34,18 @@ class AddLink extends React.Component {
           <Formsy.Form onValidSubmit={onAdd} onValid={this.enableSubmitBtn} onInvalid={this.disableSubmitBtn}>
             <TCFormFields.TextInput
               name="title"
-              label="Title"
+              label="Name"
               type="text"
               validations="isRequired"
-              validationError="Title is required"
+              validationError="Name is required"
               maxLength={250}
               wrapperClass="form-group"
             />
             <TCFormFields.TextInput
               name="address"
-              label="Address"
+              label="URL"
               type="text"
-              validationError="This is a required field."
+              validationError="URL is required."
               validations={{
                 isRelaxedUrl: true,
                 isRequired: true

src/components/TeamManagement/AddTeamMember.jsx

@@ -3,7 +3,7 @@ import AutoCompleteInput from './AutoCompleteInput'
 import cn from 'classnames'
 import { Icons } from 'appirio-tech-react-components'
 import { PROJECT_ROLE_CUSTOMER } from '../../config/constants'
-
+import Scroll from 'react-scroll'
 
 const { XMarkIcon } = Icons
 
@@ -17,6 +17,7 @@ const AddTeamMember = (props) => {
   const onBtnClose = () => {
     onKeywordChange('')
     onToggleAddTeamMember(false)
+    Scroll.animateScroll.scrollMore(1)
   }
   const onConfirmAddMember = () => {
     // if adding a customer and there is no owner yet for the project

src/components/TeamManagement/AutoCompleteInput.jsx

@@ -63,6 +63,7 @@ class AutoCompleteInput extends React.Component {
           {selectedNewMember && <img src={selectedNewMember.photoURL} />}
         </span>
         <input
+          autoFocus
           ref="input"
           value={keyword}
           className="tc-file-field__inputs"

src/components/TopBar/TopBar.jsx

@@ -32,8 +32,8 @@ class TopBar extends Component {
   }
   /*eslint-enable */
 
-  handleSearch(name) {
-    this.props.applyFilters({ name })
+  handleSearch(keyword) {
+    this.props.applyFilters({ keyword })
   }
 
   handleMyProjectsFilter(event) {
@@ -107,7 +107,7 @@ class TopBar extends Component {
                 <SearchBar
                   hideSuggestionsWhenEmpty
                   showPopularSearchHeader={ false }
-                  searchTermKey="name"
+                  searchTermKey="keyword"
                   onTermChange={ this.handleTermChange }
                   onSearch={ this.handleSearch }
                   onClearSearch={ this.handleSearch }

src/components/TopBar/TopBarContainer.js

@@ -78,8 +78,8 @@ class TopBarContainer extends React.Component {
 
   applyFilters(filter) {
     const criteria = _.assign({}, this.props.criteria, filter)
-    if (criteria && criteria.name)
-      criteria.name = encodeURIComponent(criteria.name)
+    if (criteria && criteria.keyword)
+      criteria.keyword = encodeURIComponent(criteria.keyword)
     this.routeWithParams(criteria, 1)
   }
 

src/projects/actions/projectTopics.js

@@ -62,7 +62,7 @@ const getTopicsWithComments = (projectId, tag) => {
       return Promise.all(additionalPosts)
         .then(postArr => {
           _.forEach(postArr, (p) => {
-            const topic = _.find(topics, t => p.topicId)
+            const topic = _.find(topics, t => t.id === p.topicId)
             topic.posts = _.sortBy(topic.posts.concat(p.posts), ['id'])
           })
           return { topics, totalCount }

src/projects/detail/components/EditProjectForm.jsx

@@ -1,4 +1,5 @@
 import React, { Component, PropTypes } from 'react'
+import { withRouter } from 'react-router'
 import Modal from 'react-modal'
 import _ from 'lodash'
 import update from 'react-addons-update'
@@ -18,6 +19,7 @@ class EditProjectForm extends Component {
     this.saveFeatures = this.saveFeatures.bind(this)
     this.onFeaturesSaveAttachedClick = this.onFeaturesSaveAttachedClick.bind(this)
     this.submit = this.submit.bind(this)
+    this.onLeave = this.onLeave.bind(this)
   }
 
   componentWillMount() {
@@ -37,11 +39,33 @@ class EditProjectForm extends Component {
     }
     this.setState({
       project: updatedProject,
-      canSubmit: this.state.isFeaturesDirty,
+      isFeaturesDirty: false, // Since we just saved, features are not dirty anymore.
+      canSubmit: false,
       isSaving: false
     })
   }
 
+  componentDidMount() {
+    this.props.router.setRouteLeaveHook(this.props.route, this.onLeave)
+    window.addEventListener('beforeunload', this.onLeave)
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('beforeunload', this.onLeave)
+  }
+
+  // Notify user if they navigate away while the form is modified.
+  onLeave(e) {
+    if (this.isChanged()) {
+      return e.returnValue = 'You have unsaved changes. Are you sure you want to leave?'
+    }
+  }
+
+  isChanged() {
+    // We check if this.refs.form exists because this may be called before the
+    // first render, in which case it will be undefined.
+    return (this.refs.form && this.refs.form.isChanged()) || this.state.isFeaturesDirty
+  }
 
   enableButton() {
     this.setState( { canSubmit: true })
@@ -102,7 +126,7 @@ class EditProjectForm extends Component {
         />
         <div className="section-footer section-footer-spec">
           <button className="tc-btn tc-btn-primary tc-btn-md"
-            type="submit" disabled={!this.state.canSubmit || this.state.isSaving }
+            type="submit" disabled={!this.isChanged() || this.state.isSaving}
           >Save Changes</button>
         </div>
       </div>
@@ -146,4 +170,4 @@ EditProjectForm.propTypes = {
   submitHandler: PropTypes.func.isRequired
 }
 
-export default EditProjectForm
+export default withRouter(EditProjectForm)

src/projects/detail/containers/SpecificationContainer.jsx

@@ -67,6 +67,7 @@ class SpecificationContainer extends Component {
               isEdittable={!!currentMemberRole}
               submitHandler={this.saveProject}
               saving={processing}
+              route={this.props.route}
             />
           </div>
 

src/projects/list/components/Projects/Projects.jsx

@@ -24,7 +24,7 @@ class Projects extends Component {
     if (!_.isEmpty(queryParams)) {
       const initialCriteria = {}
       if (queryParams.sort) initialCriteria.sort = queryParams.sort
-      if (queryParams.name) initialCriteria.name = decodeURIComponent(queryParams.name)
+      if (queryParams.keyword) initialCriteria.keyword = decodeURIComponent(queryParams.keyword)
       if (queryParams.status) initialCriteria.status = queryParams.status
       if (queryParams.type) initialCriteria.type = queryParams.type
       if (queryParams.memberOnly) initialCriteria.memberOnly = queryParams.memberOnly