From 53c899045e7fd18fd6c482f479cdabd9688fbc3d Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 5 May 2021 14:30:11 +0300 Subject: [PATCH 1/2] Implement #5500 --- src/shared/containers/Gigs/RecruitCRMJobs.jsx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx index cfb3f2aadf..5a939a9442 100644 --- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx +++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx @@ -202,11 +202,11 @@ class RecruitCRMJobsContainer extends React.Component { } // Sort controlled by sortBy state jobsToDisplay = jobsToDisplay.sort((a, b) => { - // sort tags first no matter the sortBy - const tagA = getCustomField(a.custom_fields, 'Job Tag'); - const tagB = getCustomField(b.custom_fields, 'Job Tag'); - if (tagB !== 'n/a' && tagA === 'n/a') return Number.MAX_VALUE; - if (tagB === 'n/a' && tagA !== 'n/a') return -Number.MIN_VALUE; + // sort featured gigs first no matter the sortBy + const featuredA = getCustomField(a.custom_fields, 'Featured'); + const featuredB = getCustomField(b.custom_fields, 'Featured'); + if (featuredB !== 'n/a' && featuredA === 'n/a') return Number.MAX_VALUE; + if (featuredB === 'n/a' && featuredA !== 'n/a') return -Number.MIN_VALUE; return new Date(b[sortBy]) - new Date(a[sortBy]); }); // Calc pages @@ -248,6 +248,15 @@ class RecruitCRMJobsContainer extends React.Component {
{hjob.country}
{hjob.name}
${hjob.min_annual_salary} - {hjob.max_annual_salary} / {getSalaryType(hjob.salary_type)}
+ { + getCustomField(hjob.custom_fields, 'Hotlist excerpt') !== 'n/a' ? ( +
+ { + `${getCustomField(hjob.custom_fields, 'Hotlist excerpt').substring(0, CONTENT_PREVIEW_LENGTH)}${getCustomField(hjob.custom_fields, 'Hotlist excerpt').length > CONTENT_PREVIEW_LENGTH ? '...' : ''}` + } +
+ ) : null + } ) : (
From 1a104ee51cd80091b04e706461561c02f5c5f78f Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 5 May 2021 14:34:05 +0300 Subject: [PATCH 2/2] ci: on beta --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae22dbfa33..3cc46d858f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -297,7 +297,7 @@ workflows: filters: branches: only: - - free + - gig-tags # This is stage env for production QA releases - "build-prod-staging": context : org-global