Skip to content

Phase durations #1382

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.

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
merged 52 commits into from
Apr 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5a8d255
add single control to start date
nursoltan-s Mar 2, 2022
68a1e28
Merge pull request #1321 from nursoltan-s/issue-1320
jmgasper Mar 2, 2022
0afa5a6
add phases
nursoltan-s Mar 5, 2022
17176ca
Merge pull request #1326 from nursoltan-s/issue-1319-b
jmgasper Mar 5, 2022
2f36d43
fix issue 1319 feedback
nursoltan-s Mar 7, 2022
7cc0e57
Merge pull request #1327 from nursoltan-s/issue-1319-feedback
jmgasper Mar 7, 2022
d548dc7
Merge branch 'master' into develop
LieutenantRoger Mar 7, 2022
1d4c52e
merge master
LieutenantRoger Mar 7, 2022
b470702
fix issue 1329
nursoltan-s Mar 8, 2022
72f2128
Merge pull request #1330 from nursoltan-s/issue-1329
jmgasper Mar 8, 2022
de6f09d
feat: logout user if idle for configured duration
rakibansary Mar 8, 2022
1949c12
Update config.yml
Mar 9, 2022
4dd155e
feat: add ability to logout immediately
rakibansary Mar 10, 2022
23b4909
update idle timeout duration
rakibansary Mar 10, 2022
1efc162
fix: new challenge not working
rakibansary Mar 10, 2022
f3efd38
fix 1328
nursoltan-s Mar 10, 2022
a73b15b
Merge pull request #1333 from nursoltan-s/issue-1328
jmgasper Mar 10, 2022
13e2ca4
fix issue 1334
nursoltan-s Mar 11, 2022
ce3ab0f
Merge pull request #1335 from nursoltan-s/issue-1334
jmgasper Mar 11, 2022
639bfd9
production conf issue
Mar 15, 2022
4b80e08
Merge pull request #1332 from topcoder-platform/jira-vuln-2333
Mar 15, 2022
188f214
fix phase issue
nursoltan-s Mar 18, 2022
8c0c626
Merge pull request #1342 from nursoltan-s/fix-phase-issue
jmgasper Mar 21, 2022
b32911d
fix phase issue
nursoltan-s Mar 25, 2022
78cd057
Merge pull request #1348 from nursoltan-s/fix-phase-issue
jmgasper Mar 25, 2022
f94e992
additiional fixes
nursoltan-s Mar 28, 2022
f8bbd2b
Merge pull request #1350 from nursoltan-s/additional-fixes
jmgasper Mar 28, 2022
a848a91
additiional fixes 3
nursoltan-s Mar 29, 2022
31daf52
Merge pull request #1351 from nursoltan-s/additional-fixes-3
jmgasper Mar 29, 2022
05308ac
additional fixes on phase input
nursoltan-s Mar 30, 2022
eea2876
Merge pull request #1354 from nursoltan-s/additional-fixes-4
jmgasper Mar 30, 2022
ad1ed4a
fix issue 1357
nursoltan-s Apr 5, 2022
7492646
Merge pull request #1363 from nursoltan-s/issue-1357
jmgasper Apr 5, 2022
6deb270
fix issue 1358
nursoltan-s Apr 5, 2022
66203e3
Merge pull request #1364 from nursoltan-s/issue-1358
jmgasper Apr 5, 2022
d750d95
fix issue 1358
nursoltan-s Apr 7, 2022
533530a
Merge pull request #1369 from nursoltan-s/issue-1358-a
jmgasper Apr 7, 2022
063bb86
fix issue 1370
52cs Apr 11, 2022
5ee8bd7
Merge pull request #1374 from 52cs/fix-1370
jmgasper Apr 12, 2022
d5937d8
https://github.com/topcoder-platform/work-manager/issues/1375
jmgasper Apr 18, 2022
2d93ad4
Merge pull request #1 from topcoder-platform/develop
52cs Apr 18, 2022
cba9c35
https://github.com/topcoder-platform/work-manager/issues/1375
52cs Apr 18, 2022
6aba0cc
Merge pull request #1377 from 52cs/fix-1375
jmgasper Apr 19, 2022
95548cd
https://github.com/topcoder-platform/work-manager/issues/1378
52cs Apr 19, 2022
4190a56
Merge pull request #1379 from 52cs/fix-1378
jmgasper Apr 20, 2022
182c3ec
Revert "feat: logout user if idle for configured duration"
jmgasper Apr 20, 2022
3ac85b3
Revert "Update config.yml"
jmgasper Apr 20, 2022
44fe603
Revert "feat: add ability to logout immediately"
jmgasper Apr 20, 2022
11e561e
Revert "fix: new challenge not working"
jmgasper Apr 20, 2022
665582b
Revert "Revert "fix: new challenge not working""
jmgasper Apr 20, 2022
dab6206
Revert "feat: logout user if idle for configured duration"
jmgasper Apr 20, 2022
d5591e0
Merge branch 'master' into phase_durations
jmgasper Apr 20, 2022
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ workflows:
context : org-global
filters: &filters-dev
branches:
only: ['develop', 'hot-fix-jira-vuln-2333']
only: ['develop']

# Production builds are exectuted only on tagged commits to the
# master branch.
Expand Down
137 changes: 137 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@fortawesome/fontawesome-svg-core": "^1.2.14",
"@fortawesome/free-solid-svg-icons": "^5.7.1",
"@fortawesome/react-fontawesome": "^0.1.4",
"@nateradebaugh/react-datetime": "^4.4.11",
"@popperjs/core": "^2.5.4",
"@svgr/webpack": "2.4.1",
"axios": "^0.19.0",
Expand Down Expand Up @@ -53,6 +54,7 @@
"mini-css-extract-plugin": "0.4.3",
"moment": "^2.24.0",
"moment-duration-format": "^2.2.2",
"moment-timezone": "^0.5.34",
"node-sass": "^4.14.0",
"optimize-css-assets-webpack-plugin": "5.0.1",
"pnp-webpack-plugin": "1.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import $ from 'jquery'
import styles from './ChallengeSchedule-Field.module.scss'
import cn from 'classnames'
import jstz from 'jstimezonedetect'
import PhaseInput from '../../PhaseInput'
import StartDateInput from '../../StartDateInput'
import Chart from 'react-google-charts'
import Select from '../../Select'
import { parseSVG } from '../../../util/svg'
Expand Down Expand Up @@ -183,7 +183,7 @@ class ChallengeScheduleField extends Component {
return (
_.map(challenge.phases, (p, index) => (
<div className={styles.PhaseRow} key={index}>
<PhaseInput
<StartDateInput
phase={this.getPhaseTemplate(p)}
withDuration
onUpdateSelect={onUpdateSelect}
Expand Down Expand Up @@ -345,7 +345,7 @@ class ChallengeScheduleField extends Component {
</div>
</div> }
<div className={styles.PhaseRow}>
<PhaseInput
<StartDateInput
withDates
phase={{
name: 'Start Date',
Expand Down
15 changes: 7 additions & 8 deletions src/components/ChallengeEditor/ChallengeView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import ChallengePrizesField from '../ChallengePrizes-Field'
import CopilotFeeField from '../CopilotFee-Field'
import ChallengeTotalField from '../ChallengeTotal-Field'
import Loader from '../../Loader'
import PhaseInput from '../../PhaseInput'
import AssignedMemberField from '../AssignedMember-Field'
import { getResourceRoleByName } from '../../../util/tc'
import { isBetaMode } from '../../../util/cookie'
import { loadGroupDetails } from '../../../actions/challenges'
import { REVIEW_TYPES, CONNECT_APP_URL, PHASE_PRODUCT_CHALLENGE_ID_FIELD } from '../../../config/constants'
import PhaseInput from '../../PhaseInput'

const ChallengeView = ({
projectDetail,
Expand Down Expand Up @@ -90,6 +90,7 @@ const ChallengeView = ({
if (isLoading || _.isEmpty(metadata.challengePhases) || challenge.id !== challengeId) return <Loader />
const showTimeline = false // disables the timeline for time being https://github.com/topcoder-platform/challenge-engine-ui/issues/706
const isTask = _.get(challenge, 'task.isTask', false)
const phases = _.get(challenge, 'phases', [])

return (
<div className={styles.wrapper}>
Expand Down Expand Up @@ -188,16 +189,14 @@ const ChallengeView = ({
</>
)}
{
<div className={styles.PhaseRow}>
phases.map((phase, index) => (
<PhaseInput
withDates
phase={{
name: 'Start Date',
date: challenge.startDate
}}
phase={phase}
phaseIndex={index}
key={index}
readOnly
/>
</div>
))
}
{showTimeline && (
<ChallengeScheduleField
Expand Down
Loading