Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip: show warnings on funding #463

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wip: show warnings on funding #463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 22 additions & 3 deletions ...ries/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PropTypes from "prop-types";
import { FieldArray, getIn } from "formik";
import { HTML5Backend } from "react-dnd-html5-backend";
import { DndProvider } from "react-dnd";
import { Button, Form, Icon, List } from "semantic-ui-react";
import { Button, Form, Label, Icon, List } from "semantic-ui-react";
import { FieldLabel } from "react-invenio-forms";

import { FundingFieldItem } from "./FundingFieldItem";
Expand All @@ -25,7 +25,7 @@ function FundingFieldForm(props) {
label,
labelIcon,
fieldPath,
form: { values },
form: { values, errors, initialErrors, initialValues },
move: formikArrayMove,
push: formikArrayPush,
remove: formikArrayRemove,
Expand Down Expand Up @@ -81,12 +81,25 @@ function FundingFieldForm(props) {

return { headerContent, descriptionContent, awardOrFunder };
};

const fundingList = getIn(values, fieldPath, []);
const formikInitialValues = getIn(initialValues, fieldPath, []);

const error = getIn(errors, fieldPath, null);
const initialError = getIn(initialErrors, fieldPath, null);
const fundingError = error || (fundingList === formikInitialValues && initialError);

// let className = "";
// if (fundingError) {
// className = typeof fundingError !== "string" ? fundingError.severity : "error";
// }

return (
<DndProvider backend={HTML5Backend}>
<Form.Field required={required}>
<FieldLabel htmlFor={fieldPath} icon={labelIcon} label={label} />
<List>
{getIn(values, fieldPath, []).map((value, index) => {
{fundingList.map((value, index) => {
const key = `${fieldPath}.${index}`;
// if award does not exist or has no id, it's a custom one
const awardType = value?.award?.id ? "standard" : "custom";
Expand Down Expand Up @@ -156,6 +169,12 @@ function FundingFieldForm(props) {
computeFundingContents={computeFundingContents}
/>
</Overridable>

{fundingError && typeof fundingError != "string" && (
<Label pointing="left" prompt>
{fundingError.message}
</Label>
)}
</Form.Field>
</DndProvider>
);
Expand Down
Loading