Merge pull request #3285 from appirio-tech/dev

Production release 2.4.14

Author: vikasrohit

package-lock.json

@@ -0,0 +1,208 @@
+/**
+ * Topic actions
+ */
+import _ from 'lodash'
+import {
+  getTopicsWithComments,
+  addTopicPost as addTopicPostAPI,
+  saveTopicPost as saveTopicPostAPI,
+  deleteTopicPost as deleteTopicPostAPI,
+} from '../api/messages'
+import {
+  LOAD_TOPIC_MEMBERS,
+  LOAD_TOPIC,
+  CREATE_TOPIC_POST,
+  DELETE_TOPIC_POST,
+  UPDATE_TOPIC_POST,
+  DISCOURSE_BOT_USERID,
+  CODER_BOT_USERID,
+  TC_SYSTEM_USERID,
+} from '../config/constants'
+import { loadMembers } from './members'
+import { EventTypes } from 'redux-segment'
+
+/**
+ * Load topics for given tags
+ * @param  {integer} projectId project identifier
+ * @param  {Array} tags list of tags
+ * @param  {Function} dispatch dispatch function
+ * @return {Array} topics
+ */
+export function loadTopics(projectId, tags, dispatch) {
+  return Promise.all(
+    tags.map((tag) => getTopicWithoutMembers(dispatch, projectId, tag))
+  ).then((responses) => {
+    return _.map(responses, (resp) => ({
+      topics: _.get(resp, 'value') ? [_.get(resp, 'value')] : [],
+      tag: _.get(resp, 'action.meta.tag'),
+    }))
+  })
+}
+
+/**
+ * Load topic for a given tag
+ * @param  {integer} projectId project identifier
+ * @param  {String} tag tag
+ * @return {Object} action
+ */
+export function loadTopic(projectId, tag) {
+  return (dispatch) => {
+    return dispatch({
+      type: LOAD_TOPIC_MEMBERS,
+      payload: getTopicWithMember(dispatch, projectId, tag),
+      meta: { tag }
+    })
+  }
+}
+
+/**
+ * Get topics without members
+ * @param  {Function} dispatch dispatch function
+ * @param  {integer} projectId project identifier
+ * @param  {String} tag tag
+ * @return {Object} topic
+ */
+function getTopicWithoutMembers(dispatch, projectId, tag) {
+  return dispatch({
+    type: LOAD_TOPIC_MEMBERS,
+    payload:  new Promise((resolve, reject) => {
+      return getTopicsWithComments('project', `${projectId}`, tag, false)
+        .then((resp) => resolve(_.get(resp, 'topics[0]')))
+        .catch(err => reject(err))
+    }),
+    meta: { tag }
+  })
+}
+
+/**
+ * Get topics with members
+ * @param  {Function} dispatch dispatch function
+ * @param  {integer} projectId project identifier
+ * @param  {String} tag tag
+ * @return {Promise}
+ */
+function getTopicWithMember(dispatch, projectId, tag) {
+  return new Promise((resolve, reject) => {
+    return dispatch({
+      type: LOAD_TOPIC,
+      payload: getTopicsWithComments('project', `${projectId}`, tag, false),
+      meta: { tag }
+    })
+      .then(({ value }) => {
+        let userIds = []
+        userIds = _.union(userIds, _.map(value.topics, 'userId'))
+        _.forEach(value.topics, topic => {
+          userIds = _.union(userIds, _.map(topic.posts, 'userId'))
+        })
+        // this is to remove any nulls from the list (dev had some bad data)
+        _.remove(userIds, i => !i || [DISCOURSE_BOT_USERID, CODER_BOT_USERID, TC_SYSTEM_USERID].indexOf(i) > -1)
+        // return if there are no userIds to retrieve, empty result set
+        if (!userIds.length)
+          resolve(value.topics[0])
+        return dispatch(loadMembers(userIds))
+          .then(() => resolve(value.topics[0]))
+          .catch(err => reject(err))
+      })
+      .catch(err => reject(err))
+  })
+}
+
+/**
+ * Add post to the topic
+ * @param  {String} tag tag
+ * @param  {integer} topicId topic identifier
+ * @param  {Object} post post
+ * @return {Object} action
+ */
+export function addTopicPost(tag, topicId, post) {
+  return (dispatch, getState) => {
+    const projectStatus = getState().projectState.project.status
+    return dispatch({
+      type: CREATE_TOPIC_POST,
+      payload: addTopicPostAPI(topicId, post),
+      meta: {
+        feedId: topicId,
+        tag,
+        rawContent: post.content,
+        onSuccessAnalytics: {
+          eventType: EventTypes.track,
+          eventPayload: {
+            event: 'Post Created',
+            properties: {
+              topicCategory: tag,
+              topicId,
+              projectStatus
+            }
+          }
+        }
+      }
+    })
+  }
+}
+
+/**
+ * Delete post
+ * @param  {String} tag tag
+ * @param  {integer} topicId topic identifier
+ * @param  {integer} postId post identifier
+ * @return {Object} action
+ */
+export function deleteTopicPost(tag, topicId, postId) {
+  return (dispatch, getState) => {
+    const projectStatus = getState().projectState.project.status
+    return dispatch({
+      type: DELETE_TOPIC_POST,
+      payload: deleteTopicPostAPI(topicId, postId),
+      meta: {
+        feedId: topicId,
+        tag,
+        commentId: postId,
+        onSuccessAnalytics: {
+          eventType: EventTypes.track,
+          eventPayload: {
+            event: 'Post Deleted',
+            properties: {
+              topicCategory: tag,
+              topicId,
+              projectStatus
+            }
+          }
+        }
+      }
+    })
+  }
+}
+
+/**
+ * Update post
+ * @param  {String} tag tag
+ * @param  {integer} topicId topic identifier
+ * @param  {Object} post post
+ * @return {Object} action
+ */
+export function updateTopicPost(tag, topicId, post) {
+  return (dispatch, getState) => {
+    const projectStatus = getState().projectState.project.status
+    return dispatch({
+      type: UPDATE_TOPIC_POST,
+      payload: saveTopicPostAPI(topicId, post),
+      meta: {
+        feedId: topicId,
+        tag,
+        commentId: post.id,
+        rawContent: post.content,
+        onSuccessAnalytics: {
+          eventType: EventTypes.track,
+          eventPayload: {
+            event: 'Post Saved',
+            properties: {
+              topicCategory: tag,
+              topicId,
+              projectStatus
+            }
+          }
+        }
+      }
+    })
+  }
+}

src/actions/topics.js

@@ -0,0 +1,44 @@
+import _ from 'lodash'
+import { axiosInstance as axios } from './requestInterceptor'
+import { PROJECTS_API_URL } from '../config/constants'
+
+/**
+ * Get a project summary
+ *
+ * @param  {integer} projectId unique identifier of the project
+ */
+export function getProjectSummary(projectId) {
+
+  const summaryPromise = axios.get(`${PROJECTS_API_URL}/v4/projects/${projectId}/reports?reportName=summary`)
+  const budgetPromise = axios.get(`${PROJECTS_API_URL}/v4/projects/${projectId}/reports?reportName=projectBudget`)
+
+  return Promise.all([summaryPromise, budgetPromise]).then(responses => {
+    const res = _.get(responses[0].data, 'result.content', {})
+    const designMetrics = _.find(res, c => c['challenge.track'] === 'Design') || {}
+    const totalRegistrants = _.sumBy(res, c => c['challenge.num_registrations'])
+
+    const res1 = _.get(responses[1].data, 'result.content', {})
+    const filterReport = c => `${c['project_stream.tc_connect_project_id']}` === projectId.toString()
+    const projectBudget = _.find(res1, filterReport) || {}
+
+    return {
+      projectId,
+      budget: {
+        work: parseFloat(projectBudget['project_stream.total_actual_member_payment'] || 0),
+        fees: parseFloat(projectBudget['project_stream.total_actual_challenge_fee'] || 0),
+        revenue: parseFloat(projectBudget['project_stream.total_invoiced_amount'] || 0),
+        remaining: parseFloat(projectBudget['project_stream.remaining_invoiced_budget'] || 0)
+      },
+      // null values will be filled in as back-end implementation/integration is done. 
+      topcoderDifference: {
+        countries: null,
+        registrants: totalRegistrants,
+        designs: designMetrics['challenge.num_submissions'],
+        linesOfCode: null,
+        hoursSaved: null,
+        costSavings: null,
+        valueCreated: null,
+      }
+    }
+  })
+}

src/api/projectReports.js

@@ -106,6 +106,31 @@ export function updateProject(projectId, updatedProps, updateExisting) {
     })
 }
 
+/**
+ * Create scope change request for the given project with the given details
+ * @param  {integer} projectId    project Id
+ * @param  {object} request scope change request object
+ * @return {promise}              created scope change request
+ */
+export function createScopeChangeRequest(projectId, request) {
+  return axios.post(`${PROJECTS_API_URL}/v4/projects/${projectId}/scopeChangeRequests`, { param: request })
+    .then(resp => {
+      return _.get(resp.data, 'result.content')
+    })
+}/**
+ * Create scope change request for the given project with the given details
+ * @param  {integer} projectId    project Id
+ * @param  {integer} requestId    scope change request Id
+ * @param  {object} updatedProps updated request properties
+ * @return {promise}              updated request
+ */
+export function updateScopeChangeRequest(projectId, requestId, updatedProps) {
+  return axios.patch(`${PROJECTS_API_URL}/v4/projects/${projectId}/scopeChangeRequests/${requestId}`, { param: updatedProps })
+    .then(resp => {
+      return _.get(resp.data, 'result.content')
+    })
+}
+
 /**
  * Update phase using patch
  * @param  {integer} projectId    project Id

src/api/projects.js

@@ -122,7 +122,7 @@ export const getPreSignedUrl = (handle, file) => {
  * @returns {Promise<Object>} response body
  */
 export const checkEmailValidity = (email) => {
-  return axios.get(`${TC_API_URL}/v3/users/validateEmail?email=${email}`)
+  return axios.get(`${TC_API_URL}/v3/users/validateEmail?email=${encodeURIComponent(email)}`)
     .then(resp => _.get(resp.data, 'result.content', {}))
 }
 

src/api/users.js

@@ -1,6 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import cn from 'classnames'
+import Handlebars from 'handlebars'
 import UserTooltip from '../User/UserTooltip'
 import RichTextArea from '../RichTextArea/RichTextArea'
 import { Link, withRouter } from 'react-router-dom'
@@ -76,7 +77,8 @@ class Comment extends React.Component {
 
   render() {
     const {message, author, date, edited, children, noInfo, self, isSaving, hasError, readonly, allMembers, canDelete, projectMembers, commentAnchorPrefix} = this.props
-    const messageAnchor = commentAnchorPrefix + message.id
+    const template = Handlebars.compile(commentAnchorPrefix)
+    const messageAnchor = template({ postId: message.id })
     const messageLink = window.location.pathname.substr(0, window.location.pathname.indexOf('#')) + `#${messageAnchor}`
     const authorName = author ? (author.firstName + ' ' + author.lastName) : 'Connect user'
     const avatarUrl = _.get(author, 'photoURL', null)
@@ -174,7 +176,7 @@ class Comment extends React.Component {
 }
 
 Comment.defaultProps = {
-  commentAnchorPrefix: 'comment-',
+  commentAnchorPrefix: 'comment-{{postId}}',
 }
 
 Comment.propTypes = {

src/components/ActionCard/Comment.jsx

@@ -40,12 +40,12 @@
 
 .active .icon.stroke g,
 .active .icon.stroke path {
-  stroke: $tc-dark-blue-100;
+  stroke: #0AB88A;
 }
 
 .active .icon.fill circle,
 .active .icon.fill path {
-  fill: $tc-dark-blue-100;
+  fill: #0AB88A;
 }
 
 .active {

src/components/MenuItem/MenuItem.scss

@@ -22,10 +22,14 @@ class NotificationsDropdown extends React.Component {
 
   toggle(isOpen) {
     if (typeof isOpen === 'object') {
-      this.props.onToggle(!this.state.isOpen)
+      if (this.props.onToggle) {
+        this.props.onToggle(!this.state.isOpen)
+      }
       this.setState({ isOpen: !this.state.isOpen})
     } else {
-      this.props.onToggle(isOpen)
+      if (this.props.onToggle) {
+        this.props.onToggle(isOpen)
+      }
       this.setState({ isOpen })
     }
   }