Revert "Merge pull request #4204 from appirio-tech/feature/taas-jobs"

This reverts commit 6238fef, reversing
changes made to aa61325.

Author: maxceem

.circleci/config.yml

@@ -128,7 +128,7 @@ workflows:
             - build-dev
           filters:
             branches:
-              only: ['dev', 'feature/taas-jobs']
+              only: ['dev']
 
       - deployTest01:
           context : org-global

config/constants/dev.js

@@ -53,8 +53,5 @@ module.exports = {
 
   DASHBOARD_FAQ_CONTENT_ID : process.env.DASHBOARD_FAQ_CONTENT_ID,
   CONTENTFUL_DELIVERY_KEY : process.env.CONTENTFUL_DELIVERY_KEY,
-  CONTENTFUL_SPACE_ID : process.env.CONTENTFUL_SPACE_ID,
-
-  SKILL_PROVIDER_ID: '9cc0795a-6e12-4c84-9744-15858dba1861',
-  TAAS_APP_URL: 'https://mfe.topcoder-dev.com/taas'
+  CONTENTFUL_SPACE_ID : process.env.CONTENTFUL_SPACE_ID
 }

config/constants/master.js

@@ -53,8 +53,5 @@ module.exports = {
 
   DASHBOARD_FAQ_CONTENT_ID : process.env.DASHBOARD_FAQ_CONTENT_ID,
   CONTENTFUL_DELIVERY_KEY : process.env.CONTENTFUL_DELIVERY_KEY,
-  CONTENTFUL_SPACE_ID : process.env.CONTENTFUL_SPACE_ID,
-
-  SKILL_PROVIDER_ID: 'e8467a61-7e20-4ed2-a839-c6340d90f408',
-  TAAS_APP_URL: 'https://mfe.topcoder.com/taas'
+  CONTENTFUL_SPACE_ID : process.env.CONTENTFUL_SPACE_ID
 }

config/constants/qa.js

@@ -48,8 +48,5 @@ module.exports = {
   TC_SYSTEM_USERID: process.env.QA_TC_SYSTEM_USERID,
   MAINTENANCE_MODE: process.env.QA_MAINTENANCE_MODE,
 
-  TC_CDN_URL: process.env.TC_CDN_URL,
-
-  SKILL_PROVIDER_ID: '9cc0795a-6e12-4c84-9744-15858dba1861',
-  TAAS_APP_URL: 'https://mfe.topcoder-dev.com/taas'
+  TC_CDN_URL: process.env.TC_CDN_URL
 }

src/config/constants.js

@@ -717,13 +717,12 @@ export const PROJECT_ATTACHMENTS_FOLDER = process.env.PROJECT_ATTACHMENTS_FOLDER
 export const FILE_PICKER_ACCEPT = process.env.FILE_PICKER_ACCEPT || ['.bmp', '.gif', '.jpg', '.tex', '.xls', '.xlsx', '.doc', '.docx', '.zip', '.txt', '.pdf', '.png', '.ppt', '.pptx', '.rtf', '.csv']
 
 export const SEGMENT_KEY = process.env.CONNECT_SEGMENT_KEY
-export const SKILL_PROVIDER_ID = process.env.SKILL_PROVIDER_ID || '9cc0795a-6e12-4c84-9744-15858dba1861'
 /*
  * URLs
  */
 export const DOMAIN = process.env.domain || 'topcoder.com'
 export const CONNECT_DOMAIN = `connect.${DOMAIN}`
-export const CONNECT_MAIN_PAGE_URL = `https://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-auth0.${DOMAIN}`
 export const ACCOUNTS_APP_REGISTER_URL = process.env.ACCOUNTS_APP_REGISTER_URL || `https://accounts-auth0.${DOMAIN}`
@@ -1094,13 +1093,3 @@ export const PROFILE_FIELDS_CONFIG = {
     // businessPhone: false,
   }
 }
-
-/**
- * The type of the project for talent as a service app.
- */
-export const PROJECT_TYPE_TALENT_AS_A_SERVICE = 'talent-as-a-service'
-
-/**
- * URL to the Topcoder TaaS App
- */
-export const TAAS_APP_URL = process.env.TAAS_APP_URL || 'https://mfe.topcoder-dev.com/taas'

src/projects/create/components/ProjectSubmitted.jsx

@@ -1,49 +1,32 @@
 import React from 'react'
 import PT from 'prop-types'
-import qs from 'query-string'
 
 require('./ProjectSubmitted.scss')
 import {
-  CONNECT_MAIN_PAGE_URL, PROJECT_TYPE_TALENT_AS_A_SERVICE, TAAS_APP_URL
+  CONNECT_DOMAIN
 } from '../../../config/constants'
 
-/**
- * Build project URL based on the `type` query param in URL.
- *
- * @param {String} projectId project id
- */
-const formatProjectURL = (projectId) => {
-  const { type } = qs.parse(window.location.search)
-
-  const url = type === PROJECT_TYPE_TALENT_AS_A_SERVICE
-    // if the project type is TaaS, then use link to TaaS App
-    ? `${TAAS_APP_URL}/myteams/${projectId}`
-    // otherwise use link inside Connect App
-    : `${CONNECT_MAIN_PAGE_URL}/projects/${projectId}`
-
-  return url
-}
-
 class ProjectSubmitted extends React.Component {
   constructor(props) {
     super(props)
 
     this.copyToClipboard = this.copyToClipboard.bind(this)
+    this.state = {
+      domain: `${CONNECT_DOMAIN}/`,
+      url: `projects/${props.params.status || props.projectId}`
+    }
   }
 
   copyToClipboard() {
-    const url = formatProjectURL(this.props.params.status || this.props.projectId)
     const textField = document.createElement('textarea')
-    textField.innerText = url
+    textField.innerText = `${this.state.domain}${this.state.url}`
     document.body.appendChild(textField)
     textField.select()
     document.execCommand('copy')
     textField.remove()
   }
 
   render() {
-    const url = formatProjectURL(this.props.params.status || this.props.projectId)
-
     return (
       <div className="ProjectSubmitted flex column middle center tc-ui">
         <div className="container flex column middle center">
@@ -56,11 +39,11 @@ class ProjectSubmitted extends React.Component {
             Use the link below to share your project with members of your team. You can also access all your Topcoder projects in one place from your Connect project dashboard.
           </div>
           <div className="project-link-container flex row middle center">
-            <a href={url}>{url.replace('https://', '')}</a>
+            { `${this.state.domain}${this.state.url}` }
           </div>
           <div className="button-container flex row middle center">
             <a type="button" onClick={this.copyToClipboard} className="copy-link-btn tc-btn tc-btn-sm tc-btn-default flex middle center" disabled={false}>Copy link</a>
-            <a href={url} type="button" className="go-to-project-dashboard-btn tc-btn tc-btn-sm tc-btn-primary flex middle center" disabled={false}>Go to project dashboard</a>
+            <a href={this.state.url} type="button" className="go-to-project-dashboard-btn tc-btn tc-btn-sm tc-btn-primary flex middle center" disabled={false}>Go to project dashboard</a>
           </div>
         </div>
       </div>
@@ -69,6 +52,7 @@ class ProjectSubmitted extends React.Component {
 }
 
 ProjectSubmitted.defaultProps = {
+  vm: {},
   params: {},
 }
 

src/projects/create/components/ProjectWizard.jsx

@@ -605,6 +605,9 @@ class ProjectWizard extends Component {
         />
         <div />
         <ProjectSubmitted
+          project={ project }
+          projectTemplates={ projectTemplates }
+          dirtyProject={ dirtyProject }
           params={ params }
           projectId={ projectId }
         />

src/projects/create/containers/CreateContainer.jsx

@@ -124,12 +124,11 @@ class CreateContainer extends React.Component {
         projectId: nextProjectId,
         isProjectDirty: false
       }, () => {
-        const type = _.get(this.state, 'updatedProject.type')
         // go to submitted state
         console.log('go to submitted state')
         window.localStorage.removeItem(LS_INCOMPLETE_PROJECT)
         window.localStorage.removeItem(LS_INCOMPLETE_WIZARD)
-        this.props.history.push('/new-project/submitted/' + nextProjectId + (type ? `?type=${type}` : ''))
+        this.props.history.push('/new-project/submitted/' + nextProjectId)
       })
 
     } else if (this.state.creatingProject !== nextProps.processing) {

src/projects/detail/components/SkillsQuestion/SkillsQuestionBase.jsx

@@ -4,7 +4,7 @@ import SkillsCheckboxGroup from './SkillsCheckboxGroup'
 import Select from '../../../../components/Select/Select'
 import './SkillsQuestion.scss'
 import { axiosInstance as axios } from '../../../../api/requestInterceptor'
-import { TC_API_URL, SKILL_PROVIDER_ID } from '../../../../config/constants'
+import { TC_API_URL } from '../../../../config/constants'
 import { createFilter } from 'react-select'
 
 let cachedOptions
@@ -21,9 +21,6 @@ let cachedOptions
  * @returns {Array} available options
  */
 const getAvailableOptions = (categoriesMapping, selectedCategories, skillsCategories, options) => {
-  // NOTE:
-  // Disable filtering skills by categories for now, because V5 Skills API doesn't have categories for now.
-  /*
   let mappedCategories
   if (categoriesMapping) {
     mappedCategories = _.map(selectedCategories, (category) => categoriesMapping[category] ? categoriesMapping[category].toLowerCase() : null)
@@ -34,7 +31,6 @@ const getAvailableOptions = (categoriesMapping, selectedCategories, skillsCatego
   if (mappedCategories) {
     return options.filter(option => _.intersection((option.categories || []).map(c => c.toLowerCase()), mappedCategories).length > 0)
   }
-  */
   return options
 }
 
@@ -52,15 +48,12 @@ class SkillsQuestion extends React.PureComponent {
 
   componentWillMount() {
     if (!cachedOptions) {
-      axios.get(`${TC_API_URL}/v5/skills?skillProviderId=${SKILL_PROVIDER_ID}&perPage=100`)
+      axios.get(`${TC_API_URL}/v3/tags/?domain=SKILLS&status=APPROVED`)
         .then(resp => {
-          const options = _.get(resp, 'data', [])
+          const options = _.get(resp.data, 'result.content', {})
 
-          cachedOptions = options.map((option) => ({
-            skillId: option.id,
-            name: option.name
-          }))
-          this.updateOptions(cachedOptions)
+          cachedOptions = options
+          this.updateOptions(options)
         })
     } else {
       this.updateOptions(cachedOptions)
@@ -84,7 +77,7 @@ class SkillsQuestion extends React.PureComponent {
     this.setState({ options })
     this.updateAvailableOptions(this.props, options)
     if (onSkillsLoaded) {
-      onSkillsLoaded(options)
+      onSkillsLoaded(options.map((option) => _.pick(option, ['id', 'name'])))
     }
   }
 
@@ -100,6 +93,7 @@ class SkillsQuestion extends React.PureComponent {
 
     // if have a mapping for categories, then filter options, otherwise use all options
     const availableOptions = getAvailableOptions(categoriesMapping, selectedCategories, skillsCategories, options)
+      .map(option => _.pick(option, ['id', 'name']))
     this.setState({ availableOptions })
   }
 
@@ -188,17 +182,17 @@ class SkillsQuestion extends React.PureComponent {
     const selectedCategories = _.get(currentProjectData, categoriesField, [])
 
     let currentValues = getValue() || []
-    // remove from currentValues not available options but still keep created custom options without 'skillId'
-    currentValues = currentValues.filter(skill => _.some(availableOptions, skill) || !skill.skillId)
+    // remove from currentValues not available options but still keep created custom options without id
+    currentValues = currentValues.filter(skill => _.some(availableOptions, skill) || !skill.id)
 
     const questionDisabled = isFormDisabled() || disabled || (selectedCategories.length === 0 && _.isUndefined(skillsCategories))
     const hasError = !isPristine() && !isValid()
     const errorMessage = getErrorMessage() || validationError
 
-    const checkboxGroupOptions = availableOptions.filter(option => frequentSkills.indexOf(option.skillId) > -1)
-    const checkboxGroupValues = currentValues.filter(val => _.some(checkboxGroupOptions, option => option.skillId === val.skillId ))
+    const checkboxGroupOptions = availableOptions.filter(option => frequentSkills.indexOf(option.id) > -1)
+    const checkboxGroupValues = currentValues.filter(val => _.some(checkboxGroupOptions, option => option.id === val.id ))
 
-    const selectGroupOptions = availableOptions.filter(option => frequentSkills.indexOf(option.skillId) === -1)
+    const selectGroupOptions = availableOptions.filter(option => frequentSkills.indexOf(option.id) === -1)
     if (customOptionValue) {
       selectGroupOptions.unshift({ name: customOptionValue })
     }