Skip to content

Commit

Permalink
fix: do not parse AWSJSON for submit (#703)
Browse files Browse the repository at this point in the history 
Co-authored-by: Hein Jeong <heinje@amazon.com>
  • Loading branch information
@hein-j @cwoolum
2 people authored and cwoolum committed Oct 18, 2022
1 parent 2edfafa commit 9b7377a
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 39 deletions.
54 changes: 27 additions & 27 deletions ...s/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react-forms.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,7 @@ export default function MyPostForm(props) {
caption,
Customtags,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const validationResponses = await Promise.all(
Expand Down Expand Up @@ -1510,7 +1510,7 @@ export default function MyPostForm(props) {
caption,
Customtags,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const result = onChange(modelFields);
Expand Down Expand Up @@ -1539,7 +1539,7 @@ export default function MyPostForm(props) {
caption: value,
Customtags,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const result = onChange(modelFields);
Expand All @@ -1565,7 +1565,7 @@ export default function MyPostForm(props) {
caption,
Customtags: values,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const result = onChange(modelFields);
Expand Down Expand Up @@ -1613,7 +1613,7 @@ export default function MyPostForm(props) {
caption,
Customtags,
post_url: value,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const result = onChange(modelFields);
Expand Down Expand Up @@ -1641,7 +1641,7 @@ export default function MyPostForm(props) {
caption,
Customtags,
post_url,
metadata: JSON.parse(metadata),
metadata: value,
profile_url,
};
const result = onChange(modelFields);
Expand Down Expand Up @@ -1669,7 +1669,7 @@ export default function MyPostForm(props) {
caption,
Customtags,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url: value,
};
const result = onChange(modelFields);
Expand Down Expand Up @@ -3040,7 +3040,7 @@ export default function MyPostForm(props) {
caption,
username,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const validationResponses = await Promise.all(
Expand Down Expand Up @@ -3121,7 +3121,7 @@ export default function MyPostForm(props) {
caption: value,
username,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const result = onChange(modelFields);
Expand All @@ -3148,7 +3148,7 @@ export default function MyPostForm(props) {
caption,
username: value,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const result = onChange(modelFields);
Expand All @@ -3175,7 +3175,7 @@ export default function MyPostForm(props) {
caption,
username,
post_url: value,
metadata: JSON.parse(metadata),
metadata,
profile_url,
};
const result = onChange(modelFields);
Expand All @@ -3202,7 +3202,7 @@ export default function MyPostForm(props) {
caption,
username,
post_url,
metadata: JSON.parse(metadata),
metadata: value,
profile_url,
};
const result = onChange(modelFields);
Expand All @@ -3229,7 +3229,7 @@ export default function MyPostForm(props) {
caption,
username,
post_url,
metadata: JSON.parse(metadata),
metadata,
profile_url: value,
};
const result = onChange(modelFields);
Expand Down Expand Up @@ -3396,7 +3396,7 @@ export default function MyPostForm(props) {
username,
profile_url,
post_url,
metadata: JSON.parse(metadata),
metadata,
};
const validationResponses = await Promise.all(
Object.keys(validations).reduce((promises, fieldName) => {
Expand Down Expand Up @@ -3478,7 +3478,7 @@ export default function MyPostForm(props) {
username,
profile_url,
post_url,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.TextAreaFieldbbd63464 ?? value;
Expand Down Expand Up @@ -3509,7 +3509,7 @@ export default function MyPostForm(props) {
username,
profile_url,
post_url,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.caption ?? value;
Expand Down Expand Up @@ -3538,7 +3538,7 @@ export default function MyPostForm(props) {
username: value,
profile_url,
post_url,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.username ?? value;
Expand Down Expand Up @@ -3567,7 +3567,7 @@ export default function MyPostForm(props) {
username,
profile_url: value,
post_url,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.profile_url ?? value;
Expand Down Expand Up @@ -3596,7 +3596,7 @@ export default function MyPostForm(props) {
username,
profile_url,
post_url: value,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.post_url ?? value;
Expand Down Expand Up @@ -3625,7 +3625,7 @@ export default function MyPostForm(props) {
username,
profile_url,
post_url,
metadata: JSON.parse(metadata),
metadata: value,
};
const result = onChange(modelFields);
value = result?.metadata ?? value;
Expand Down Expand Up @@ -5595,7 +5595,7 @@ export default function PostCreateFormRow(props) {
post_url,
profile_url,
status,
metadata: JSON.parse(metadata),
metadata,
};
const validationResponses = await Promise.all(
Object.keys(validations).reduce((promises, fieldName) => {
Expand Down Expand Up @@ -5656,7 +5656,7 @@ export default function PostCreateFormRow(props) {
post_url,
profile_url,
status,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.username ?? value;
Expand Down Expand Up @@ -5685,7 +5685,7 @@ export default function PostCreateFormRow(props) {
post_url,
profile_url,
status,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.caption ?? value;
Expand Down Expand Up @@ -5715,7 +5715,7 @@ export default function PostCreateFormRow(props) {
post_url: value,
profile_url,
status,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.post_url ?? value;
Expand Down Expand Up @@ -5744,7 +5744,7 @@ export default function PostCreateFormRow(props) {
post_url,
profile_url: value,
status,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.profile_url ?? value;
Expand Down Expand Up @@ -5772,7 +5772,7 @@ export default function PostCreateFormRow(props) {
post_url,
profile_url,
status: value,
metadata: JSON.parse(metadata),
metadata,
};
const result = onChange(modelFields);
value = result?.status ?? value;
Expand Down Expand Up @@ -5800,7 +5800,7 @@ export default function PostCreateFormRow(props) {
post_url,
profile_url,
status,
metadata: JSON.parse(metadata),
metadata: value,
};
const result = onChange(modelFields);
value = result?.metadata ?? value;
Expand Down
14 changes: 2 additions & 12 deletions packages/codegen-ui-react/lib/forms/form-renderer-helper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -924,23 +924,13 @@ export const buildModelFieldObject = (
const fieldSet = new Set<string>();
const fields = Object.keys(fieldConfigs).reduce<ObjectLiteralElementLike[]>((acc, value) => {
const fieldName = value.split('.')[0];
const { sanitizedFieldName, dataType } = fieldConfigs[value];
const { sanitizedFieldName } = fieldConfigs[value];
const renderedFieldName = sanitizedFieldName || fieldName;
if (!fieldSet.has(renderedFieldName)) {
let assignment = nameOverrides[fieldName]
? nameOverrides[fieldName]
: factory.createShorthandPropertyAssignment(factory.createIdentifier(fieldName), undefined);

if (dataType === 'AWSJSON') {
assignment = factory.createPropertyAssignment(
factory.createStringLiteral(fieldName),
factory.createCallExpression(
factory.createPropertyAccessExpression(factory.createIdentifier('JSON'), factory.createIdentifier('parse')),
undefined,
[factory.createIdentifier(sanitizedFieldName ?? fieldName)],
),
);
} else if (sanitizedFieldName) {
if (sanitizedFieldName) {
assignment = factory.createPropertyAssignment(
factory.createStringLiteral(fieldName),
factory.createIdentifier(sanitizedFieldName),
Expand Down

0 comments on commit 9b7377a

Please sign in to comment.