topcoder-archive · RishiRajSahu · May 28, 2020 · Apr 30, 2020 · May 4, 2020 · May 4, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -136,7 +136,7 @@ workflows:
             - build-dev
           filters:
             branches:
-              only: ['feature/permissions']
+              only: ['feature/bulk-milestone-updates']
 
       - deployProd:
           context : org-global

diff --git a/config/constants/dev.js b/config/constants/dev.js
@@ -49,5 +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 || 'https://d1aahxkjiobka8.cloudfront.net'
+  TC_CDN_URL: process.env.TC_CDN_URL
 }
diff --git a/config/constants/master.js b/config/constants/master.js
@@ -49,5 +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 || 'https://dlxczxztayxv6.cloudfront.net'
+  TC_CDN_URL: process.env.TC_CDN_URL
 }
diff --git a/config/constants/qa.js b/config/constants/qa.js
@@ -48,5 +48,5 @@ module.exports = {
   TC_SYSTEM_USERID: process.env.QA_TC_SYSTEM_USERID,
   MAINTENANCE_MODE: process.env.QA_MAINTENANCE_MODE,
 
-  TC_CDN_URL: process.env.TC_CDN_URL || 'https://d1aahxkjiobka8.cloudfront.net'
+  TC_CDN_URL: process.env.TC_CDN_URL
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
   },
   "dependencies": {
     "appirio-tech-react-components": "git+https://github.com/appirio-tech/react-components.git#feature/connectv2",
-    "axios": "^0.13.1",
+    "axios": "^0.19.2",
     "brace": "^0.11.1",
     "classnames": "^2.2.3",
     "coffeescript": "^1.12.7",

diff --git a/scripts/permissions-doc/webpack.config.js b/scripts/permissions-doc/webpack.config.js
@@ -21,6 +21,7 @@ webpackConfig.module.rules.push({
 
 webpackConfig.plugins = []
 
-console.log('webpackConfig', JSON.stringify(webpackConfig, null, 2))
+// Uncomment for debugging the final webpack config
+// console.log('webpackConfig', JSON.stringify(webpackConfig, null, 2))
 
 module.exports = webpackConfig
diff --git a/src/actions/loadUser.js b/src/actions/loadUser.js
@@ -54,6 +54,8 @@ export function loadUserSuccess(dispatch, token) {
     currentUser.id = currentUser.userId
     currentUser.token = token
   }
+  // uncomment to add admin role to the user for testing admin functionality locally
+  // currentUser.roles.push('administrator')
   if (currentUser) {
     getUserProfile(currentUser.handle).then((profile) => {
       currentUser = _.assign(currentUser, profile)

diff --git a/src/api/timelines.js b/src/api/timelines.js
@@ -53,6 +53,19 @@ export function updateMilestone(timelineId, milestoneId, updatedProps) {
     .then(resp => resp.data)
 }
 
+/**
+ * Bulk update milestones
+ *
+ * @param {Number} timelineId   timeline id
+ * @param {Array<{}>} milestones  the timeline's milestones
+ *
+ * @returns {Promise} milestones
+ */
+export function updateMilestones(timelineId, milestones) {
+  return axios.patch(`${PROJECTS_API_URL}/v5/timelines/${timelineId}/milestones`, milestones)
+    .then(resp => resp.data)
+}
+
 /**
  * Get milestone templates by product template id
  *

diff --git a/src/components/ProjectInfo/ProjectInfo.jsx b/src/components/ProjectInfo/ProjectInfo.jsx
@@ -11,7 +11,9 @@ import { SCREEN_BREAKPOINT_MD, PROJECT_STATUS_ACTIVE, PHASE_STATUS_ACTIVE, PHASE
 import ReviewProjectButton from '../../projects/detail/components/ReviewProjectButton'
 import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip'
 import { TOOLTIP_DEFAULT_DELAY } from '../../config/constants'
+import { getProjectTemplateByKey } from '../../helpers/templates'
 
+import ProjectTypeIcon from '../../components/ProjectTypeIcon'
 import './ProjectInfo.scss'
 
 class ProjectInfo extends Component {
@@ -23,7 +25,7 @@ class ProjectInfo extends Component {
   render() {
     const { project, currentMemberRole,
       onChangeStatus, isSuperUser, phases, onSubmitForReview, isProjectProcessing,
-      showDeleteConfirm, toggleProjectDelete, onConfirmDelete } = this.props
+      showDeleteConfirm, toggleProjectDelete, onConfirmDelete, projectTemplates } = this.props
 
     const code = _.get(project, 'details.utm.code', '')
 
@@ -50,29 +52,47 @@ class ProjectInfo extends Component {
       </div>
     )
 
+    const url = `/projects/${project.id}`
+    const projectTemplateId = project.templateId
+    const projectTemplateKey = _.get(project, 'details.products[0]')
+    const projectTemplate = projectTemplateId
+      ? _.find(projectTemplates, pt => pt.id === projectTemplateId)
+      : getProjectTemplateByKey(projectTemplates, projectTemplateKey)
+    // icon for the product, use default generic work project icon for categories which no longer exist now
+    const productIcon = _.get(projectTemplate, 'icon', 'tech-32px-outline-work-project')
+    const templateName = _.get(projectTemplate, 'name', null)
+    const projectType = project.type !== undefined ? project.type[0].toUpperCase() + project.type.substr(1).replace(/_/g, ' ') : null
     return (
       <div className="project-info">
-        <div className="project-status">
-          <div styleName="project-name">{_.unescape(project.name)}</div>
-
-          <div styleName="project-status-bottom">
-            <div className="project-status-time">
-              Created {moment(project.createdAt).format('MMM DD, YYYY')}
-            </div>
-            {!!code &&
-            <div styleName="tooltip-target-container">
-              <Tooltip styleName="tooltip" theme="light" tooltipDelay={TOOLTIP_DEFAULT_DELAY}>
-                <div className="tooltip-target">
-                  <div className="project-status-ref">{_.unescape(code)}</div>
-                </div>
-                <div className="tooltip-body">
-                  <div>{_.unescape(code)}</div>
-                </div>
-              </Tooltip>
-            </div>
-
-            }
+        <div className="icon-and-status" >
+          <div className="item-icon">
+            <Link to={url} className="spacing">
+              <div className="project-type-icon" title={templateName ? templateName : projectType}>
+                <ProjectTypeIcon type={productIcon} />
+              </div>
+            </Link>
           </div>
+          <div className="project-status">
+            <div styleName="project-name">{_.unescape(project.name)}</div>
+          </div>
+        </div>
+        <div styleName="project-status-bottom">
+          <div className="project-status-time">
+            Created {moment(project.createdAt).format('MMM DD, YYYY')}
+          </div>
+          {!!code &&
+          <div styleName="tooltip-target-container">
+            <Tooltip styleName="tooltip" theme="light" tooltipDelay={TOOLTIP_DEFAULT_DELAY}>
+              <div className="tooltip-target">
+                <div className="project-status-ref">{_.unescape(code)}</div>
+              </div>
+              <div className="tooltip-body">
+                <div>{_.unescape(code)}</div>
+              </div>
+            </Tooltip>
+          </div>
+
+          }
         </div>
         {showDeleteConfirm && (
           <DeleteProjectModal

diff --git a/src/components/ProjectInfo/ProjectInfo.scss b/src/components/ProjectInfo/ProjectInfo.scss
@@ -18,6 +18,26 @@
       margin-top: 4 * $base_unit;
       padding-bottom: 0;
     }
+    .icon-and-status {
+      display: flex;
+      flex-direction: row;
+      align-items: inherit;
+      .item-icon {
+        display: flex;
+        flex-direction: column;
+        min-width: 52px;
+        width: 52px;
+        padding-left: 4 * $base-unit;
+        margin-bottom: 2 * $base-unit;
+
+        .spacing {
+          margin-top: 5 * $base-unit;
+        }
+        .project-type-icon > svg > path {
+          fill: $tc-dark-blue-110;
+        }
+      }
+    }
 
     .project-info-review {
       > p {
@@ -42,7 +62,7 @@
 
     .project-status {
       margin-bottom: 10px;
-      padding-left: 4 * $base_unit;
+      padding-left: 2 * $base_unit;
       padding-right: 4 * $base_unit;
       display: flex;
       flex-direction: column;
@@ -124,6 +144,8 @@
 .project-status-bottom {
   display: flex;
   justify-content: space-between;
+  padding-left: 4 * $base_unit;
+  padding-right: 4 * $base_unit;
 }
 
 .tooltip-target-container {

diff --git a/src/components/SelectDropdown/SelectDropdownBase.jsx b/src/components/SelectDropdown/SelectDropdownBase.jsx
@@ -24,16 +24,15 @@ class SelectDropdown extends PureComponent {
   }
 
   componentWillMount() {
-    this.updateSelectedOptionValue(_.toString(this.props.value))
+    this.updateSelectedOptionValue(this.props.value)
   }
 
   updateSelectedOptionValue(value) {
     const { options } = this.props
 
-    let selectedOption = _.find(options, (o) => o.value === value)
-    if (!selectedOption) {
-      selectedOption = options[0]
-    }
+
+    const selectedOption = _.find(options, { value }) || null
+
     this.setState({
       selectedOption
     }/*, function() {
@@ -89,9 +88,9 @@ class SelectDropdown extends PureComponent {
   }
 
   render() {
-    const { options, theme, disabled } = this.props
+    const { options, theme, disabled, placeholder } = this.props
     const { selectedOption, confirmOption } = this.state
-    const selectedValue = selectedOption.title
+    const selectedValue = selectedOption ? selectedOption.title : placeholder
     const renderOption = (option, optIdx) => {
       if (option.hide) {
         return null
@@ -160,18 +159,28 @@ class SelectDropdown extends PureComponent {
   }
 }
 
+const valuePropType = PT.oneOfType([PT.string, PT.number])
+
+SelectDropdown.defaultProps = {
+  placeholder: ' - Select - '
+}
+
 SelectDropdown.propTypes = {
   onSelect       : PT.func,
   options        : PT.arrayOf(PT.shape({
     title: PT.string.isRequired,
-    value: PT.string.isRequired,
+    value: valuePropType.isRequired,
     disabled: PT.bool,
     hide: PT.bool,
     confirm: PT.oneOfType([PT.string, PT.bool]),
     toolTipMessage: PT.string,
   })).isRequired,
   theme          : PT.string,
-  selectedOption : PT.object
+  value          : valuePropType,
+  /**
+   * Placeholder to show when there is no selected option
+   */
+  placeholder: PT.string,
 }
 
 export default SelectDropdown
diff --git a/src/config/constants.js b/src/config/constants.js
@@ -303,6 +303,11 @@ export const UPDATE_PRODUCT_MILESTONE_PENDING     = 'UPDATE_PRODUCT_MILESTONE_PE
 export const UPDATE_PRODUCT_MILESTONE_FAILURE     = 'UPDATE_PRODUCT_MILESTONE_FAILURE'
 export const UPDATE_PRODUCT_MILESTONE_SUCCESS     = 'UPDATE_PRODUCT_MILESTONE_SUCCESS'
 
+export const BULK_UPDATE_PRODUCT_MILESTONES             = 'BULK_UPDATE_PRODUCT_MILESTONES'
+export const BULK_UPDATE_PRODUCT_MILESTONES_PENDING     = 'BULK_UPDATE_PRODUCT_MILESTONES_PENDING'
+export const BULK_UPDATE_PRODUCT_MILESTONES_FAILURE     = 'BULK_UPDATE_PRODUCT_MILESTONES_FAILURE'
+export const BULK_UPDATE_PRODUCT_MILESTONES_SUCCESS     = 'BULK_UPDATE_PRODUCT_MILESTONES_SUCCESS'
+
 export const COMPLETE_PRODUCT_MILESTONE             = 'COMPLETE_PRODUCT_MILESTONE'
 export const COMPLETE_PRODUCT_MILESTONE_PENDING     = 'COMPLETE_PRODUCT_MILESTONE_PENDING'
 export const COMPLETE_PRODUCT_MILESTONE_FAILURE     = 'COMPLETE_PRODUCT_MILESTONE_FAILURE'
@@ -708,8 +713,10 @@ export const TC_API_URL = `https://api.${DOMAIN}`
 export const DIRECT_PROJECT_URL = `https://www.${DOMAIN}/direct/projectOverview?formData.projectId=`
 export const SALESFORCE_PROJECT_LEAD_LINK = process.env.SALESFORCE_PROJECT_LEAD_LINK
 export const TC_NOTIFICATION_URL = process.env.TC_NOTIFICATION_URL || `${TC_API_URL}/v5/notifications`
+// Uncomment if you run TC Notifications locally
+// export const TC_NOTIFICATION_URL = 'http://localstho:4000/v5/notifications'
 
-export const TC_CDN_URL = process.env.TC_CDN_URL
+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`