Skip to content

Commit 8644466

Browse files
author
Sachin Maheshwari
committed
Merge branch 'dev' into feature/RS256-IdToken-backcompatibility
2 parents 2a4d055 + 1334039 commit 8644466

File tree

5 files changed

+6
-27
lines changed

5 files changed

+6
-27
lines changed

src/assets/icons/v.2.5/project-types/tc-internal-2.svg

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/components/ProjectTypeIcon.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import IconSalesforceImplementation from '../assets/icons/v.2.5/project-types/sa
2929
import IconSolutions from '../assets/icons/v.2.5/project-types/solutions.svg'
3030
import IconUserSentimentAnalysis from '../assets/icons/v.2.5/project-types/user-sentiment-analysis.svg'
3131
import IconDefault from '../assets/icons/v.2.5/project-types/default.svg'
32-
import IconTcInternal from '../assets/icons/v.2.5/project-types/tc-internal-2.svg'
3332
//import IconTcInternal from '../assets/icons/ui-rocket-white.svg'
3433

3534
const ProjectTypeIcon = ({ type }) => {
@@ -62,7 +61,7 @@ const ProjectTypeIcon = ({ type }) => {
6261
case 'salesforce-implementation': return <IconSalesforceImplementation />
6362
case 'solutions': return <IconSolutions />
6463
case 'user-sentiment-analysis': return <IconUserSentimentAnalysis />
65-
case 'tc-internal': return <IconTcInternal />
64+
//case 'tc-internal': return <IconTcInternal />
6665
default:
6766
// this will be default icon
6867
return <IconDefault />

src/config/constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@ export const ACCOUNTS_APP_REGISTER_URL = process.env.ACCOUNTS_APP_REGISTER_URL |
711711

712712
export const TC_API_URL = `https://api.${DOMAIN}`
713713
export const DIRECT_PROJECT_URL = `https://www.${DOMAIN}/direct/projectOverview?formData.projectId=`
714+
export const WORK_MANAGER_APP = `https://challenges.${DOMAIN}/projects`
714715
export const SALESFORCE_PROJECT_LEAD_LINK = process.env.SALESFORCE_PROJECT_LEAD_LINK
715716
export const TC_NOTIFICATION_URL = process.env.TC_NOTIFICATION_URL || `${TC_API_URL}/v5/notifications`
716717
// Uncomment if you run TC Notifications locally

src/index.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ const mountNode = document.getElementById('root')
1313

1414
/* eslint-disable */
1515
if (!_.isEmpty(SEGMENT_KEY)) {
16-
!!function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="4.0.0";
16+
!function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.src="https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._loadOptions=e};analytics.SNIPPET_VERSION="4.13.1";
1717
analytics.load(SEGMENT_KEY);
18+
analytics.page();
1819
}}();
1920
}
2021
/* eslint-enable */

src/projects/detail/containers/ProjectInfoContainer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
PROJECT_ROLE_MANAGER,
1818
DIRECT_PROJECT_URL,
1919
SALESFORCE_PROJECT_LEAD_LINK,
20+
WORK_MANAGER_APP,
2021
PROJECT_STATUS_CANCELLED,
2122
PROJECT_STATUS_ACTIVE,
2223
PROJECT_STATUS_COMPLETED,
@@ -436,6 +437,7 @@ class ProjectInfoContainer extends React.Component {
436437
], currentMemberRole) > -1
437438
if (isMemberOrCopilot || isSuperUser) {
438439
directLinks = []
440+
directLinks.push({name: 'Launch Work Manager', href: `${WORK_MANAGER_APP}/${project.id}/challenges`})
439441
if (project.directProjectId) {
440442
directLinks.push({name: 'Project in Topcoder Direct', href: `${DIRECT_PROJECT_URL}${project.directProjectId}`})
441443
} else {

0 commit comments

Comments
 (0)