forked from HHS/Head-Start-TTADP
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #96 from adhocteam/js-135-review-page-no-saving
Add review page accordions
- Loading branch information
Showing
26 changed files
with
852 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import join from 'url-join'; | ||
|
|
||
| const activityReportUrl = join('/', 'api', 'activity-reports'); | ||
|
|
||
| const callApi = async (url) => { | ||
| const res = await fetch(url, { | ||
| credentials: 'same-origin', | ||
| }); | ||
| if (!res.ok) { | ||
| throw new Error(res.statusText); | ||
| } | ||
| return res; | ||
| }; | ||
|
|
||
| export const fetchApprovers = async () => { | ||
| const res = await callApi(join(activityReportUrl, 'approvers')); | ||
| return res.json(); | ||
| }; | ||
|
|
||
| export const submitReport = async (data, extraData) => { | ||
| const url = join(activityReportUrl, 'submit'); | ||
| await fetch(url, { | ||
| method: 'POST', | ||
| credentials: 'same-origin', | ||
| body: JSON.stringify({ | ||
| report: data, | ||
| metaData: extraData, | ||
| }), | ||
| }); | ||
| }; |
128 changes: 113 additions & 15 deletions
128
frontend/src/pages/ActivityReport/Pages/ReviewSubmit.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,122 @@ | ||
| import React from 'react'; | ||
| import React, { useEffect, useState } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { | ||
| Form, Label, Fieldset, Textarea, Alert, Button, Accordion, | ||
| } from '@trussworks/react-uswds'; | ||
| import { useForm } from 'react-hook-form'; | ||
| import { Helmet } from 'react-helmet'; | ||
| import { Button } from '@trussworks/react-uswds'; | ||
|
|
||
| const ReviewSubmit = ({ allComplete, onSubmit }) => ( | ||
| <> | ||
| <Helmet> | ||
| <title>Review and submit</title> | ||
| </Helmet> | ||
| <div> | ||
| Review and submit | ||
| <br /> | ||
| <Button disabled={!allComplete} onClick={onSubmit}>Submit</Button> | ||
| </div> | ||
| </> | ||
| ); | ||
|
|
||
| import { fetchApprovers } from '../../../fetchers/activityReports'; | ||
| import MultiSelect from '../../../components/MultiSelect'; | ||
| import Container from '../../../components/Container'; | ||
|
|
||
| const defaultValues = { | ||
| approvingManagers: null, | ||
| additionalNotes: null, | ||
| }; | ||
|
|
||
| const ReviewSubmit = ({ | ||
| initialData, allComplete, onSubmit, submitted, reviewItems, | ||
| }) => { | ||
| const [loading, updateLoading] = useState(true); | ||
| const [possibleApprovers, updatePossibleApprovers] = useState([]); | ||
|
|
||
| useEffect(() => { | ||
| updateLoading(true); | ||
| const fetch = async () => { | ||
| const approvers = await fetchApprovers(); | ||
| updatePossibleApprovers(approvers); | ||
| updateLoading(false); | ||
| }; | ||
| fetch(); | ||
| }, []); | ||
|
|
||
| const { | ||
| handleSubmit, register, formState, control, | ||
| } = useForm({ | ||
| mode: 'onChange', | ||
| defaultValues: { ...defaultValues, ...initialData }, | ||
| }); | ||
|
|
||
| const onFormSubmit = (data) => { | ||
| onSubmit(data); | ||
| }; | ||
|
|
||
| const { | ||
| isValid, | ||
| } = formState; | ||
|
|
||
| const valid = allComplete && isValid; | ||
|
|
||
| return ( | ||
| <> | ||
| <Helmet> | ||
| <title>Review and submit</title> | ||
| </Helmet> | ||
| <Accordion bordered={false} items={reviewItems} /> | ||
| <Container skipTopPadding className="margin-top-2 padding-top-2"> | ||
| <h3>Submit Report</h3> | ||
| {submitted | ||
| && ( | ||
| <Alert noIcon className="margin-y-4" type="success"> | ||
| <b>Success</b> | ||
| <br /> | ||
| This report was successfully submitted for approval | ||
| </Alert> | ||
| )} | ||
| {!allComplete | ||
| && ( | ||
| <Alert noIcon className="margin-y-4" type="error"> | ||
| <b>Incomplete report</b> | ||
| <br /> | ||
| This report cannot be submitted until all sections are complete | ||
| </Alert> | ||
| )} | ||
| <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormSubmit)}> | ||
| <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes"> | ||
| <Label htmlFor="additionalNotes">Additional notes for this activity (optional)</Label> | ||
| <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" /> | ||
| </Fieldset> | ||
| <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report"> | ||
| <p className="margin-top-4"> | ||
| Submitting this form for approval means that you will no longer be in draft mode. | ||
| Please review all information in each section before submitting to your manager for | ||
| approval. | ||
| </p> | ||
| <MultiSelect | ||
| label="Manager - you may choose more than one." | ||
| name="approvingManagers" | ||
| options={possibleApprovers.map((user) => ({ | ||
| label: user.name, | ||
| value: user.id, | ||
| }))} | ||
| control={control} | ||
| disabled={loading} | ||
| /> | ||
| </Fieldset> | ||
| <Button type="submit" disabled={!valid}>Submit report for approval</Button> | ||
| </Form> | ||
| </Container> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| ReviewSubmit.propTypes = { | ||
| initialData: PropTypes.shape({}), | ||
| allComplete: PropTypes.bool.isRequired, | ||
| onSubmit: PropTypes.func.isRequired, | ||
| submitted: PropTypes.bool.isRequired, | ||
| reviewItems: PropTypes.arrayOf( | ||
| PropTypes.shape({ | ||
| id: PropTypes.string.isRequired, | ||
| title: PropTypes.string.isRequired, | ||
| content: PropTypes.node.isRequired, | ||
| }), | ||
| ).isRequired, | ||
| }; | ||
|
|
||
| ReviewSubmit.defaultProps = { | ||
| initialData: {}, | ||
| }; | ||
|
|
||
| export default ReviewSubmit; |
Oops, something went wrong.