From 162489ead10c95a3a87a521fc9b69e873a610373 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 18 Dec 2020 10:19:41 +0200 Subject: [PATCH 1/4] Fix #5261 --- src/shared/actions/recruitCRM.js | 1 - src/shared/components/Gigs/GigApply/index.jsx | 18 ------------------ .../containers/Gigs/RecruitCRMJobApply.jsx | 3 --- 3 files changed, 22 deletions(-) diff --git a/src/shared/actions/recruitCRM.js b/src/shared/actions/recruitCRM.js index 544f9deb76..0cd9290b51 100644 --- a/src/shared/actions/recruitCRM.js +++ b/src/shared/actions/recruitCRM.js @@ -60,7 +60,6 @@ function normalizeRecruitPayload(job, payload) { `Date Available: ${new Date(payload.availFrom).toDateString()}`, `Heard About Gig: ${payload.reffereal}`, `Why fit: ${payload.whyFit}`, - `Availability Per Week: ${payload.timeAvailability.filter(s => s.checked).map(s => s.label).join(',')}`, `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(s => s.label).join(',')}`, `Am I ok to work the duration? ${payload.durationConfirm.filter(s => s.value).map(s => s.label).join(',')}`, `Notes: ${payload.notes}`, diff --git a/src/shared/components/Gigs/GigApply/index.jsx b/src/shared/components/Gigs/GigApply/index.jsx index 29adef4521..fee683a3dd 100644 --- a/src/shared/components/Gigs/GigApply/index.jsx +++ b/src/shared/components/Gigs/GigApply/index.jsx @@ -224,24 +224,6 @@ export default function GigApply(props) { errorMsg={formErrors.whyFit} value={formData.whyFit} /> -

What is your availability per week?

-
- { - _.map(formData.timeAvailability, (cbox, indx) => ( -
- { - formData.timeAvailability[indx].checked = val; - onFormInputChange('timeAvailability', formData.timeAvailability); - }} - checked={formData.timeAvailability[indx].checked} - size="lg" - /> - {cbox.label} -
- )) - } -

Are you able to work during the specified timezone? ({`${getCustomField(job.custom_fields, 'Timezone')}`})

onFormInputChange('timezoneConfirm', val)} diff --git a/src/shared/containers/Gigs/RecruitCRMJobApply.jsx b/src/shared/containers/Gigs/RecruitCRMJobApply.jsx index c2dffe7e22..c0b847e339 100644 --- a/src/shared/containers/Gigs/RecruitCRMJobApply.jsx +++ b/src/shared/containers/Gigs/RecruitCRMJobApply.jsx @@ -25,9 +25,6 @@ class RecruitCRMJobApplyContainer extends React.Component { skills: _.map(techSkills, label => ({ label, selected: false })), durationConfirm: [{ label: 'Yes', value: false }, { label: 'No', value: false }], timezoneConfirm: [{ label: 'Yes', value: false }, { label: 'No', value: false }], - timeAvailability: [ - { label: '10 hours', checked: false }, { label: '20 hours', checked: false }, { label: '30 hours', checked: false }, { label: '40 hours', checked: false }, - ], agreedTerms: false, country: _.map(countries.getNames('en'), val => ({ label: val, selected: false })), // eslint-disable-next-line react/destructuring-assignment From 940d6a9e2198b91955970ce19e693746eab25a8c Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 18 Dec 2020 10:21:35 +0200 Subject: [PATCH 2/4] ci: on test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c197d5ad45..575067e7b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -237,7 +237,7 @@ workflows: filters: branches: only: - - hall-of-fame-fixes + - gig-apply-fix # This is alternate dev env for parallel testing - "build-qa": context : org-global From 1e5bb8aca98edffd3da3902ec61a638d9b97904c Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 21 Dec 2020 09:36:20 +0200 Subject: [PATCH 3/4] Fixed handle colors for zero rating --- src/shared/components/Leaderboard/LeaderboardTable/index.jsx | 4 ++-- src/shared/components/Leaderboard/PodiumSpot/index.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx index 73b59f37fc..3a0f5f2de3 100644 --- a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx +++ b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx @@ -93,7 +93,7 @@ export default function LeaderboardTable(props) {
onUsernameClick(competitor)} - style={{ color: rating ? getRatingColor(rating) : null }} + style={{ color: rating !== undefined ? getRatingColor(rating) : null }} > {competitor['member_profile_basic.handle'] || competitor.handle}
@@ -101,7 +101,7 @@ export default function LeaderboardTable(props) { {competitor['member_profile_basic.handle'] || competitor.handle} diff --git a/src/shared/components/Leaderboard/PodiumSpot/index.jsx b/src/shared/components/Leaderboard/PodiumSpot/index.jsx index 5e7e001e66..d9c76034ee 100644 --- a/src/shared/components/Leaderboard/PodiumSpot/index.jsx +++ b/src/shared/components/Leaderboard/PodiumSpot/index.jsx @@ -160,7 +160,7 @@ export default function PodiumSpot(props) {
onUsernameClick(competitor)} - style={{ color: rating ? getRatingColor(rating) : null }} + style={{ color: rating !== undefined ? getRatingColor(rating) : null }} > {competitor['member_profile_basic.handle'] || competitor.handle}
@@ -169,7 +169,7 @@ export default function PodiumSpot(props) { styleName={`${stylesName}.profile-link`} href={`${window.origin}/members/${competitor['member_profile_basic.handle'] || competitor.handle}/`} target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`} - style={{ color: rating ? getRatingColor(rating) : null }} + style={{ color: rating !== undefined ? getRatingColor(rating) : null }} > {competitor['member_profile_basic.handle'] || competitor.handle} From 651a0f0701bd7cefb409235cf8b660e05acb2643 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 21 Dec 2020 10:05:48 +0200 Subject: [PATCH 4/4] Margin fix podium --- src/shared/components/Leaderboard/Podium/styles.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/shared/components/Leaderboard/Podium/styles.scss b/src/shared/components/Leaderboard/Podium/styles.scss index 4ddc665316..d41f31f5e6 100644 --- a/src/shared/components/Leaderboard/Podium/styles.scss +++ b/src/shared/components/Leaderboard/Podium/styles.scss @@ -20,7 +20,7 @@ .PodiumWrap { display: flex; - justify-content: space-evenly; + justify-content: center !important; @include xs-to-sm { flex-direction: column; @@ -30,8 +30,14 @@ .Podium .podium-column { display: inline-block; + margin-right: 20px; + + &:last-child { + margin-right: 0; + } @include xs-to-sm { margin-bottom: 15px; + margin-right: 0; } }