FE: fix refdescription forwarded on the wrong level #112
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
mtseluiko
commented
Jul 13, 2023
| case 'map': | ||
| return convertMap(schema); | ||
| case 'array': | ||
| return convertArray(schema); | ||
| case 'fixed': |
There was a problem hiding this comment.
just reordered to make named type last in switch
mtseluiko
commented
Jul 13, 2023
| @@ -315,7 +290,7 @@ const handleField = (name, field) => { | |||
| name: prepareName(name), | |||
| type: _.isArray(typeSchema.type) ? typeSchema.type : typeSchema, | |||
| default: !_.isUndefined(defaultValue) ? defaultValue : typeSchema?.default, | |||
| doc: description, | |||
| doc: field.$ref ? refDescription : description, | |||
There was a problem hiding this comment.
here is the main change
mtseluiko
commented
Jul 13, 2023
| * key of this property is our custom property name on the schema type level, value is the Avro name of this property | ||
| * @returns {Object} | ||
| */ | ||
| const convertNamedType = (schema, schemaTypeKeysMap = {}) => { |
There was a problem hiding this comment.
moved similar logic for named types to one method
mtseluiko
commented
Jul 13, 2023
| if (!_.isPlainObject(obj)) { | ||
| return obj; | ||
| } | ||
| schema1 = filterAttributes(schema1, schema1.type); |
There was a problem hiding this comment.
rewrited check for similarity of two schemas for named types
mtseluiko
commented
Jul 13, 2023
| setDurationSize, | ||
| addMetaProperties, | ||
| ])(attributes); | ||
| let fieldAttributes = filterAttributes(attributes, type); |
There was a problem hiding this comment.
just get rid from flow - debugging of this is painfull for now. And as I reordered arguments in filterAttributes - it's not so appliable for _.flow now
mtseluiko
commented
Jul 13, 2023
| @@ -60,7 +60,7 @@ const getAvroType = type => { | |||
| }; | |||
|
|
|||
| const convertDescriptionToDoc = schema => { | |||
| const description = (schema.$ref && schema.refDescription) || schema.description; | |||
| const description = schema.description; | |||
There was a problem hiding this comment.
the logic for refDescription is now in field handler
mtseluiko
deleted the
HCK-3720-avro-fe-refdescription-forwarded-on-the-wrong-lev
branch
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.
No description provided.