fix: coalesce missing record to empty array

aws-amplify · Feb 22, 2024 · 8298ab1 · 8298ab1
1 parent 80413d4
commit 8298ab1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 30 deletions.
diff --git a/...s/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react-forms.test.ts.snap b/...s/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react-forms.test.ts.snap
@@ -32764,11 +32764,11 @@ export default function UpdateCompositeDogForm(props) {
       setLinkedCompositeToys(linkedCompositeToys);
       const linkedCompositeVets = record
         ? await Promise.all(
-            (
-              await record?.CompositeVets?.toArray()
-            ).map((r) => {
-              return r.compositeVet;
-            })
+            ((record && (await record.CompositeVets?.toArray())) || []).map(
+              (r) => {
+                return r.compositeVet;
+              }
+            )
           )
         : [];
       setLinkedCompositeVets(linkedCompositeVets);
@@ -33887,11 +33887,11 @@ export default function UpdateCPKTeacherForm(props) {
       setCPKStudent(CPKStudentRecord);
       const linkedCPKClasses = record
         ? await Promise.all(
-            (
-              await record?.CPKClasses?.toArray()
-            ).map((r) => {
-              return r.cpkClass;
-            })
+            ((record && (await record.CPKClasses?.toArray())) || []).map(
+              (r) => {
+                return r.cpkClass;
+              }
+            )
           )
         : [];
       setLinkedCPKClasses(linkedCPKClasses);
@@ -37260,11 +37260,11 @@ export default function UpdateCompositeDogForm(props) {
       setLinkedCompositeToys(linkedCompositeToys);
       const linkedCompositeVets = record
         ? await Promise.all(
-            (
-              await record?.CompositeVets?.toArray()
-            ).map((r) => {
-              return r.compositeVet;
-            })
+            ((record && (await record.CompositeVets?.toArray())) || []).map(
+              (r) => {
+                return r.compositeVet;
+              }
+            )
           )
         : [];
       setLinkedCompositeVets(linkedCompositeVets);
@@ -47889,9 +47889,7 @@ export default function TagUpdateForm(props) {
       setTagRecord(record);
       const linkedPosts = record
         ? await Promise.all(
-            (
-              await record?.Posts?.toArray()
-            ).map((r) => {
+            ((record && (await record.Posts?.toArray())) || []).map((r) => {
               return r.post;
             })
           )

diff --git a/packages/codegen-ui-react/lib/__tests__/studio-ui-codegen-react-forms.test.ts b/packages/codegen-ui-react/lib/__tests__/studio-ui-codegen-react-forms.test.ts
@@ -159,7 +159,7 @@ describe('amplify form renderer tests', () => {
       expect(componentText).toContain('const postRecords = useDataStoreBinding({');
 
       // check lazy load linked data
-      expect(componentText).toContain('await record?.Posts?.toArray()');
+      expect(componentText).toContain('((record && (await record.Posts?.toArray())) || []).map');
 
       // check custom display value is set
       expect(componentText).toContain('Posts: (r) => r?.title');

diff --git a/packages/codegen-ui-react/lib/forms/form-renderer-helper/relationship.ts b/packages/codegen-ui-react/lib/forms/form-renderer-helper/relationship.ts
@@ -1231,20 +1231,28 @@ export const buildGetRelationshipModels = (
                         factory.createCallExpression(
                           factory.createPropertyAccessExpression(
                             factory.createParenthesizedExpression(
-                              factory.createAwaitExpression(
-                                factory.createCallExpression(
-                                  factory.createPropertyAccessChain(
-                                    factory.createPropertyAccessChain(
-                                      factory.createIdentifier('record'),
-                                      factory.createToken(SyntaxKind.QuestionDotToken),
-                                      factory.createIdentifier(fieldName),
+                              factory.createBinaryExpression(
+                                factory.createBinaryExpression(
+                                  factory.createIdentifier('record'),
+                                  factory.createToken(SyntaxKind.AmpersandAmpersandToken),
+                                  factory.createAwaitExpression(
+                                    factory.createCallChain(
+                                      factory.createPropertyAccessChain(
+                                        factory.createPropertyAccessExpression(
+                                          factory.createIdentifier('record'),
+                                          factory.createIdentifier(fieldName),
+                                        ),
+                                        factory.createToken(SyntaxKind.QuestionDotToken),
+                                        factory.createIdentifier('toArray'),
+                                      ),
+                                      undefined,
+                                      undefined,
+                                      [],
                                     ),
-                                    factory.createToken(SyntaxKind.QuestionDotToken),
-                                    factory.createIdentifier('toArray'),
                                   ),
-                                  undefined,
-                                  [],
                                 ),
+                                factory.createToken(SyntaxKind.BarBarToken),
+                                factory.createArrayLiteralExpression([], false),
                               ),
                             ),
                             factory.createIdentifier('map'),