-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Design added to login page, Add report "readOnly" mode and Form navigation update #334
Merged
Conversation
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
Conflicts: frontend/src/components/Navigator/index.js frontend/src/pages/ActivityReport/Pages/Review/Approver/__tests__/index.js frontend/src/pages/ActivityReport/Pages/Review/Approver/index.js frontend/src/pages/ActivityReport/Pages/Review/Submitter/Draft.js frontend/src/pages/ActivityReport/Pages/Review/Submitter/__tests__/index.js frontend/src/pages/ActivityReport/Pages/Review/Submitter/index.js frontend/src/pages/ActivityReport/Pages/Review/__tests__/index.js frontend/src/pages/ActivityReport/Pages/Review/index.js frontend/src/pages/ActivityReport/Pages/index.js frontend/src/pages/ActivityReport/__tests__/index.js frontend/src/pages/ActivityReport/index.js src/routes/activityReports/handlers.js
* Any page navigation saves the form to the API * Continue is not blocked by an invalid form * If the page is valid on navigation that page is marked as complete * Any save with an id of "new" triggers a page reload with the saved activity report's id instead of "new" * After visiting the review page validation errors are shown in the form * Fixed a bug where report recipients couldn't be removed
…om Welcome screen
Conflicts: frontend/src/pages/ActivityReport/__tests__/index.js frontend/src/pages/ActivityReport/index.js src/services/activityReports.js
Add design to Login page
…orts Prevent updating of reports
Conflicts: frontend/src/components/Navigator/index.js frontend/src/pages/ActivityReport/Pages/Review/index.js frontend/src/pages/ActivityReport/index.js
Properly set some default values. Last saved time shows up when navigating from a new report to a saved report
Form navigation more consistent
rahearn
approved these changes
Mar 2, 2021
kryswisnaskas
pushed a commit
that referenced
this pull request
Jun 24, 2021
…Landing Ttahub 138 al tp survey on ar landing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
67
Description of change
Make the login page look like the design:
How to test
Try both logging out, and changing
BYPASS_AUTH=false
. Login page should look like the design.Issue(s)
Checklist
285
Description of change
Reports are now placed in a read only mode if
submitted
orapproved
In read only mode the user can only view the review page.
Also added a button/API call to move a report from
submitted
back todraft
mode, allowing the author or collaborators to make edits after submitting but before approval.How to test
submitted
review page and you cannot browse to other pages of the reportdraft
statusNeeds Action
draft
Keeping in draft until a few of the other report PRs get merged. Still need to update API docs with the new route.
Issue(s)
Checklist
313
Description of change
*~ Any save with an id of "new" triggers a page reload with the saved activity report's id instead of "new"~
How to test
Issue(s)
Checklist