fix: Clean up gender support in registration app #911
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
brandones
commented
Dec 24, 2023
| @@ -383,21 +383,13 @@ export class FormManager { | |||
| // provide a valid fhir.Patient object. The various patient chart modules should be able to handle | |||
| // such missing props correctly (and should be updated if they don't). | |||
|
|
|||
| // Gender in the original object only uses a single letter. fhir.Patient expects a full string. | |||
There was a problem hiding this comment.
The "original object" gender uses the full lowercase name, as FHIR expects.
brandones
commented
Dec 24, 2023
| @@ -60,7 +60,6 @@ function renderDob() { | |||
| identifierTypes: [], | |||
| values: formValues, | |||
| validationSchema: null, | |||
| setValidationSchema: (value) => {}, | |||
There was a problem hiding this comment.
Can't imagine why the validationSchema had a setter. Anyway it was never used.
|
Size Change: -399 kB (-12%) 👏 Total Size: 2.84 MB
ℹ️ View Unchanged
|
brandones
commented
Dec 24, 2023
| is: true, | ||
| then: Yup.string().required('identifierValueRequired'), | ||
| otherwise: Yup.string().notRequired(), | ||
| export function getValidationSchema(config: RegistrationConfig) { |
There was a problem hiding this comment.
This sets us up for more validated form configurability :)
brandones
force-pushed
the
registration-gender
branch
from
6cce529 to
9683b78
Compare
denniskigen
approved these changes
Dec 24, 2023
There was a problem hiding this comment.
This looks good to me, @brandones. Could you look into the failing tests?. Does anything stand out for you, @ibacher?
|
Whoops, my bad. I've got the tests failing locally. Fixing that up. |
|
Okay, fixed up the tests. Needs a core update though, pending openmrs/openmrs-esm-core#862 . |
brandones
force-pushed
the
registration-gender
branch
from
2f73296 to
a325dda
Compare
|
I've just merged that PR |
|
Looks like e2e tests are failing because of gender labels |
|
Thanks for pointing me to the place, @denniskigen ! Fixing. |
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.
Requirements
Summary
Improves the registration config schema gender options. Cleans up the gender-related code. Cleans up some other code. Re-instates a validator that got commented out for some reason.