Merge pull request #834 from topcoder-platform/feature/assign-task-add-submitter-resurce

feat: git#833-Save fails after changing assigned user for a task more than once

Author: vikasrohit

package-lock.json

@@ -83,6 +83,7 @@
     "react-tabs": "^3.0.0",
     "redux": "^4.0.1",
     "redux-logger": "^3.0.6",
+    "redux-promise-middleware": "4.2.1",
     "redux-thunk": "^2.3.0",
     "resolve": "1.8.1",
     "sass-loader": "7.1.0",

package.json

@@ -15,7 +15,9 @@ import {
   fetchChallengeTracks,
   updateChallenge,
   patchChallenge,
-  createChallenge as createChallengeAPI
+  createChallenge as createChallengeAPI,
+  createResource as createResourceAPI,
+  deleteResource as deleteResourceAPI
 } from '../services/challenges'
 import {
   LOAD_CHALLENGE_DETAILS_PENDING,
@@ -32,6 +34,8 @@ import {
   LOAD_CHALLENGE_RESOURCES_PENDING,
   LOAD_CHALLENGE_RESOURCES_SUCCESS,
   LOAD_CHALLENGE_RESOURCES_FAILURE,
+  CREATE_CHALLENGE_RESOURCE,
+  DELETE_CHALLENGE_RESOURCE,
   REMOVE_ATTACHMENT,
   PAGE_SIZE,
   UPDATE_CHALLENGE_DETAILS_PENDING,
@@ -452,3 +456,51 @@ export function loadResourceRoles () {
     })
   }
 }
+
+export function deleteResource (challengeId, roleId, memberHandle) {
+  const resource = {
+    challengeId,
+    roleId,
+    memberHandle
+  }
+  return (dispatch, getState) => {
+    return dispatch({
+      type: DELETE_CHALLENGE_RESOURCE,
+      payload: deleteResourceAPI(resource)
+    })
+  }
+}
+
+export function createResource (challengeId, roleId, memberHandle) {
+  const resource = {
+    challengeId,
+    roleId,
+    memberHandle
+  }
+  return (dispatch, getState) => {
+    return dispatch({
+      type: CREATE_CHALLENGE_RESOURCE,
+      payload: createResourceAPI(resource)
+    })
+  }
+}
+
+export function replaceResourceInRole (challengeId, roleId, newMember, oldMember) {
+  return async (dispatch) => {
+    if (newMember === oldMember) {
+      return
+    }
+    if (oldMember) {
+      try {
+        await dispatch(deleteResource(challengeId, roleId, oldMember))
+      } catch (error) {
+        const errorMessage = _.get(error, 'response.data.message')
+        // ignore error where the resource does not exist already
+        if (errorMessage.indexOf('doesn\'t have resource with roleId') === -1) {
+          return Promise.reject(new Error('Unable to delete resource'))
+        }
+      }
+    }
+    await dispatch(createResource(challengeId, roleId, newMember))
+  }
+}

src/actions/challenges.js

@@ -6,7 +6,6 @@ import { Helmet } from 'react-helmet'
 import cn from 'classnames'
 import moment from 'moment'
 import { pick } from 'lodash/fp'
-// import Modal from '../Modal'
 import { withRouter } from 'react-router-dom'
 import { toastr } from 'react-redux-toastr'
 import xss from 'xss'
@@ -39,10 +38,6 @@ import dropdowns from './mock-data/dropdowns'
 import LastSavedDisplay from './LastSaved-Display'
 import styles from './ChallengeEditor.module.scss'
 import Track from '../Track'
-import {
-  createResource,
-  deleteResource
-} from '../../services/challenges'
 import ConfirmationModal from '../Modal/ConfirmationModal'
 import AlertModal from '../Modal/AlertModal'
 import PhaseInput from '../PhaseInput'
@@ -306,22 +301,15 @@ class ChallengeEditor extends Component {
    */
   onUpdateAssignedMember (option) {
     const { challenge: oldChallenge } = this.state
-    const newChallenge = { ...oldChallenge }
+    const newChallenge = { ...oldChallenge, task: { isAssigned: false, memberId: null, isTask: true } }
     let assignedMemberDetails
 
     if (option && option.value) {
-      /* newChallenge.task = {
-        ...oldChallenge.task,
-        memberId: option.value
-        // TODO uncomment as soon as issue in API is fixed https://github.com/topcoder-platform/challenge-api/issues/272
-        // isAssigned: true
-      } */
       assignedMemberDetails = {
         handle: option.label,
         userId: parseInt(option.value, 10)
       }
     } else {
-      // newChallenge.task = _.omit(oldChallenge.task, ['memberId', 'isAssigned'])
       assignedMemberDetails = null
     }
 
@@ -864,14 +852,11 @@ class ChallengeEditor extends Component {
       const { challenge: { copilot, reviewer }, assignedMemberDetails: assignedMember } = this.state
       if (copilot) await this.updateResource(challengeId, 'Copilot', copilot, previousCopilot)
       if (reviewer) await this.updateResource(challengeId, 'Reviewer', reviewer, previousReviewer)
-      console.log(oldAssignedMember, 'oldAssignedMember')
-      console.log(assignedMember, 'assignedMember')
       const oldMemberHandle = _.get(oldAssignedMember, 'handle')
       // assigned member has been updated
       if (assignedMember && assignedMember.handle !== oldMemberHandle) {
         await this.updateResource(challengeId, 'Submitter', assignedMember.handle, oldMemberHandle)
       }
-      this.updateTimeLastSaved()
 
       const draftChallenge = { data: action.challengeDetails }
       draftChallenge.data.copilot = copilot
@@ -910,29 +895,8 @@ class ChallengeEditor extends Component {
 
   async updateResource (challengeId, name, value, prevValue) {
     const resourceRole = this.getResourceRoleByName(name)
-    if (value === prevValue) {
-      return
-    }
-    const newResource = {
-      challengeId,
-      memberHandle: value,
-      roleId: resourceRole ? resourceRole.id : null
-    }
-    if (prevValue) {
-      try {
-        const oldResource = _.pick(newResource, ['challengeId', 'roleId'])
-        oldResource.memberHandle = prevValue
-        await deleteResource(oldResource)
-      } catch (err) {
-        const errorMessage = _.get(err, 'response.data.message')
-        // ignore error where the resource does not exist already
-        if (errorMessage.indexOf('doesn\'t have resource with roleId') === -1) {
-          throw err
-        }
-      }
-    }
-    console.log('creating new resource')
-    await createResource(newResource)
+    const roleId = resourceRole.id
+    await this.props.replaceResourceInRole(challengeId, roleId, value, prevValue)
   }
 
   updateAttachmentlist (challenge, attachments) {
@@ -1141,7 +1105,6 @@ class ChallengeEditor extends Component {
         )
       }
     }
-
     if (!isNew && challenge.status !== 'New' && isLaunch && isConfirm) {
       draftModal = (
         <AlertModal
@@ -1384,6 +1347,7 @@ ChallengeEditor.propTypes = {
   assignedMemberDetails: PropTypes.shape(),
   updateChallengeDetails: PropTypes.func.isRequired,
   createChallenge: PropTypes.func,
+  replaceResourceInRole: PropTypes.func,
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired
 }
 

src/components/ChallengeEditor/index.js

@@ -67,6 +67,16 @@ export const LOAD_CHALLENGE_RESOURCES_SUCCESS = 'LOAD_CHALLENGE_RESOURCES_SUCCES
 export const LOAD_CHALLENGE_RESOURCES_PENDING = 'LOAD_CHALLENGE_RESOURCES_PENDING'
 export const LOAD_CHALLENGE_RESOURCES_FAILURE = 'LOAD_CHALLENGE_RESOURCES_FAILURE'
 
+export const CREATE_CHALLENGE_RESOURCE = 'CREATE_CHALLENGE_RESOURCE'
+export const CREATE_CHALLENGE_RESOURCE_SUCCESS = 'CREATE_CHALLENGE_RESOURCE_SUCCESS'
+export const CREATE_CHALLENGE_RESOURCE_PENDING = 'CREATE_CHALLENGE_RESOURCE_PENDING'
+export const CREATE_CHALLENGE_RESOURCE_FAILURE = 'CREATE_CHALLENGE_RESOURCE_FAILURE'
+
+export const DELETE_CHALLENGE_RESOURCE = 'DELETE_CHALLENGE_RESOURCE'
+export const DELETE_CHALLENGE_RESOURCE_SUCCESS = 'DELETE_CHALLENGE_RESOURCE_SUCCESS'
+export const DELETE_CHALLENGE_RESOURCE_PENDING = 'DELETE_CHALLENGE_RESOURCE_PENDING'
+export const DELETE_CHALLENGE_RESOURCE_FAILURE = 'DELETE_CHALLENGE_RESOURCE_FAILURE'
+
 export const REMOVE_ATTACHMENT = 'REMOVE_ATTACHMENT'
 
 export const SET_FILTER_CHALLENGE_VALUE = 'SET_FILTER_CHALLENGE_VALUE'

src/config/constants.js

@@ -4,9 +4,15 @@
 import { createStore, applyMiddleware } from 'redux'
 import thunkMiddleware from 'redux-thunk'
 import { createLogger } from 'redux-logger'
+import promiseMiddleware from 'redux-promise-middleware'
 import reducer from '../reducers'
 
-const middlewares = [thunkMiddleware]
+const middlewares = [
+  promiseMiddleware({
+    promiseTypeSuffixes: ['PENDING', 'SUCCESS', 'FAILURE']
+  }),
+  thunkMiddleware
+]
 
 if (process.env.NODE_ENV === 'development') {
   middlewares.push(createLogger())

src/config/store.js

@@ -22,7 +22,8 @@ import {
   loadResourceRoles,
   updateChallengeDetails,
   partiallyUpdateChallengeDetails,
-  createChallenge
+  createChallenge,
+  replaceResourceInRole
 } from '../../actions/challenges'
 import {
   loadMemberDetails
@@ -126,7 +127,8 @@ class ChallengeEditor extends Component {
       projectDetail,
       updateChallengeDetails,
       partiallyUpdateChallengeDetails,
-      createChallenge
+      createChallenge,
+      replaceResourceInRole
       // members
     } = this.props
     const challengeId = _.get(match.params, 'challengeId', null)
@@ -163,6 +165,7 @@ class ChallengeEditor extends Component {
             assignedMemberDetails={assignedMemberDetails}
             updateChallengeDetails={updateChallengeDetails}
             createChallenge={createChallenge}
+            replaceResourceInRole={replaceResourceInRole}
             partiallyUpdateChallengeDetails={partiallyUpdateChallengeDetails}
           />
         ))
@@ -187,6 +190,7 @@ class ChallengeEditor extends Component {
             projectDetail={projectDetail}
             assignedMemberDetails={assignedMemberDetails}
             updateChallengeDetails={updateChallengeDetails}
+            replaceResourceInRole={replaceResourceInRole}
             partiallyUpdateChallengeDetails={partiallyUpdateChallengeDetails}
           />
         ))
@@ -246,7 +250,8 @@ ChallengeEditor.propTypes = {
   loadMemberDetails: PropTypes.func,
   updateChallengeDetails: PropTypes.func.isRequired,
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
-  createChallenge: PropTypes.func.isRequired
+  createChallenge: PropTypes.func.isRequired,
+  replaceResourceInRole: PropTypes.func
   // members: PropTypes.arrayOf(PropTypes.shape())
 }
 
@@ -279,7 +284,8 @@ const mapDispatchToProps = {
   loadMemberDetails,
   updateChallengeDetails,
   partiallyUpdateChallengeDetails,
-  createChallenge
+  createChallenge,
+  replaceResourceInRole
 }
 
 export default withRouter(connect(mapStateToProps, mapDispatchToProps)(ChallengeEditor))

src/containers/ChallengeEditor/index.js

@@ -23,7 +23,11 @@ import {
   UPDATE_CHALLENGE_DETAILS_FAILURE,
   UPDATE_CHALLENGE_DETAILS_SUCCESS,
   CREATE_CHALLENGE_SUCCESS,
-  CREATE_CHALLENGE_FAILURE
+  CREATE_CHALLENGE_FAILURE,
+  CREATE_CHALLENGE_RESOURCE_SUCCESS,
+  DELETE_CHALLENGE_RESOURCE_SUCCESS,
+  DELETE_CHALLENGE_RESOURCE_FAILURE,
+  CREATE_CHALLENGE_RESOURCE_FAILURE
 } from '../config/constants'
 
 const initialState = {
@@ -164,6 +168,43 @@ export default function (state = initialState, action) {
         isLoading: false,
         failedToLoad: false
       }
+    case CREATE_CHALLENGE_RESOURCE_SUCCESS: {
+      const resource = action.payload
+      const challengeResources = _.clone(state.challengeResources)
+      challengeResources.push(resource)
+      return {
+        ...state,
+        challengeResources,
+        isLoading: false,
+        failedToLoad: false
+      }
+    }
+    case CREATE_CHALLENGE_RESOURCE_FAILURE: {
+      const resource = action.payload
+      console.log(resource)
+      return { ...state, isLoading: false, failedToCreate: true }
+    }
+    case DELETE_CHALLENGE_RESOURCE_SUCCESS: {
+      const resource = action.payload
+      const challengeResources = _.clone(state.challengeResources)
+      _.remove(challengeResources,
+        r => r.challengeId === resource.challengeId && r.roleId === resource.roleId && r.memberHandle === resource.memberHandle)
+      return {
+        ...state,
+        challengeResources,
+        isLoading: false,
+        failedToLoad: false
+      }
+    }
+    case DELETE_CHALLENGE_RESOURCE_FAILURE: {
+      const err = action.payload
+      const errorMessage = _.get(err, 'response.data.message')
+      // ignore error where the resource does not exist already
+      if (errorMessage.indexOf('doesn\'t have resource with roleId') === -1) {
+        return { ...state, isLoading: false, failedToDelete: true }
+      }
+      return { ...state, isLoading: false, failedToDelete: false }
+    }
     case LOAD_CHALLENGE_METADATA_SUCCESS:
       return {
         ...state,

src/reducers/challenges.js

@@ -172,8 +172,9 @@ export async function fetchChallengeTerms () {
  * @param challenge challenge data
  * @returns {Promise<*>}
  */
-export function createResource (resource) {
-  return axiosInstance.post(RESOURCES_API_URL, resource)
+export async function createResource (resource) {
+  const resp = await axiosInstance.post(RESOURCES_API_URL, resource)
+  return _.get(resp, 'data', {})
 }
 
 /**
@@ -200,6 +201,7 @@ export async function fetchResourceRoles () {
  * @param {object} resource to delete
  * @returns {Promise<*>}
  */
-export function deleteResource (resource) {
-  return axiosInstance.delete(RESOURCES_API_URL, { data: resource })
+export async function deleteResource (resource) {
+  const resp = await axiosInstance.delete(RESOURCES_API_URL, { data: resource })
+  return _.get(resp, 'data', {})
 }