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

fix: validate resources and duration fields when both deleted. #359

Merged
merged 1 commit into from
Jul 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
14 changes: 11 additions & 3 deletions src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { deleteSearchedRole } from "../../actions";
import IconCrossLight from "../../../../assets/images/icon-cross-light.svg";
import "./styles.module.scss";
import NumberInput from "components/NumberInput";
import validator from "./utils/validator";
import { validator, validateExists } from "./utils/validator";

const Error = ({ name }) => {
const {
Expand Down Expand Up @@ -137,7 +137,11 @@ function TeamDetailsModal({ open, onClose, submitForm, addedRoles }) {
<tr styleName="role-row" key={id}>
<td>{name}</td>
<td>
<Field name={`${id}.numberOfResources`} initialValue="3">
<Field
validate={validateExists}
name={`${id}.numberOfResources`}
initialValue="3"
>
{({ input, meta }) => (
<NumberInput
name={input.name}
Expand All @@ -153,7 +157,11 @@ function TeamDetailsModal({ open, onClose, submitForm, addedRoles }) {
<Error name={`${id}.numberOfResources`} />
</td>
<td>
<Field name={`${id}.durationWeeks`} initialValue="20">
<Field
validate={validateExists}
name={`${id}.durationWeeks`}
initialValue="20"
>
{({ input, meta }) => (
<NumberInput
name={input.name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const validateNumber = (number) => {
const converted = Number(number);

if (
!number ||
Number.isNaN(converted) ||
converted !== Math.floor(converted) ||
converted < 1
Expand Down Expand Up @@ -57,4 +56,8 @@ const validator = (values) => {
return errors;
};

export default validator;
const validateExists = (value) => {
return value === undefined ? "Please enter a positive integer" : undefined;
};

export { validator, validateExists };