Merge branch 'dev' into feature/bulk-milestone-updates

Author: Maksym Mykhailenko

config/constants/dev.js

@@ -49,4 +49,5 @@ module.exports = {
   TC_SYSTEM_USERID: process.env.DEV_TC_SYSTEM_USERID,
   MAINTENANCE_MODE: process.env.DEV_MAINTENANCE_MODE,
 
+  TC_CDN_URL: process.env.TC_CDN_URL
 }

config/constants/master.js

@@ -49,4 +49,5 @@ module.exports = {
   TC_SYSTEM_USERID: process.env.PROD_TC_SYSTEM_USERID,
   MAINTENANCE_MODE: process.env.PROD_MAINTENANCE_MODE,
 
+  TC_CDN_URL: process.env.TC_CDN_URL
 }

config/constants/qa.js

@@ -15,7 +15,7 @@ module.exports = {
   ENV               : 'QA',
 
   PROJECTS_API_URL  : 'http://api.topcoder-dev.com',
-  
+
   NEW_RELIC_APPLICATION_ID: process.env.TRAVIS_BRANCH ? '11199233' : '',
 
   ARENA_URL          : '//arena.topcoder-qa.com',
@@ -47,4 +47,6 @@ module.exports = {
   CONNECT_MESSAGE_API_URL: 'https://api.topcoder-qa.com/v5',
   TC_SYSTEM_USERID: process.env.QA_TC_SYSTEM_USERID,
   MAINTENANCE_MODE: process.env.QA_MAINTENANCE_MODE,
+
+  TC_CDN_URL: process.env.TC_CDN_URL
 }

src/components/PositiveNumberInput/PositiveNumberInput.jsx

@@ -7,10 +7,12 @@ class PositiveNumberInput extends React.PureComponent {
     super(props)
 
     this.isInputValid = true
+    this.previousValue = props.value || ''
 
     this.onKeyDown = this.onKeyDown.bind(this)
     this.onPaste = this.onPaste.bind(this)
     this.onKeyUp = this.onKeyUp.bind(this)
+    this.onChange = this.onChange.bind(this)
   }
 
   onKeyDown(evt) {
@@ -44,26 +46,62 @@ class PositiveNumberInput extends React.PureComponent {
     this.props.onKeyUp(evt)
   }
 
+  onChange(evt) {
+    const { onChange } = this.props
+
+    this.enforceInputBelowMax(evt)
+    onChange(evt)
+  }
+
+  /**
+   * Makes sure the input value is kept below the max value
+   * @param {Event} evt The change event
+   */
+  enforceInputBelowMax(evt) {
+    const value = evt.target.value
+    if (this.isBelowMaxLimit(value)) {
+      this.previousValue = value
+    } else {
+      evt.target.value = this.previousValue
+    }
+  }
+
+  isBelowMaxLimit(text) {
+    const { max = Infinity } = this.props
+    return Number(text) <= max
+  }
+
   render() {
     const props = omit(this.props, ['onValidityChange'])
-    return <input type="number" min={0} {...props} onKeyDown={this.onKeyDown} onPaste={this.onPaste} onKeyUp={this.onKeyUp} />
+    return (
+      <input
+        type="number"
+        min={0}
+        {...props}
+        onKeyDown={this.onKeyDown}
+        onPaste={this.onPaste}
+        onKeyUp={this.onKeyUp}
+        onChange={this.onChange}
+      />
+    )
   }
 }
 
 PositiveNumberInput.defaultProps = {
   onKeyDown: noop,
   onPaste: noop,
   onKeyUp: noop,
-  onValidityChange: noop
-
+  onValidityChange: noop,
+  onChange: noop,
 }
 
 PositiveNumberInput.propTypes = {
+  max: PT.number,
   onKeyDown: PT.func,
   onPaste: PT.func,
   onKeyUp: PT.func,
-  onValidityChange: PT.func
+  onValidityChange: PT.func,
+  onChange: PT.func,
 }
 
-
 export default PositiveNumberInput

src/config/constants.js

@@ -715,7 +715,7 @@ export const SALESFORCE_PROJECT_LEAD_LINK = process.env.SALESFORCE_PROJECT_LEAD_
 // export const TC_NOTIFICATION_URL = process.env.TC_NOTIFICATION_URL || `${TC_API_URL}/v5/notifications`
 export const TC_NOTIFICATION_URL = 'https://dev.maxceem.com/v5/notifications'
 
-export const TC_CDN_URL = process.env.NODE_ENV === 'development' ? 'https://d1aahxkjiobka8.cloudfront.net' : 'https://d2nl5eqipnb33q.cloudfront.net'
+export const TC_CDN_URL = process.env.TC_CDN_URL || `https://community-app.${DOMAIN}/api/cdn/public`
 
 export const RESET_PASSWORD_URL = `https://accounts.${DOMAIN}/connect/reset-password`
 export const VERIFY_EMAIL_URL = `http://www.${DOMAIN}/settings/account/changeEmail`

src/projects/detail/components/TalentPickerRow/TalentPickerRow.jsx

@@ -100,9 +100,9 @@ class TalentPickerRow extends React.PureComponent {
           People
         </label>
         <PositiveNumberInput
-          type="number"
           styleName="noMargin"
           className={cn('tc-file-field__inputs', { error: isRowIncomplete && value.people <= 0 })}
+          max={10000}
           value={value.people || ''}
           onChange={this.handlePeopleChange}
           onBlur={this.resetPeople}
@@ -116,9 +116,9 @@ class TalentPickerRow extends React.PureComponent {
           Duration (months)
         </label>
         <PositiveNumberInput
-          type="number"
           styleName="noMargin"
           className={cn('tc-file-field__inputs', {error: isRowIncomplete && value.duration <= 0 })}
+          max={10000}
           value={value.duration || ''}
           onChange={this.handleDurationChange}
           onBlur={this.resetDuration}