diff --git a/config/constants/dev.js b/config/constants/dev.js index 5776dd80a..e2f2ba1d6 100644 --- a/config/constants/dev.js +++ b/config/constants/dev.js @@ -32,6 +32,7 @@ module.exports = { ACCOUNTS_APP_URL : 'https://accounts-auth0.topcoder-dev.com', ACCOUNTS_APP_CONNECTOR_URL : 'https://accounts-auth0.topcoder-dev.com', + TYPEFORM_URL : 'https://topcoder.typeform.com/to/vgqiBXdk', FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_DEV, FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-dev', diff --git a/config/constants/master.js b/config/constants/master.js index a594a3545..ec979e937 100644 --- a/config/constants/master.js +++ b/config/constants/master.js @@ -33,6 +33,7 @@ module.exports = { ACCOUNTS_APP_URL : 'https://accounts-auth0.topcoder.com', ACCOUNTS_APP_CONNECTOR_URL : 'https://accounts-auth0.topcoder.com', + TYPEFORM_URL : 'https://topcoder.typeform.com/to/vgqiBXdk', FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_PROD, FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-prod', diff --git a/config/constants/qa.js b/config/constants/qa.js index 31d32cce2..d23d07bbb 100644 --- a/config/constants/qa.js +++ b/config/constants/qa.js @@ -32,6 +32,7 @@ module.exports = { ACCOUNTS_APP_URL : 'https://accounts.topcoder-qa.com/#!/member', ACCOUNTS_APP_CONNECTOR_URL : 'https://accounts.topcoder-qa.com/connector.html', + TYPEFORM_URL : 'https://topcoder.typeform.com/to/vgqiBXdk', FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_QA, FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-qa', diff --git a/src/components/TeamManagement/MemberItem.jsx b/src/components/TeamManagement/MemberItem.jsx index 036a9d26f..ab77c372a 100644 --- a/src/components/TeamManagement/MemberItem.jsx +++ b/src/components/TeamManagement/MemberItem.jsx @@ -10,7 +10,7 @@ import './MemberItem.scss' const MemberItem = (props) => { - const {usr, showEmailOnly} = props + const {usr, showEmailOnly, feedback} = props const userFullName = getFullNameWithFallback(usr) const workingHourStart = _.get(usr, 'workingHourStart') @@ -64,6 +64,7 @@ const MemberItem = (props) => { return (
+ {feedback && Feed Back}
{showEmailOnly? email :userFullName}
{localWhStart && localWhEnd &&
WH: {localWhStart} - {localWhEnd} {localTimeOffsetFormat}
} @@ -84,6 +85,7 @@ MemberItem.propTypes = { PropTypes.number ]).isRequired, previewAvatar: PropTypes.bool, + feedback: PropTypes.string, showEmailOnly: PropTypes.bool, size: PropTypes.number } diff --git a/src/components/TeamManagement/MemberItem.scss b/src/components/TeamManagement/MemberItem.scss index f2d6ab976..609ca8fc1 100644 --- a/src/components/TeamManagement/MemberItem.scss +++ b/src/components/TeamManagement/MemberItem.scss @@ -5,6 +5,7 @@ flex-direction: row; min-height: 51px; width: 100%; + position: relative; & + & { margin-top: 2 * $base-unit; @@ -20,6 +21,14 @@ } } +.feed-back { + color: #0681ff; + position: absolute; + font-size: 12px; + right: 0px; + top: 4px; +} + .member-detail { margin-left: 2 * $base-unit; overflow: hidden; diff --git a/src/components/TeamManagement/TeamManagement.jsx b/src/components/TeamManagement/TeamManagement.jsx index 019b26d88..5c07ff15d 100644 --- a/src/components/TeamManagement/TeamManagement.jsx +++ b/src/components/TeamManagement/TeamManagement.jsx @@ -9,6 +9,7 @@ import MemberItem from './MemberItem' import AddIcon from '../../assets/icons/icon-ui-bold-add.svg' import Dialog from './Dialog' import { PERMISSIONS } from '../../config/permissions' +import { TYPEFORM_URL } from '../../config/constants' import {hasPermission} from '../../helpers/permissions' import { getFullNameWithFallback } from '../../helpers/tcHelpers' @@ -213,8 +214,13 @@ class TeamManagement extends React.Component { return null } + let feedback = '' + if (member.handle !== currentUser.handle) { + feedback = `${TYPEFORM_URL}#copilot=${member.handle}&projectid=${projectId}&submitter=${currentUser.handle}` + } + return ( - + ) })} {copilotTeamInvites.map((invite, i) => { diff --git a/src/config/constants.js b/src/config/constants.js index d88942685..93382ec1c 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -764,6 +764,7 @@ export const TC_NOTIFICATION_URL = process.env.TC_NOTIFICATION_URL || `${TC_API_ export const TC_CDN_URL = process.env.TC_CDN_URL || `https://community-app.${DOMAIN}/api/cdn/public` +export const TYPEFORM_URL = process.env.TYPEFORM_URL || 'https://topcoder.typeform.com/to/vgqiBXdk' export const RESET_PASSWORD_URL = `https://accounts.${DOMAIN}/member/reset-password` export const VERIFY_EMAIL_URL = `http://www.${DOMAIN}/settings/account/changeEmail` export const TOPCODER_CONNECT_TERMS_URL = `https://connect.${DOMAIN}/terms`