Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update conditional prop codegen #917

Merged
merged 1 commit into from
Feb 13, 2023
Merged

fix: update conditional prop codegen #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 32 additions & 70 deletions ...s/codegen-ui-react/lib/__tests__/__snapshots__/react-component-render-helper.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,80 +99,42 @@ NodeObject {
},
"condition": NodeObject {
"end": -1,
"expression": NodeObject {
"flags": 8,
"kind": 219,
"left": IdentifierObject {
"end": -1,
"escapedText": "prop",
"flags": 8,
"kind": 219,
"left": IdentifierObject {
"end": -1,
"escapedText": "prop",
"flags": 8,
"kind": 79,
"modifierFlagsCache": 0,
"originalKeywordKind": undefined,
"parent": undefined,
"pos": -1,
"transformFlags": 0,
},
"kind": 79,
"modifierFlagsCache": 0,
"operatorToken": TokenObject {
"end": -1,
"flags": 8,
"kind": 55,
"modifierFlagsCache": 0,
"parent": undefined,
"pos": -1,
"transformFlags": 0,
},
"originalKeywordKind": undefined,
"parent": undefined,
"pos": -1,
"right": NodeObject {
"end": -1,
"flags": 8,
"kind": 219,
"left": IdentifierObject {
"end": -1,
"escapedText": "prop",
"flags": 8,
"kind": 79,
"modifierFlagsCache": 0,
"originalKeywordKind": undefined,
"parent": undefined,
"pos": -1,
"transformFlags": 0,
},
"modifierFlagsCache": 0,
"operatorToken": TokenObject {
"end": -1,
"flags": 8,
"kind": 34,
"modifierFlagsCache": 0,
"parent": undefined,
"pos": -1,
"transformFlags": 0,
},
"parent": undefined,
"pos": -1,
"right": TokenObject {
"end": -1,
"flags": 8,
"kind": 8,
"modifierFlagsCache": 0,
"numericLiteralFlags": 0,
"parent": undefined,
"pos": -1,
"text": "0",
"transformFlags": 0,
},
"transformFlags": 0,
},
"transformFlags": 0,
},
"flags": 8,
"kind": 210,
"modifierFlagsCache": 0,
"operatorToken": TokenObject {
"end": -1,
"flags": 8,
"kind": 34,
"modifierFlagsCache": 0,
"parent": undefined,
"pos": -1,
"transformFlags": 0,
},
"parent": undefined,
"pos": -1,
"right": TokenObject {
"end": -1,
"flags": 8,
"kind": 8,
"modifierFlagsCache": 0,
"numericLiteralFlags": 0,
"parent": undefined,
"pos": -1,
"text": "0",
"transformFlags": 0,
},
"transformFlags": 0,
},
"end": -1,
Expand Down Expand Up @@ -252,17 +214,17 @@ NodeObject {

exports[`react-component-render-helper buildConcatExpression should build concat with userAttribute 1`] = `"\`\${authAttributes[\\"email\\"]}\${\\", welcome!\\"}\`"`;

exports[`react-component-render-helper buildContionalExpression operandType does not exist 1`] = `"(user?.age && user?.age > \\"18\\") ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;
exports[`react-component-render-helper buildContionalExpression operandType does not exist 1`] = `"user?.age > \\"18\\" ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;

exports[`react-component-render-helper buildContionalExpression operandType does not exist 2`] = `"(user?.age && user?.age > \\"true\\") ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;
exports[`react-component-render-helper buildContionalExpression operandType does not exist 2`] = `"user?.age > \\"true\\" ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;

exports[`react-component-render-helper buildContionalExpression operandType does not exist 3`] = `"(user?.age && user?.age > \\"dlo\\") ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;
exports[`react-component-render-helper buildContionalExpression operandType does not exist 3`] = `"user?.age > \\"dlo\\" ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;

exports[`react-component-render-helper buildContionalExpression operandType exists 1`] = `"(user?.age && user?.age > 18) ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;
exports[`react-component-render-helper buildContionalExpression operandType exists 1`] = `"user?.age > 18 ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;

exports[`react-component-render-helper buildContionalExpression operandType exists 2`] = `"(user?.age && user?.age > true) ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;
exports[`react-component-render-helper buildContionalExpression operandType exists 2`] = `"user?.age > true ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;

exports[`react-component-render-helper buildContionalExpression operandType exists 3`] = `"(user?.age && user?.age > \\"true\\") ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;
exports[`react-component-render-helper buildContionalExpression operandType exists 3`] = `"user?.age > \\"true\\" ? \\"Vote\\" : \\"Sorry you cannot vote\\""`;

exports[`react-component-render-helper buildFixedJsxExpression boolean 1`] = `"{true}"`;

Expand Down
30 changes: 11 additions & 19 deletions packages/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export default function ConditionalInMutation(
useStateMutationAction(\\"Default Value\\");
const conditionalPropertyMutationOnClick = () => {
setMutatedValueChildren(
user?.age && user?.age == 45 ? \\"Conditional Value\\" : \\"Unconditional Value\\"
user?.age == 45 ? \\"Conditional Value\\" : \\"Unconditional Value\\"
);
};
return (
Expand Down Expand Up @@ -1392,7 +1392,7 @@ export default function CollectionWithModelNameCollisions(
const buttonModelFilterObj = {
and: [
{ field: \\"age\\", operand: \\"10\\", operator: \\"gt\\" },
{ field: \\"lastName\\", operand: \\"L\\", operator: \\"beginsWith\\" },
{ field: \\"isActive\\", operand: true, operator: \\"eq\\" },
],
};
const buttonModelFilter =
Expand Down Expand Up @@ -5395,16 +5395,14 @@ export default function CustomButton(
/* @ts-ignore: TS2322 */
<Button
labelWidth={width}
disabled={
buttonUser?.isLoggedIn && buttonUser?.isLoggedIn == true ? true : false
}
disabled={buttonUser?.isLoggedIn == true ? true : false}
prompt={
buttonUser?.age && buttonUser?.age > 18
buttonUser?.age > 18
? \`\${buttonUser?.firstname}\${\\", cast your vote.\\"}\`
: \\"Sorry you cannot vote\\"
}
backgroundColor={
buttonUser?.isLoggedIn && buttonUser?.isLoggedIn == true
buttonUser?.isLoggedIn == true
? buttonUser?.loggedInColor
: buttonUser?.loggedOutColor
}
Expand Down Expand Up @@ -5465,22 +5463,16 @@ export default function ConditionalComponentWithDataBinding(
>
<Text
value={
student?.id && student?.id == \\"idstringuserinput\\"
? student?.createdAt
: student?.id
student?.id == \\"idstringuserinput\\" ? student?.createdAt : student?.id
}
children={
student?.id && student?.id == \\"idstringuserinput\\"
? student?.createdAt
: student?.id
student?.id == \\"idstringuserinput\\" ? student?.createdAt : student?.id
}
{...getOverrideProps(overrides, \\"Placeholder text\\")}
></Text>
<Button
value={
student?.id && student?.id == \\"idstringuserinput\\"
? student?.createdAt
: student?.id
student?.id == \\"idstringuserinput\\" ? student?.createdAt : student?.id
}
{...getOverrideProps(overrides, \\"Placeholder Button\\")}
></Button>
Expand Down Expand Up @@ -5518,7 +5510,7 @@ export default function CustomButton(
return (
/* @ts-ignore: TS2322 */
<Button
disabled={buttonColor && buttonColor == \\"red\\" ? true : false}
disabled={buttonColor == \\"red\\" ? true : false}
{...getOverrideProps(overrides, \\"CustomButton\\")}
{...rest}
></Button>
Expand Down Expand Up @@ -7205,12 +7197,12 @@ export default function InitialValueBindings(
if (
conditionalValueContentsChildren === undefined &&
user !== undefined &&
(user?.lastName && user?.lastName == \\"Bound Value\\"
(user?.lastName == \\"Bound Value\\"
? \\"Conditional Value\\"
: \\"Unconditional Value\\") !== undefined
)
setConditionalValueContentsChildren(
user?.lastName && user?.lastName == \\"Bound Value\\"
user?.lastName == \\"Bound Value\\"
? \\"Conditional Value\\"
: \\"Unconditional Value\\"
);
Expand Down
14 changes: 4 additions & 10 deletions packages/codegen-ui-react/lib/react-component-render-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,16 +514,10 @@ export function buildConditionalExpression(
: factory.createIdentifier(property);

return factory.createConditionalExpression(
factory.createParenthesizedExpression(
factory.createBinaryExpression(
propertyAccess,
factory.createToken(SyntaxKind.AmpersandAmpersandToken),
factory.createBinaryExpression(
propertyAccess,
operatorToken,
getConditionalOperandExpression(operand, operandType),
),
),
factory.createBinaryExpression(
propertyAccess,
operatorToken,
getConditionalOperandExpression(operand, operandType),
),
factory.createToken(SyntaxKind.QuestionToken),
resolvePropToExpression(componentMetadata, then),
Expand Down
7 changes: 4 additions & 3 deletions packages/codegen-ui/example-schemas/collectionWithModelNameCollisions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@
"operator": "gt"
},
{
"field": "lastName",
"operand": "L",
"operator": "beginsWith"
"field": "isActive",
"operand": "true",
"operator": "eq",
"operandType": "boolean"
}
]
}
Expand Down