Skip to content

Hotfix/post release 2.4.13.2 #3191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 4 commits into from
Jul 18, 2019
Merged

Hotfix/post release 2.4.13.2 #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc10fe6
Merge pull request #3183 from appirio-tech/dev
Jul 17, 2019
c55598f
Merge pull request #3185 from appirio-tech/hotifx/post-release-2-4-13
Jul 17, 2019
f7bfa86
[HOTFIX] [PROD] Filter skills ignore case of categories (#3186)
maxceem Jul 17, 2019
aaef151
Github issue#3189, Unable to activate a phase without explicitly sett…
Jul 18, 2019
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
4 changes: 3 additions & 1 deletion src/projects/actions/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,9 @@ export function updatePhase(projectId, phaseId, updatedProps, phaseIndex) {
const startDateChanged = updatedProps.startDate ? updatedProps.startDate.diff(phaseStartDate) : null
const phaseActivated = phaseStatusChanged && updatedProps.status === PHASE_STATUS_ACTIVE
if (phaseActivated) {
updatedProps.startDate = moment().hours(0).minutes(0).seconds(0).milliseconds(0)
const duration = updatedProps.duration ? updatedProps.duration : phase.duration
updatedProps.startDate = moment().utc().hours(0).minutes(0).seconds(0).milliseconds(0).toISOString()
updatedProps.endDate = moment(updatedProps.startDate).add(duration - 1, 'days').toISOString()
}

return dispatch({
Expand Down
6 changes: 3 additions & 3 deletions src/projects/detail/components/SkillsQuestion/SkillsQuestion.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ class SkillsQuestion extends React.Component {
const mappedSelectedCategories = _.map(selectedCategories, (category) => categoriesMapping[category] ? categoriesMapping[category].toLowerCase() : null)

const currentValues = getValue() || []
const prevAvailableOptions = options.filter(option => _.intersection(option.categories, mappedPrevSelectedCategories).length > 0)
const nextAvailableOptions = options.filter(option => _.intersection(option.categories, mappedSelectedCategories).length > 0)
const prevAvailableOptions = options.filter(option => _.intersection((option.categories || []).map(c => c.toLowerCase()), mappedPrevSelectedCategories).length > 0)
const nextAvailableOptions = options.filter(option => _.intersection((option.categories || []).map(c => c.toLowerCase()), mappedSelectedCategories).length > 0)
const prevValues = currentValues.filter(skill => _.some(prevAvailableOptions, skill))
const nextValues = currentValues.filter(skill => _.some(nextAvailableOptions, skill))

Expand Down Expand Up @@ -114,7 +114,7 @@ class SkillsQuestion extends React.Component {
const selectedCategories = _.get(currentProjectData, categoriesField, [])
const mappedCategories = _.map(selectedCategories, (category) => categoriesMapping[category] ? categoriesMapping[category].toLowerCase() : null)
const availableOptions = options
.filter(option => _.intersection(option.categories, mappedCategories).length > 0)
.filter(option => _.intersection((option.categories || []).map(c => c.toLowerCase()), mappedCategories).length > 0)
.map(
option => _.pick(option, ['id', 'name'])
)
Expand Down