From 8bb565b74b20bb5f7f578ae5e4de297912a70a5f Mon Sep 17 00:00:00 2001 From: yoution Date: Tue, 6 Jul 2021 17:23:57 +0800 Subject: [PATCH 1/3] fix: issue #4399 --- config/constants/dev.js | 1 + config/constants/master.js | 1 + config/constants/qa.js | 1 + src/components/TeamManagement/MemberItem.jsx | 4 +++- src/components/TeamManagement/MemberItem.scss | 9 +++++++++ src/components/TeamManagement/TeamManagement.jsx | 8 +++++++- src/config/constants.js | 1 + 7 files changed, 23 insertions(+), 2 deletions(-) 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` From 33188abf8ff44b72b2f5c96e979e89501e284c2f Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Wed, 7 Jul 2021 18:28:09 +0530 Subject: [PATCH 2/3] Temp deployable feature branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b78db1519..bf7374129 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -188,7 +188,7 @@ workflows: - build-dev filters: &filters-dev branches: - only: ['dev', 'feature/billing_account_protection'] + only: ['dev', 'feature/copilot-feedback'] - deployTest01: context : org-global From aba4dbe8f2390042365def232ab4fe0af48d88af Mon Sep 17 00:00:00 2001 From: yoution Date: Thu, 8 Jul 2021 20:58:52 +0800 Subject: [PATCH 3/3] fix: issue #4399 --- src/components/TeamManagement/MemberItem.jsx | 3 ++- src/components/TeamManagement/MemberItem.scss | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/TeamManagement/MemberItem.jsx b/src/components/TeamManagement/MemberItem.jsx index ab77c372a..978b63699 100644 --- a/src/components/TeamManagement/MemberItem.jsx +++ b/src/components/TeamManagement/MemberItem.jsx @@ -5,6 +5,7 @@ require('moment-timezone') import UserTooltip from '../User/UserTooltip' import SunIcon from '../../assets/icons/daylight.svg' import MoonIcon from '../../assets/icons/moon.svg' +import FAQIcon from '../../assets/icons/faq.svg' import { getFullNameWithFallback } from '../../helpers/tcHelpers' import './MemberItem.scss' @@ -64,7 +65,7 @@ const MemberItem = (props) => { return (
- {feedback && Feed Back} + {feedback && }
{showEmailOnly? email :userFullName}
{localWhStart && localWhEnd &&
WH: {localWhStart} - {localWhEnd} {localTimeOffsetFormat}
} diff --git a/src/components/TeamManagement/MemberItem.scss b/src/components/TeamManagement/MemberItem.scss index 609ca8fc1..70e9e3551 100644 --- a/src/components/TeamManagement/MemberItem.scss +++ b/src/components/TeamManagement/MemberItem.scss @@ -22,11 +22,17 @@ } .feed-back { - color: #0681ff; position: absolute; font-size: 12px; right: 0px; top: 4px; + display: flex; + align-items: center; + + svg { + width: 15px; + margin-top: -2px; + } } .member-detail {