Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

fix: issue #412 #427

Merged
merged 1 commit into from
Aug 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/routes/CreateNewTeam/components/ResultCard/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ function ResultCard({
{!showRates && (
<div styleName="content">
<div styleName="matching-info">
<div>
<div styleName="matching-info-left">
{matchedSkills.length
? _.map(matchedSkills, (s) => (
<SkillTag name={s.name} id={s.id} />
Expand All @@ -282,7 +282,7 @@ function ResultCard({
) : null}
</div>
<div styleName="vertical-line" />
<div>
<div styleName="matching-info-right">
<IconMultipleUsers styleName="users" />
<h4>{numberOfMembersAvailable}+</h4>
<p>Members matched</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
display: flex;
text-align: center;
align-items: center;
.matching-info-left, .matching-info-right {
flex: 1;
}
> div.vertical-line {
display: block;
height: 170px;
Expand Down
22 changes: 8 additions & 14 deletions src/routes/CreateNewTeam/components/SearchAndSubmit/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,29 @@ function SearchAndSubmit(props) {
if (
skills &&
matchingRole &&
matchingRole.listOfSkills &&
searchObject &&
searchObject.skills &&
searchObject.skills.length
matchingRole.matchedSkills
) {
return _.map(searchObject.skills, (s) =>
_.find(skills, (skill) => skill.id === s)
return _.map(matchingRole.matchedSkills, (s) =>
_.find(skills, (skill) => skill.name === s)
);
} else {
return [];
}
}, [skills, matchingRole, searchObject]);
}, [skills, matchingRole]);

const unMatchedSkills = useMemo(() => {
if (
skills &&
matchingRole &&
matchingRole.listOfSkills &&
matchedSkills.length
matchingRole.unMatchedSkills
) {
const list = _.filter(
matchingRole.listOfSkills,
(l) => !_.find(matchedSkills, (m) => m.name === l)
return _.map(matchingRole.unMatchedSkills, (s) =>
_.find(skills, (skill) => skill.name === s)
);
return _.map(list, (s) => _.find(skills, (skill) => skill.name === s));
} else {
return [];
}
}, [skills, matchingRole, matchedSkills]);
}, [skills, matchingRole]);
useEffect(() => {
const isFromInputPage =
searchObject.role ||
Expand Down