@@ -23,11 +25,13 @@ function NoMatchingProfilesResultCard() {
We will be looking internally for members matching your requirements
and be back at them in about 2 weeks.
-
-
Niche Rate
-
$1,200
-
/Week
-
+ {role && (
+
+
{role.name} Rate
+
{formatMoney(role.rates[0].global)}
+
/Week
+
+ )}
Modify Search Criteria
@@ -38,4 +42,8 @@ function NoMatchingProfilesResultCard() {
);
}
+NoMatchingProfilesResultCard.propTypes = {
+ role: PT.object,
+};
+
export default NoMatchingProfilesResultCard;
diff --git a/src/routes/CreateNewTeam/components/ResultCard/index.jsx b/src/routes/CreateNewTeam/components/ResultCard/index.jsx
index c6920c22..97e44dbf 100644
--- a/src/routes/CreateNewTeam/components/ResultCard/index.jsx
+++ b/src/routes/CreateNewTeam/components/ResultCard/index.jsx
@@ -15,7 +15,6 @@ import IconTeamMeetingChat from "../../../../assets/images/icon-team-meeting-cha
import Curve from "../../../../assets/images/curve.svg";
import CircularProgressBar from "../CircularProgressBar";
import Button from "components/Button";
-import { MATCHING_RATE } from "constants";
import { formatMoney } from "utils/format";
function formatRate(value) {
@@ -23,10 +22,15 @@ function formatRate(value) {
return formatMoney(value);
}
+function formatPercent(value) {
+ return `${Math.round(value * 100)}%`;
+}
+
function ResultCard({ role }) {
const {
numberOfMembersAvailable,
isExternalMember,
+ skillsMatch,
rates: [rates],
} = role;
const [userHandle, setUserHandle] = useState(null);
@@ -34,7 +38,7 @@ function ResultCard({ role }) {
useEffect(() => {
getAuthUserProfile().then((res) => {
- setUserHandle(res.handle || null);
+ setUserHandle(res?.handle || null);
});
}, []);
@@ -44,8 +48,8 @@ function ResultCard({ role }) {
We have matching profiles
- We have qualified candidates who match {MATCHING_RATE}% or more of
- your job requirements.
+ We have qualified candidates who match {formatPercent(skillsMatch)}
+ {skillsMatch < 1 ? " or more " : " "} of your job requirements.
- {MATCHING_RATE}%
- Matching rate
+ {formatPercent(skillsMatch)}
+ Skills Match
}
/>
diff --git a/src/routes/CreateNewTeam/components/RoleDetailsModal/index.jsx b/src/routes/CreateNewTeam/components/RoleDetailsModal/index.jsx
index a10f2de7..206e4ee5 100644
--- a/src/routes/CreateNewTeam/components/RoleDetailsModal/index.jsx
+++ b/src/routes/CreateNewTeam/components/RoleDetailsModal/index.jsx
@@ -48,7 +48,7 @@ function RoleDetailsModal({ roleId, open, onClose }) {
[role, imgError]
);
- const skills = role ? role.listOfSkills : [];
+ const skills = role && role.listOfSkills ? role.listOfSkills : [];
const hideSkills = () => {
onClose();
diff --git a/src/routes/CreateNewTeam/components/RoleDetailsModal/styles.module.scss b/src/routes/CreateNewTeam/components/RoleDetailsModal/styles.module.scss
index e7470ce5..d8ad2bf7 100644
--- a/src/routes/CreateNewTeam/components/RoleDetailsModal/styles.module.scss
+++ b/src/routes/CreateNewTeam/components/RoleDetailsModal/styles.module.scss
@@ -14,12 +14,23 @@
}
.markdown-container {
- // not adds specificity to override style
- p:not(table) {
- @include font-roboto;
- color: #2a2a2a;
- font-size: 16px;
- line-height: 26px;
+ :global {
+ // resets styles in markdown-viewer
+ .tui-editor-contents {
+ @include font-roboto;
+ color: #2a2a2a;
+ font-size: 16px;
+ line-height: 26px;
+ ul {
+ list-style: initial;
+ >li {
+ margin-bottom: 10px;
+ &::before {
+ background: none;
+ }
+ }
+ }
+ }
}
}
diff --git a/src/routes/CreateNewTeam/components/SearchContainer/index.jsx b/src/routes/CreateNewTeam/components/SearchContainer/index.jsx
index 8e91bc3b..d31b2761 100644
--- a/src/routes/CreateNewTeam/components/SearchContainer/index.jsx
+++ b/src/routes/CreateNewTeam/components/SearchContainer/index.jsx
@@ -15,7 +15,7 @@ import SearchCard from "../SearchCard";
import ResultCard from "../ResultCard";
import NoMatchingProfilesResultCard from "../NoMatchingProfilesResultCard";
import { searchRoles } from "services/teams";
-import { setCurrentStage } from "utils/helpers";
+import { isCustomRole, setCurrentStage } from "utils/helpers";
import { addRoleSearchId, addSearchedRole } from "../../actions";
import "./styles.module.scss";
@@ -51,12 +51,12 @@ function SearchContainer({
.then((res) => {
const name = _.get(res, "data.name");
const searchId = _.get(res, "data.roleSearchRequestId");
- if (name && !name.toLowerCase().includes("niche")) {
- setMatchingRole(res.data);
+ if (name && !isCustomRole({ name })) {
dispatch(addSearchedRole({ searchId, name }));
} else if (searchId) {
dispatch(addRoleSearchId(searchId));
}
+ setMatchingRole(res.data);
})
.catch((err) => {
console.error(err);
@@ -70,8 +70,8 @@ function SearchContainer({
const renderLeftSide = () => {
if (!searchState) return toRender;
if (searchState === "searching") return
We have matching profiles
-
- We have qualified candidates who match {MATCHING_RATE}% or more of
- your job requirements.
-
+
We have qualified candidates who match your job requirements.
diff --git a/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx b/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx
index 716d375d..6c599e67 100644
--- a/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx
+++ b/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx
@@ -11,13 +11,15 @@ import BaseCreateModal from "../BaseCreateModal";
import { FORM_FIELD_TYPE } from "constants/";
import { formatPlural } from "utils/format";
import Button from "components/Button";
+import MonthPicker from "components/MonthPicker";
+import InformationTooltip from "components/InformationTooltip";
import "./styles.module.scss";
const Error = ({ name }) => {
const {
- meta: { touched, error },
- } = useField(name, { subscription: { touched: true, error: true } });
- return touched && error ? {error} : null;
+ meta: { dirty, error },
+ } = useField(name, { subscription: { dirty: true, error: true } });
+ return dirty && error ? {error} : null;
};
function TeamDetailsModal({ open, onClose, submitForm, addedRoles }) {
@@ -95,10 +97,21 @@ function TeamDetailsModal({ open, onClose, submitForm, addedRoles }) {
return (
diff --git a/src/routes/CreateNewTeam/pages/SelectRole/index.jsx b/src/routes/CreateNewTeam/pages/SelectRole/index.jsx
index 7486b59e..88c84e07 100644
--- a/src/routes/CreateNewTeam/pages/SelectRole/index.jsx
+++ b/src/routes/CreateNewTeam/pages/SelectRole/index.jsx
@@ -11,6 +11,11 @@ import { getRoles } from "services/roles";
import LoadingIndicator from "components/LoadingIndicator";
import RoleDetailsModal from "../../components/RoleDetailsModal";
import SearchAndSubmit from "../../components/SearchAndSubmit";
+import { isCustomRole } from "utils/helpers";
+
+// Remove custom roles from role list
+const removeCustomRoles = (roles) =>
+ roles.filter((role) => !isCustomRole(role));
function SelectRole() {
const [stages, setStages] = useState([
@@ -47,7 +52,7 @@ function SelectRole() {
toRender={
<>
{
.map((s) => ({ ...s, completed: false, isCurrent: false })),
]);
};
+
+/**
+ * Checks if role is custom/niche
+ * @param {Object} role role to check
+ * @returns {boolean} whether the role is custom/niche
+ */
+export const isCustomRole = (role) =>
+ !role.name || CUSTOM_ROLE_NAMES.includes(role.name.toLowerCase());