Merge branch 'dev' into feature/unified-permissions

Author: maxceem

src/projects/detail/ProjectDetail.jsx

@@ -190,8 +190,12 @@ class ProjectDetail extends Component {
       }
     }
 
-    // as soon as user profile settings are loaded, check if all required fields are completed or show the popup
-    if (this.props.profileSettings.isLoading && !profileSettings.isLoading && !isUserProfileComplete(nextProps.currentUser, profileSettings.settings)) {
+    // as soon as user profile settings and project are both loaded, check if all required fields are completed or show the popup
+    const profileSettingsJustLoaded = this.props.profileSettings.isLoading && !profileSettings.isLoading
+    const projectJustLoaded = this.props.isLoading && !isLoading
+    const timeToShowIncompleteProfile = !profileSettings.isLoading && !isLoading && (profileSettingsJustLoaded || projectJustLoaded)
+    const projectLoadingError = nextProps.error && (nextProps.error.type === LOAD_PROJECT_FAILURE || nextProps.error.type === ACCEPT_OR_REFUSE_INVITE_FAILURE)
+    if ( !projectLoadingError && timeToShowIncompleteProfile && !isUserProfileComplete(nextProps.currentUser, profileSettings.settings)) {
       this.setState({ showIncompleteProfilePopup: true })
     }
 

src/routes/settings/routes/profile/components/ProfileSettingsForm.jsx

@@ -47,8 +47,10 @@ class ProfileSettingsForm extends Component {
   }
 
   componentDidUpdate() {
+    // if we want to show validation errors on form showing
     if (this.refs.form && !this.isValidated && this.props.shouldDoValidateOnStart) {
-      this.refs.form.submit()
+      // we have to mark the form as not pristine, so validation errors are shown
+      this.refs.form.setFormPristine(false)
       this.isValidated = true
     }
   }
@@ -423,7 +425,7 @@ ProfileSettingsForm.defaultProps = {
 ProfileSettingsForm.propTypes = {
   values: PropTypes.object.isRequired,
   saveSettings: PropTypes.func.isRequired,
-  uploadPhoto: PropTypes.func.isRequired,
+  uploadPhoto: PropTypes.func,
   fieldsConfig: PropTypes.shape({
     avatar: PropTypes.bool,
     firstName: PropTypes.bool,