Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions src/actions/challenges.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
updateChallengeSkillsApi,
fetchDefaultReviewers,
fetchScorecards,
fetchScorecardById,
fetchWorkflows
} from '../services/challenges'
import { searchProfilesByUserIds } from '../services/user'
Expand Down Expand Up @@ -795,34 +794,6 @@ export function loadScorecards (filters = {}) {
}
}

/**
* Load a specific scorecard by ID
* @param {string} scorecardId the scorecard ID
*/
export function loadScorecardById (scorecardId) {
return async (dispatch) => {
try {
const scorecard = await fetchScorecardById(scorecardId)
dispatch({
type: LOAD_CHALLENGE_METADATA_SUCCESS,
metadataKey: 'scorecardById',
metadataValue: {
...scorecard,
id: scorecardId
}
})
} catch (error) {
console.error('Error loading scorecard by ID:', error)
// Return null on error
dispatch({
type: LOAD_CHALLENGE_METADATA_SUCCESS,
metadataKey: 'scorecardById',
metadataValue: null
})
}
}
}

/**
* Load default reviewers
* @param {Object} filters filters for default reviewers
Expand Down
51 changes: 7 additions & 44 deletions src/components/ChallengeEditor/ChallengeReviewer-Field/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { connect } from 'react-redux'
import cn from 'classnames'
import { PrimaryButton, OutlineButton } from '../../Buttons'
import { REVIEW_OPPORTUNITY_TYPE_LABELS, REVIEW_OPPORTUNITY_TYPES, VALIDATION_VALUE_TYPE } from '../../../config/constants'
import { loadScorecards, loadDefaultReviewers, loadWorkflows, loadScorecardById } from '../../../actions/challenges'
import { loadScorecards, loadDefaultReviewers, loadWorkflows } from '../../../actions/challenges'
import styles from './ChallengeReviewer-Field.module.scss'
import { convertDollarToInteger, validateValue } from '../../../util/input-check'

Expand Down Expand Up @@ -75,26 +75,20 @@ class ChallengeReviewerField extends Component {
}

componentDidMount () {
if (this.props.readOnly) {
// In read-only mode, only load specific scorecards for existing reviewers
this.loadSpecificScorecards()
} else {
// In edit mode, load all scorecards for dropdown
if (this.props.challenge.track || this.props.challenge.type) {
this.loadScorecards()
}
this.loadDefaultReviewers()
this.loadWorkflows()
}

componentDidUpdate (prevProps) {
const { challenge, readOnly } = this.props
const { challenge } = this.props
const prevChallenge = prevProps.challenge

if (challenge && prevChallenge &&
(challenge.type !== prevChallenge.type || challenge.track !== prevChallenge.track)) {
if (readOnly) {
this.loadSpecificScorecards()
} else {
if (challenge.track || challenge.type) {
this.loadScorecards()
}
}
Expand Down Expand Up @@ -123,27 +117,6 @@ class ChallengeReviewerField extends Component {
loadScorecards(filters)
}

loadSpecificScorecards () {
const { challenge, loadScorecardById } = this.props
const reviewers = challenge.reviewers || []

// Get unique scorecard IDs from reviewers
const scorecardIds = [...new Set(
reviewers
.filter(reviewer => reviewer.scorecardId)
.map(reviewer => reviewer.scorecardId)
)]

if (scorecardIds.length === 0) {
return
}

// Load each scorecard individually
scorecardIds.forEach(scorecardId => {
loadScorecardById(scorecardId)
})
}

loadDefaultReviewers () {
const { challenge, loadDefaultReviewers } = this.props

Expand Down Expand Up @@ -424,13 +397,6 @@ class ChallengeReviewerField extends Component {
{readOnly ? (
<span>
{(() => {
const { metadata = {} } = this.props
const specificScorecard = metadata.scorecardById
if (specificScorecard && specificScorecard.id === reviewer.scorecardId) {
return `${specificScorecard.name || 'Unknown'} - ${specificScorecard.type || 'Unknown'} (${specificScorecard.challengeTrack || 'Unknown'}) v${specificScorecard.version || 'Unknown'}`
}

// Fallback to searching in the general scorecards array
const scorecard = scorecards.find(s => s.id === reviewer.scorecardId)
return scorecard ? `${scorecard.name || 'Unknown'} - ${scorecard.type || 'Unknown'} (${scorecard.challengeTrack || 'Unknown'}) v${scorecard.version || 'Unknown'}` : 'Not selected'
})()}
Expand Down Expand Up @@ -738,15 +704,13 @@ ChallengeReviewerField.propTypes = {
metadata: PropTypes.shape({
scorecards: PropTypes.array,
defaultReviewers: PropTypes.array,
workflows: PropTypes.array,
scorecardById: PropTypes.object
workflows: PropTypes.array
}),
isLoading: PropTypes.bool,
readOnly: PropTypes.bool,
loadScorecards: PropTypes.func.isRequired,
loadDefaultReviewers: PropTypes.func.isRequired,
loadWorkflows: PropTypes.func.isRequired,
loadScorecardById: PropTypes.func.isRequired
loadWorkflows: PropTypes.func.isRequired
}

const mapStateToProps = (state) => ({
Expand All @@ -757,8 +721,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = {
loadScorecards,
loadDefaultReviewers,
loadWorkflows,
loadScorecardById
loadWorkflows
}

export default connect(mapStateToProps, mapDispatchToProps)(ChallengeReviewerField)
35 changes: 2 additions & 33 deletions src/containers/ChallengeEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ import {
replaceResourceInRole,
updateChallengeSkills,
createResource,
deleteResource,
loadScorecards,
loadDefaultReviewers
deleteResource
} from '../../actions/challenges'

import { loadSubmissions } from '../../actions/challengeSubmissions'
Expand Down Expand Up @@ -99,8 +97,6 @@ class ChallengeEditor extends Component {
loadSubmissions,
loadChallengeDetails,
loadResources,
loadScorecards,
loadDefaultReviewers,
submissionsPerPage
} = this.props
loadTimelineTemplates()
Expand All @@ -111,8 +107,6 @@ class ChallengeEditor extends Component {
// loadChallengeTerms()
loadGroups()
loadResourceRoles()
loadScorecards()
this.fetchDefaultReviewersForChallenge(this.props.challengeDetails, loadDefaultReviewers)
this.fetchChallengeDetails(
match,
loadChallengeDetails,
Expand All @@ -129,15 +123,6 @@ class ChallengeEditor extends Component {
// })
}

fetchDefaultReviewersForChallenge (challengeDetails, loadDefaultReviewersFn) {
const typeId = _.get(challengeDetails, 'typeId')
const trackId = _.get(challengeDetails, 'trackId')

if (typeId && trackId && typeof loadDefaultReviewersFn === 'function') {
loadDefaultReviewersFn({ typeId, trackId })
}
}

componentWillUnmount () {
// this.unlisten()
}
Expand All @@ -156,18 +141,6 @@ class ChallengeEditor extends Component {
this.setState({ challengeDetails: nextProps.challengeDetails })
}

const prevTypeId = _.get(this.props.challengeDetails, 'typeId')
const prevTrackId = _.get(this.props.challengeDetails, 'trackId')
const nextTypeId = _.get(nextProps.challengeDetails, 'typeId')
const nextTrackId = _.get(nextProps.challengeDetails, 'trackId')

if (
nextTypeId &&
nextTrackId &&
(nextTypeId !== prevTypeId || nextTrackId !== prevTrackId)
) {
this.fetchDefaultReviewersForChallenge(nextProps.challengeDetails, nextProps.loadDefaultReviewers)
}
if (projectDetail && loggedInUser) {
const projectMembers = projectDetail.members
const loginUserProjectInfo = _.find(projectMembers, { userId: loggedInUser.userId })
Expand Down Expand Up @@ -693,8 +666,6 @@ ChallengeEditor.propTypes = {
loadResources: PropTypes.func,
loadResourceRoles: PropTypes.func,
loadSubmissions: PropTypes.func,
loadScorecards: PropTypes.func,
loadDefaultReviewers: PropTypes.func,
challengeResources: PropTypes.arrayOf(PropTypes.object),
challengeSubmissions: PropTypes.arrayOf(PropTypes.object),
challengeDetails: PropTypes.object,
Expand Down Expand Up @@ -794,9 +765,7 @@ const mapDispatchToProps = {
updateChallengeSkills,
loadProject,
createResource,
deleteResource,
loadScorecards,
loadDefaultReviewers
deleteResource
}

export default withRouter(
Expand Down
10 changes: 1 addition & 9 deletions src/services/challenges.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,7 @@ export async function fetchScorecards (filters = {}) {
const response = await axiosInstance.get(`${SCORECARDS_API_URL}?${qs.stringify(query, { encode: false })}`)
return _.get(response, 'data', {})
}
/**
* Api request for fetching a specific scorecard by ID
* @param {string} scorecardId the scorecard ID
* @returns {Promise<*>}
*/
export async function fetchScorecardById (scorecardId) {
const response = await axiosInstance.get(`${SCORECARDS_API_URL}/${scorecardId}`)
return _.get(response, 'data', {})
}

/**
* Api request for fetching default reviewers
* @param {Object} filters filters for default reviewers
Expand Down