From 7e79109146fc6a72d13a152222294c19534ce52d Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 1 Dec 2020 11:54:19 +0200 Subject: [PATCH 01/10] Fix #5199 --- src/shared/containers/Gigs/RecruitCRMJobApply.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/containers/Gigs/RecruitCRMJobApply.jsx b/src/shared/containers/Gigs/RecruitCRMJobApply.jsx index 67a67e792d..c2dffe7e22 100644 --- a/src/shared/containers/Gigs/RecruitCRMJobApply.jsx +++ b/src/shared/containers/Gigs/RecruitCRMJobApply.jsx @@ -125,7 +125,9 @@ class RecruitCRMJobApplyContainer extends React.Component { } // require atleast 1 skill if (!prop || prop === 'skills') { - if (!_.find(formData.skills, { selected: true })) formErrors.skills = 'Please, add technical skills'; + const skills = _.filter(formData.skills, ['selected', true]); + if (!skills.length) formErrors.skills = 'Please, add technical skills'; + else if (skills.map(skill => skill.label).join(',').length >= 100) formErrors.skills = 'Sum of all skill characters may not be greater than 100'; else delete formErrors.skills; } // have accepted terms From 673341f27c5ad749f054137910a8e3d1fd884814 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 1 Dec 2020 12:57:54 +0200 Subject: [PATCH 02/10] Fix #5196 --- .../components/GUIKit/DropdownTerms/index.jsx | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/shared/components/GUIKit/DropdownTerms/index.jsx b/src/shared/components/GUIKit/DropdownTerms/index.jsx index 0eb25fc8ce..1ef2c69792 100644 --- a/src/shared/components/GUIKit/DropdownTerms/index.jsx +++ b/src/shared/components/GUIKit/DropdownTerms/index.jsx @@ -33,22 +33,12 @@ function DropdownTerms({ let inputField; useEffect(() => { const selectInput = containerRef.current.getElementsByClassName('Select-input'); - const selectMenuOuter = containerRef.current.getElementsByClassName('Select-menu-outer'); if (selectInput && selectInput.length) { - const selectControl = containerRef.current.getElementsByClassName( - 'Select-control', - ); - const height1 = selectMenuOuter && selectMenuOuter.length - ? selectMenuOuter[0].offsetHeight - : 0; - const height2 = selectControl && selectControl.length - ? selectControl[0].offsetHeight - : 0; - selectInput[0].style.top = focused ? `${height1 + height2 - 1}px` : '0'; inputField = selectInput[0].getElementsByTagName('input'); inputField[0].placeholder = focused ? addNewOptionPlaceholder : ''; inputField[0].style.border = 'none'; inputField[0].style.boxShadow = 'none'; + selectInput[0].style.borderTop = 'none'; } }, [focused, selectedOption]); @@ -145,9 +135,13 @@ function DropdownTerms({ backspaceRemoves={false} multi promptTextCreator={() => null} - filterOptions={() => _.filter( - internalTerms, t => !_.find(selectedOption, { label: t.label }), - ).map(o => ({ value: o.label, label: o.label }))} + filterOptions={(option, inputValue) => _.filter( + internalTerms, + t => (inputValue && inputValue.length >= 2 + ? t.label.toLowerCase().includes(inputValue.toLowerCase()) + && !_.find(selectedOption, { label: t.label }) + : !_.find(selectedOption, { label: t.label })), + )} /> dropdown-arrow-icon From 5a9f64769168e1239df7674c2565500a6652592f Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 1 Dec 2020 13:01:40 +0200 Subject: [PATCH 03/10] 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 086cb438b1..d255e4bd18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -237,7 +237,7 @@ workflows: filters: branches: only: - - free + - gig-apply-fixes # This is alternate dev env for parallel testing - "build-qa": context : org-global From 1314b0d36425dcad731ae00cdb02becab390056e Mon Sep 17 00:00:00 2001 From: Deepak Thapa Date: Tue, 1 Dec 2020 23:43:53 +0545 Subject: [PATCH 04/10] Deplyed Dev Env --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 086cb438b1..30db0c8958 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -279,3 +279,4 @@ workflows: branches: ignore: - develop + \ No newline at end of file From 464ae71980879f65ca4ba6443eeb90856cabf8a5 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 1 Dec 2020 23:21:38 -0300 Subject: [PATCH 05/10] ci: deploy develop to Dev env --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30db0c8958..e46b3a2972 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ workflows: filters: branches: only: - - free + - develop # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -279,4 +279,4 @@ workflows: branches: ignore: - develop - \ No newline at end of file + From 3101e3b4f592bedef3105ef95ed610d4181244ce Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 2 Dec 2020 17:51:13 -0300 Subject: [PATCH 06/10] Update Challenge Listing search with new search param --- .../components/challenge-listing/Filters/ChallengeFilters.jsx | 4 ++-- .../challenge-listing/Filters/FiltersPanel/index.jsx | 2 +- src/shared/containers/challenge-listing/Listing/index.jsx | 2 +- src/shared/utils/challenge-listing/buckets.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index 3e7f9848f1..a1bb9673da 100644 --- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -66,7 +66,7 @@ export default function ChallengeFilters({ const clearSearch = () => { // setFilterState(Filter.setText(filterState, '')); - setFilterState({ ..._.clone(filterState), name: '' }); + setFilterState({ ..._.clone(filterState), search: '' }); setSearchText(''); }; @@ -77,7 +77,7 @@ export default function ChallengeFilters({ onSearch={(text) => { // console.log('search text'); // console.log(text); - setFilterState({ ..._.clone(filterState), name: text }); + setFilterState({ ..._.clone(filterState), search: text }); }} // onSearch={text => setFilterState(Filter.setText(filterState, text))} onClearSearch={() => clearSearch()} diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx index 07d9f4d206..742f332c04 100644 --- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx +++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx @@ -425,7 +425,7 @@ export default function FiltersPanel({ DS: true, QA: true, }, - name: '', + search: '', tags: [], types: [], groups: [], diff --git a/src/shared/containers/challenge-listing/Listing/index.jsx b/src/shared/containers/challenge-listing/Listing/index.jsx index 77104cb8e6..9c15f5776a 100644 --- a/src/shared/containers/challenge-listing/Listing/index.jsx +++ b/src/shared/containers/challenge-listing/Listing/index.jsx @@ -568,7 +568,7 @@ export class ListingContainer extends React.Component { reviewOpportunities={reviewOpportunities} setFilterState={(state) => { setFilter(state); - setSearchText(state.name || ''); + setSearchText(state.search || ''); // if (activeBucket === BUCKETS.SAVED_FILTER) { // selectBucket(BUCKETS.OPEN_FOR_REGISTRATION); // } else if (activeBucket === BUCKETS.SAVED_REVIEW_OPPORTUNITIES_FILTER) { diff --git a/src/shared/utils/challenge-listing/buckets.js b/src/shared/utils/challenge-listing/buckets.js index 207fc92118..8e441e00b0 100644 --- a/src/shared/utils/challenge-listing/buckets.js +++ b/src/shared/utils/challenge-listing/buckets.js @@ -171,7 +171,7 @@ export function filterChanged(filter, prevFilter) { return true; } return (!_.isEqual(filter.tracks, prevFilter.tracks)) - || (filter.name !== prevFilter.name) + || (filter.search !== prevFilter.search) || (filter.status !== prevFilter.status) || (filter.startDateEnd !== prevFilter.startDateEnd) || (filter.endDateStart !== prevFilter.endDateStart) From 63034b4b331394fd551954e9a96f591709b5ecf1 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 2 Dec 2020 17:55:17 -0300 Subject: [PATCH 07/10] ci: deploy listing-search to Stag env --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e46b3a2972..48aa727408 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -260,6 +260,7 @@ workflows: branches: only: - develop + - listing-search # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration From 39e61e545b8d6ba3c66cdf3555eab094c84fb762 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 3 Dec 2020 21:38:39 -0300 Subject: [PATCH 08/10] Show challenge name title in Social og:title --- src/shared/containers/challenge-detail/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx index 739a1c4f26..fc53688834 100644 --- a/src/shared/containers/challenge-detail/index.jsx +++ b/src/shared/containers/challenge-detail/index.jsx @@ -429,7 +429,7 @@ class ChallengeDetailPageContainer extends React.Component { image={getOgImage(challenge)} siteName="Topcoder" socialDescription={description} - socialTitle={`${prizesStr}${title}`} + socialTitle={`${prizesStr}${challenge.name}`} title={title} /> ) From e329fad220d6915d22705d46c68df2ed70d04c53 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Thu, 3 Dec 2020 21:40:03 -0300 Subject: [PATCH 09/10] ci: deploy seo-fix to QA env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e46b3a2972..ca66f08fa1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -244,7 +244,7 @@ workflows: filters: branches: only: - - free + - seo-fix # This is beta env for production soft releases - "build-prod-beta": context : org-global From fcf4c59c840395bdb6643676e77bc3307469ef31 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 4 Dec 2020 01:01:44 -0300 Subject: [PATCH 10/10] ci: remove develop from Dev env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c92c9b10a2..995225c5c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ workflows: filters: branches: only: - - develop + - free # This is alternate dev env for parallel testing - "build-test": context : org-global