feat:added new entrant info page #2439
Open
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
ayeshmcg
force-pushed
the
feat/351-New-Entrant-Information
branch
from
c90b749
to
a72c7cd
Compare
pbastia
requested changes
Nov 9, 2024
| response={200: int, custom_codes_4xx: Message}, | ||
| tags=["Emissions Report"], | ||
| description="Saves the data for the new entrant report", | ||
| # auth=authorize("approved_industry_user"), |
| dateOfFirstShipment, | ||
| dateOfNewEntrantPeriod, | ||
| }: AdditionalReportingDataProps) { | ||
| const [formData, setFormData] = useState(initialFormData || {}); |
There was a problem hiding this comment.
the interface already guarantees that
Suggested change
| const [formData, setFormData] = useState(initialFormData || {}); | |
| const [formData, setFormData] = useState(initialFormData); |
Comment on lines
+65
to
+75
| const handleSubmit = async () => { | ||
| const endpoint = `reporting/report-version/${versionId}/new-entrant-data`; | ||
| const method = "POST"; | ||
|
|
||
| const response = await actionHandler(endpoint, method, endpoint, { | ||
| body: JSON.stringify(formData), | ||
| }); | ||
| if (response) { | ||
| router.push(saveAndContinueUrl); | ||
| } | ||
| }; |
There was a problem hiding this comment.
We should take the formData from the submit argument, not from the state, since it has a guarantee of being up to date, whereas the state could be behind.
Then we don't need to keep the formData in the state at all!
Suggested change
| const handleSubmit = async () => { | |
| const endpoint = `reporting/report-version/${versionId}/new-entrant-data`; | |
| const method = "POST"; | |
| const response = await actionHandler(endpoint, method, endpoint, { | |
| body: JSON.stringify(formData), | |
| }); | |
| if (response) { | |
| router.push(saveAndContinueUrl); | |
| } | |
| }; | |
| const handleSubmit = async (data: any) => { | |
| const endpoint = `reporting/report-version/${versionId}/new-entrant-data`; | |
| const method = "POST"; | |
| const response = await actionHandler(endpoint, method, endpoint, { | |
| body: JSON.stringify(data), | |
| }); | |
| if (response) { | |
| router.push(saveAndContinueUrl); | |
| } | |
| }; |
Comment on lines
+4
to
+12
| let response = await actionHandler( | ||
| `reporting/report-version/${version_id}/new-entrant-data`, | ||
| "GET", | ||
| `reporting/report-version/${version_id}/new-entrant-data`, | ||
| ); | ||
|
|
||
| if (response && !response.error) { | ||
| return response; | ||
| } |
There was a problem hiding this comment.
actionHandler already implements error handling, with sentry and everything. We don't need to do it here, whatever response is returned is guaranteed to be good :)
Suggested change
| let response = await actionHandler( | |
| `reporting/report-version/${version_id}/new-entrant-data`, | |
| "GET", | |
| `reporting/report-version/${version_id}/new-entrant-data`, | |
| ); | |
| if (response && !response.error) { | |
| return response; | |
| } | |
| return actionHandler( | |
| `reporting/report-version/${version_id}/new-entrant-data`, | |
| "GET", | |
| `reporting/report-version/${version_id}/new-entrant-data`, | |
| ); |
Comment on lines
+80
to
+94
| ...selectedProducts?.reduce( | ||
| (acc, product) => ({ | ||
| ...acc, | ||
| [`${product.id}`]: { | ||
| type: "object", | ||
| title: `Product: ${product.name}`, | ||
| properties: { | ||
| production_amount: { | ||
| type: "number", | ||
| title: "Production after new entrant period began", | ||
| default: product.production_amount, | ||
| }, | ||
| }, | ||
| }, | ||
| }), |
There was a problem hiding this comment.
This works! I think in other places we've used an array instead. It might make the API easier to implement
Comment on lines
+221
to
+231
| ...selectedProducts?.reduce((acc, product) => { | ||
| acc[product.id] = { | ||
| "ui:FieldTemplate": ({ id, children }) => ( | ||
| <ProductionDataTitleWidget id={id} value={product.name}> | ||
| {children} | ||
| </ProductionDataTitleWidget> | ||
| ), | ||
| production_amount: { | ||
| "ui:FieldTemplate": InlineFieldTemplate, | ||
| }, | ||
| }; |
There was a problem hiding this comment.
if we use an array, this will look a lot simpler
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.
Card: bcgov/cas-reporting#351
Changes:
Added New Entrant Information: New page for collecting New Entrant Information data.
Create CheckboxGroup Widget
Modified Checkbox widget and DateWidget
Schema and UI Schema: Defined schemas to validate and structure the new data.
APIs/Services:
Model :