From 7e79109146fc6a72d13a152222294c19534ce52d Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 1 Dec 2020 11:54:19 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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