Merge pull request #4110 from appirio-tech/dev

Connect Release 2.11.1

Author: RishiRajSahu

package-lock.json

@@ -149,7 +149,7 @@
     "redux-thunk": "^2.1.0",
     "remarkable": "^1.7.1",
     "svg-react-loader": "^0.4.5",
-    "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#0.0.11",
+    "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#v1.0.4",
     "tc-ui": "git+https://github.com/appirio-tech/tc-ui.git#feature/connectv2",
     "tlds": "^1.191.0",
     "topcoder-react-utils": "0.0.39",

package.json

@@ -29,6 +29,7 @@ import IconSalesforceImplementation from '../assets/icons/v.2.5/project-types/sa
 import IconSolutions from '../assets/icons/v.2.5/project-types/solutions.svg'
 import IconUserSentimentAnalysis from '../assets/icons/v.2.5/project-types/user-sentiment-analysis.svg'
 import IconDefault from '../assets/icons/v.2.5/project-types/default.svg'
+//import IconTcInternal from '../assets/icons/ui-rocket-white.svg'
 
 const ProjectTypeIcon = ({ type }) => {
   // if type is defined as a relative path to the icon, convert it to icon "id"
@@ -60,6 +61,7 @@ const ProjectTypeIcon = ({ type }) => {
   case 'salesforce-implementation': return <IconSalesforceImplementation />
   case 'solutions': return <IconSolutions />
   case 'user-sentiment-analysis': return <IconUserSentimentAnalysis />
+  //case 'tc-internal': return <IconTcInternal />
   default:
     // this will be default icon
     return <IconDefault />

src/assets/icons/ui-rocket-white.svg

@@ -706,19 +706,20 @@ export const DOMAIN = process.env.domain || 'topcoder.com'
 export const CONNECT_DOMAIN = `connect.${DOMAIN}`
 export const CONNECT_MAIN_PAGE_URL = `http://connect.${DOMAIN}`
 export const ACCOUNTS_APP_CONNECTOR_URL = process.env.ACCOUNTS_APP_CONNECTOR_URL
-export const ACCOUNTS_APP_LOGIN_URL = process.env.ACCOUNTS_APP_LOGIN_URL || `https://accounts.${DOMAIN}/#!/connect`
-export const ACCOUNTS_APP_REGISTER_URL = process.env.ACCOUNTS_APP_REGISTER_URL || `https://accounts.${DOMAIN}/#!/connect/registration`
+export const ACCOUNTS_APP_LOGIN_URL = process.env.ACCOUNTS_APP_LOGIN_URL || `https://accounts.${DOMAIN}/#!/member`
+export const ACCOUNTS_APP_REGISTER_URL = process.env.ACCOUNTS_APP_REGISTER_URL || `https://accounts.${DOMAIN}/#!/member/registration?regSource=tcBusiness`
 
 export const TC_API_URL = `https://api.${DOMAIN}`
 export const DIRECT_PROJECT_URL = `https://www.${DOMAIN}/direct/projectOverview?formData.projectId=`
+export const WORK_MANAGER_APP = `https://challenges.${DOMAIN}/projects`
 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 || `https://community-app.${DOMAIN}/api/cdn/public`
 
-export const RESET_PASSWORD_URL = `https://accounts.${DOMAIN}/connect/reset-password`
+export const RESET_PASSWORD_URL = `https://accounts.${DOMAIN}/member/reset-password`
 export const VERIFY_EMAIL_URL = `http://www.${DOMAIN}/settings/account/changeEmail`
 
 export const PROJECT_NAME_MAX_LENGTH = 255
@@ -1000,4 +1001,14 @@ export const CONTENTFUL_SPACE_ID = process.env.CONTENTFUL_SPACE_ID
  */
 export const CONTENTFUL_NODE_TYPES = {
   HYPERLINK : 'hyperlink',
-}
+}
+export const INTERNAL_PROJECT_URLS=[
+  'tc_internal',
+  'tc-internal'
+]
+
+
+/**
+ * Project category string
+ */
+export const PROJECT_CATEGORY_TAAS = 'talent-as-a-service'

src/components/ProjectTypeIcon.jsx

@@ -21,6 +21,8 @@ import {
   SPECIAL_QUERY_PARAMS,
   PROJECT_REF_CODE_MAX_LENGTH,
   PROJECT_ATTACHMENTS_FOLDER,
+  MANAGER_ROLES,
+  INTERNAL_PROJECT_URLS
 } from '../../../config/constants'
 import {
   buildProjectUpdateQueryByQueryParamSelectCondition,
@@ -212,7 +214,7 @@ class ProjectWizard extends Component {
    * @return {number} step where wizard should move after parsing the URL param
    */
   loadProjectFromURL(urlParams, updateQuery) {
-    const { projectTemplates, projectTypes } = this.props
+    const { projectTemplates, projectTypes, userRoles } = this.props
     const urlAlias = urlParams && urlParams.project
     const statusParam  = urlParams && urlParams.status
 
@@ -233,10 +235,17 @@ class ProjectWizard extends Component {
     } else {
       // if it is not a project type, it should be a project template
       const projectTemplate = getProjectTemplateByAlias(projectTemplates, urlAlias)
+      const managerRoles = _.filter(MANAGER_ROLES, mgrRole => {
+        return _.find(userRoles, role => role === mgrRole)
+      })
+      const isInternalURL = _.find(INTERNAL_PROJECT_URLS, url => url === urlAlias)
+      let isValidRole = true
+      if(isInternalURL)
+        isValidRole = managerRoles && managerRoles.length > 0
 
       // if we have some project template key in the URL and we can find the project template
       // show details step
-      if (projectTemplate) {
+      if (isValidRole && projectTemplate) {
         updateQuery['type'] = { $set : projectTemplate.category }
         updateQuery['templateId'] = { $set : projectTemplate.id }
         updateQuery['details'] = {}
@@ -566,6 +575,7 @@ class ProjectWizard extends Component {
           onProjectTypeChange={ this.updateProjectType }
           projectTemplates={ projectTemplates }
           projectTypes={ projectTypes }
+          userRoles={ userRoles }
         />
         <SelectProjectTemplate
           onProjectTemplateChange={ this.updateProjectTemplate }

src/config/constants.js

@@ -1,21 +1,27 @@
 import React from 'react'
 import PT from 'prop-types'
+import _ from 'lodash'
 
 import SelectProjectTypeCard from './SelectProjectTypeCard'
 import { getProjectTemplatesByCategory } from '../../../helpers/templates'
 import ProjectTypeIcon from '../../../components/ProjectTypeIcon'
 import IconArrowRight from '../../../assets/icons/arrows-16px-1_tail-right.svg'
 
-import { DOMAIN } from '../../../config/constants'
+import { DOMAIN, MANAGER_ROLES } from '../../../config/constants'
 
 import './SelectProjectType.scss'
 
 const SelectProjectType = ({
   onProjectTypeChange,
   projectTypes,
   projectTemplates,
+  userRoles,
 }) => {
   const cards = []
+  const managerRoles = _.filter(MANAGER_ROLES, mgrRole => {
+    return _.find(userRoles, role => role === mgrRole)
+  })
+  const isValidRole = managerRoles && managerRoles.length > 0
 
   projectTypes.forEach((projectType) => {
 
@@ -25,6 +31,10 @@ const SelectProjectType = ({
     // don't render hidden items as well, hidden items can be reached via direct link though
     if (projectType.disabled || projectType.hidden || visibleProjectTemplates.length === 0) return
 
+    // don't render internal projects to customer user roles
+    if (projectType.metadata && projectType.metadata.isInternal 
+      && projectType.metadata.isInternal === true && !isValidRole) return
+
     const icon = <ProjectTypeIcon type={projectType.icon} />
 
     cards.push(

src/projects/create/components/ProjectWizard.jsx

@@ -32,6 +32,7 @@ const TYPE = {
   SLIDER_STANDARD: 'slider-standard',
   SELECT_DROPDOWN: 'select-dropdown',
   TALENT_PICKER: 'talent-picker',
+  TALENT_PICKER_V2: 'talent-picker-v2',
 }
 
 /**
@@ -174,6 +175,11 @@ class Accordion extends React.Component {
       const totalPeoplePerRole = _.mapValues(_.groupBy(value, v => v.role), valuesUnderGroup => _.sumBy(valuesUnderGroup, v => Number(v.people)))
       return _.toPairs(totalPeoplePerRole).filter(([, people]) => people > 0).map(([role, people]) => `${getRoleName(role)}: ${people}`).join(', ')
     }
+    case TYPE.TALENT_PICKER_V2: {
+      const getRoleName = (role) => _.find(options, { role }).roleTitle
+      const totalPeoplePerRole = _.mapValues(_.groupBy(value, v => v.role), valuesUnderGroup => _.sumBy(valuesUnderGroup, v => Number(v.people)))
+      return _.toPairs(totalPeoplePerRole).filter(([, people]) => people > 0).map(([role, people]) => `${getRoleName(role)}: ${people}`).join(', ')
+    }
     default: return value
     }
   }

src/projects/create/components/SelectProjectType.jsx

@@ -172,6 +172,10 @@
           border-color: $tc-gray-20;
           max-width: 300px;
           margin-left: 0px;
+          
+          &.error {
+           border: 1px solid #ff5b52 !important;
+          }
 
           &:after {
             border-bottom-color: $tc-gray-70;
@@ -190,6 +194,10 @@
           line-height: 24px;
         }
 
+        textarea.job-textarea {
+          min-height: 100px;
+        }
+
         .radio-group-input,
         .checkbox-group-item {
           width: 100%;

src/projects/detail/components/Accordion/Accordion.jsx

@@ -11,6 +11,7 @@ import SpecQuestionList from './SpecQuestionList/SpecQuestionList'
 import SpecQuestionIcons from './SpecQuestionList/SpecQuestionIcons'
 import SkillsQuestion from './SkillsQuestion/SkillsQuestion'
 import TalentPickerQuestion from './TalentPickerQuestion/TalentPickerQuestion'
+import TalentPickerQuestionV2 from './TalentPickerQuestion/TalentPickerQuestionV2'
 import SpecFeatureQuestion from './SpecFeatureQuestion'
 import ColorSelector from './../../../components/ColorSelector/ColorSelector'
 import SelectDropdown from './../../../components/SelectDropdown/SelectDropdown'
@@ -382,6 +383,12 @@ class SpecQuestions extends React.Component {
         options: q.options,
       })
       break
+    case 'talent-picker-v2':
+      ChildElem = TalentPickerQuestionV2
+      _.assign(elemProps, {
+        options: q.options,
+      })
+      break
     default:
       ChildElem = () => (
         <div style={{ borderWidth: 1, borderStyle: 'dashed', borderColor: '#f00' }}>
@@ -452,7 +459,7 @@ class SpecQuestions extends React.Component {
           !(question.type === 'estimation' && template.hideEstimation)
         ).map((q, index) => {
           return  (
-            _.includes(['checkbox', 'checkbox-group', 'radio-group', 'add-ons', 'textinput', 'textbox', 'numberinput', 'skills', 'slide-radiogroup', 'slider-standard', 'select-dropdown', 'talent-picker'], q.type) && q.visibilityForRendering === STEP_VISIBILITY.READ_OPTIMIZED ? (
+            _.includes(['checkbox', 'checkbox-group', 'radio-group', 'add-ons', 'textinput', 'textbox', 'numberinput', 'skills', 'slide-radiogroup', 'slider-standard', 'select-dropdown', 'talent-picker', 'talent-picker-v2'], q.type) && q.visibilityForRendering === STEP_VISIBILITY.READ_OPTIMIZED ? (
               <Accordion
                 key={q.fieldName || `accordion-${index}`}
                 title={q.summaryTitle || q.title}