feat: DHIS2-9652 with save buttons #1260
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,70 @@ | ||
| // @flow | ||
| import React, { type ComponentType } from 'react'; | ||
| import { Button } from '@dhis2/ui'; | ||
| import { withStyles } from '@material-ui/core'; | ||
| import { compose } from 'redux'; | ||
| import { useScopeInfo } from '../../../hooks/useScopeInfo'; | ||
| import { scopeTypes } from '../../../metaData'; | ||
| import { EnrollmentDataEntry } from '../Enrollment'; | ||
| import { useCurrentOrgUnitInfo } from '../../../hooks/useCurrentOrgUnitInfo'; | ||
| import { useRegistrationFormInfoForSelectedScope } from '../common/useRegistrationFormInfoForSelectedScope'; | ||
| import type { OwnProps } from './EnrollmentRegistrationEntry.types'; | ||
| import { withSaveHandler } from '../../DataEntry'; | ||
|
|
||
| const styles = ({ typography }) => ({ | ||
| marginTop: { | ||
| marginTop: typography.pxToRem(2), | ||
| }, | ||
| }); | ||
|
|
||
| const EnrollmentRegistrationEntryPlain = | ||
| ({ | ||
| id, | ||
| selectedScopeId, | ||
| enrollmentMetadata, | ||
| saveButtonText, | ||
| classes, | ||
| onSave, | ||
| ...rest | ||
| }: {...OwnProps, ...CssClasses}) => { | ||
| const { scopeType } = useScopeInfo(selectedScopeId); | ||
| const { formId, formFoundation } = useRegistrationFormInfoForSelectedScope(selectedScopeId); | ||
| const orgUnit = useCurrentOrgUnitInfo(); | ||
|
|
||
| return ( | ||
| <> | ||
| { | ||
| scopeType === scopeTypes.TRACKER_PROGRAM && formId && | ||
| <> | ||
| {/* $FlowFixMe */} | ||
| <EnrollmentDataEntry | ||
| orgUnit={orgUnit} | ||
| programId={selectedScopeId} | ||
| formFoundation={formFoundation} | ||
| enrollmentMetadata={enrollmentMetadata} | ||
| id={id} | ||
| {...rest} | ||
| /> | ||
| { | ||
| onSave && | ||
| <Button | ||
| dataTest="dhis2-capture-create-and-link-button" | ||
| primary | ||
| onClick={onSave} | ||
| className={classes.marginTop} | ||
| > | ||
| {saveButtonText} | ||
| </Button> | ||
|
Comment on lines
+49
to
+57
There was a problem hiding this comment. Displaying the buttons only when there is an onSave function. I dont know what is your preference on this one. To my eyes using HOC component to display the buttons in this case seems kind of an overkill. Dont get me wrong HOC are great but I would use them in cases we want to share something between multiple components like you do on the |
||
| } | ||
|
|
||
| </> | ||
| } | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export const EnrollmentRegistrationEntryComponent: ComponentType<OwnProps> = | ||
| compose( | ||
| withSaveHandler({ onGetFormFoundation: ({ enrollmentMetadata }) => enrollmentMetadata && enrollmentMetadata.enrollmentForm }), | ||
| withStyles(styles), | ||
| )(EnrollmentRegistrationEntryPlain); | ||
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,5 +1,16 @@ | ||
| // @flow | ||
| import type { RenderFoundation } from '../../../metaData/RenderFoundation'; | ||
| import type { RegistrationFormMetadata } from '../common/types'; | ||
|
|
||
| export type OwnProps = $ReadOnly<{| | ||
| id: string, | ||
| enrollmentMetadata: RegistrationFormMetadata, | ||
| selectedScopeId: string, | ||
| saveButtonText: string, | ||
| fieldOptions?: Object, | ||
| onSave: (dataEntryId: string, itemId: string, formFoundation: RenderFoundation) => void, | ||
| onPostProcessErrorMessage: Function, | ||
| onGetUnsavedAttributeValues: Function, | ||
| onUpdateField: Function, | ||
| onStartAsyncUpdateField: Function, | ||
|
Comment on lines
+6
to
+15
There was a problem hiding this comment. I am attempting to explicitly define the properties this components needs in order to be rendered. There was a problem hiding this comment. Yep, makes sense 👍 I did the same for the working lists. Let's settle on name though. I think I called it There was a problem hiding this comment. Good point @JoakimSM. Yep for me the naming here is under discussion as well. Eg. On the example above Again I agree we would like to align on a name here. I stole my name from the redux world, look here. Now if we agree on communicating the same thing we can be creative with a name. What do you think, would you find it useful to differentiate between the props that we pass on the component and the props that the component takes from redux? There was a problem hiding this comment. Thanks for explaining. Our use cases are a bit different. |
||
| |}> | ||
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,31 +1,78 @@ | ||
| // @flow | ||
| import React, { type ComponentType } from 'react'; | ||
| import { compose } from 'redux'; | ||
| import { Button } from '@dhis2/ui'; | ||
| import { withStyles } from '@material-ui/core'; | ||
| import { useScopeInfo } from '../../../hooks/useScopeInfo'; | ||
| import { scopeTypes } from '../../../metaData'; | ||
| import { TrackedEntityInstanceDataEntry } from '../TrackedEntityInstance'; | ||
| import { useCurrentOrgUnitInfo } from '../../../hooks/useCurrentOrgUnitInfo'; | ||
| import type { OwnProps } from './TeiRegistrationEntry.types'; | ||
| import { useRegistrationFormInfoForSelectedScope } from '../common/useRegistrationFormInfoForSelectedScope'; | ||
| import { withSaveHandler } from '../../DataEntry'; | ||
|
|
||
|
|
||
| const styles = ({ typography }) => ({ | ||
| marginTop: { | ||
| marginTop: typography.pxToRem(2), | ||
| }, | ||
| }); | ||
| const TeiRegistrationEntryPlain = | ||
| ({ | ||
| id, | ||
| selectedScopeId, | ||
| onSave, | ||
| saveButtonText, | ||
| teiRegistrationMetadata, | ||
| fieldOptions, | ||
| classes, | ||
| onPostProcessErrorMessage, | ||
| onGetUnsavedAttributeValues, | ||
| ...rest | ||
|
|
||
| }: { ...OwnProps, ...CssClasses }) => { | ||
| const { scopeType } = useScopeInfo(selectedScopeId); | ||
| const { formId, formFoundation } = useRegistrationFormInfoForSelectedScope(selectedScopeId); | ||
| const orgUnit = useCurrentOrgUnitInfo(); | ||
|
|
||
| return ( | ||
| <> | ||
| { | ||
| scopeType === scopeTypes.TRACKED_ENTITY_TYPE && formId && | ||
| <> | ||
| {/* $FlowFixMe */} | ||
| <TrackedEntityInstanceDataEntry | ||
| orgUnit={orgUnit} | ||
| formFoundation={formFoundation} | ||
| programId={selectedScopeId} | ||
| teiRegistrationMetadata={teiRegistrationMetadata} | ||
| id={id} | ||
| fieldOptions={fieldOptions} | ||
| onPostProcessErrorMessage={onPostProcessErrorMessage} | ||
| onGetUnsavedAttributeValues={onGetUnsavedAttributeValues} | ||
| {...rest} | ||
| /> | ||
| { | ||
| onSave && | ||
| <Button | ||
| dataTest="dhis2-capture-create-and-link-button" | ||
| primary | ||
| onClick={onSave} | ||
| className={classes.marginTop} | ||
| > | ||
| {saveButtonText} | ||
| </Button> | ||
| } | ||
| </> | ||
| } | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export const TeiRegistrationEntryComponent: ComponentType<OwnProps> = | ||
| compose( | ||
| withSaveHandler({ onGetFormFoundation: ({ teiRegistrationMetadata }) => { | ||
| const form = teiRegistrationMetadata && teiRegistrationMetadata.form; | ||
| return form; | ||
| } }), | ||
| withStyles(styles), | ||
| )(TeiRegistrationEntryPlain); | ||
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,5 +1,14 @@ | ||
| // @flow | ||
| import type { RenderFoundation } from '../../../metaData/RenderFoundation'; | ||
| import type { RegistrationFormMetadata } from '../common/types'; | ||
|
|
||
| export type OwnProps = $ReadOnly<{| | ||
| id: string, | ||
| teiRegistrationMetadata: RegistrationFormMetadata, | ||
| selectedScopeId: string, | ||
| saveButtonText: string, | ||
| fieldOptions?: Object, | ||
| onSave: (dataEntryId: string, itemId: string, formFoundation: RenderFoundation) => void, | ||
| onGetUnsavedAttributeValues: Function, | ||
| onPostProcessErrorMessage: Function, | ||
| |}> |
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,5 @@ | ||
| // @flow | ||
| import type { TeiRegistration } from '../../../metaData/TrackedEntityType/TeiRegistration'; | ||
| import type { Enrollment } from '../../../metaData/Program/Enrollment'; | ||
|
|
||
| export type RegistrationFormMetadata = ?(TeiRegistration | Enrollment) |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: passOnProps
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. I will make a PR in the end renaming all the
resttoonProps.