fix: add fallback to record items

aws-amplify · Aug 4, 2023 · 4d95d36 · 4d95d36
1 parent 5b553e9
commit 4d95d36
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 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
@@ -4444,7 +4444,7 @@ export default function PostUpdateForm(props) {
             })
           )?.data?.getPost
         : postModelProp;
-      const linkedComments = record ? record.Comment?.items : [];
+      const linkedComments = record?.Comment?.items ?? [];
       setLinkedComments(linkedComments);
       setPostRecord(record);
     };
@@ -8783,7 +8783,7 @@ export default function UpdateCPKTeacherForm(props) {
           )
         : [];
       setLinkedCPKClasses(linkedCPKClasses);
-      const linkedCPKProjects = record ? record.CPKProject?.items : [];
+      const linkedCPKProjects = record?.CPKProject?.items ?? [];
       setLinkedCPKProjects(linkedCPKProjects);
       setCPKTeacherRecord(record);
     };
@@ -12994,7 +12994,7 @@ export default function UpdatePostForm(props) {
             })
           )?.data?.getPost
         : postModelProp;
-      const linkedComments = record ? record.Comment?.items : [];
+      const linkedComments = record?.Comment?.items ?? [];
       setLinkedComments(linkedComments);
       setPostRecord(record);
     };

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
@@ -231,6 +231,22 @@ function createHasManyUpdateRelatedModelBlock({
   return factory.createBlock(statements, true);
 }
 
+function graphqlLinkedRecordsFallback(modelName: string) {
+  return factory.createBinaryExpression(
+    factory.createPropertyAccessChain(
+      factory.createPropertyAccessChain(
+        factory.createIdentifier('record'),
+        factory.createToken(SyntaxKind.QuestionDotToken),
+        factory.createIdentifier(modelName),
+      ),
+      factory.createToken(SyntaxKind.QuestionDotToken),
+      factory.createIdentifier('items'),
+    ),
+    factory.createToken(SyntaxKind.QuestionQuestionToken),
+    factory.createArrayLiteralExpression([], false),
+  );
+}
+
 export const buildManyToManyRelationshipStatements = (
   dataStoreActionType: 'update' | 'create',
   modelName: string,
@@ -1248,19 +1264,12 @@ export const buildGetRelationshipModels = (
               factory.createIdentifier(linkedDataName),
               undefined,
               undefined,
-              factory.createConditionalExpression(
-                recordIdentifier,
-                factory.createToken(SyntaxKind.QuestionToken),
-                dataApi === 'GraphQL'
-                  ? factory.createPropertyAccessChain(
-                      factory.createPropertyAccessExpression(
-                        factory.createIdentifier('record'),
-                        factory.createIdentifier(relatedModelName),
-                      ),
-                      factory.createToken(SyntaxKind.QuestionDotToken),
-                      factory.createIdentifier('items'),
-                    )
-                  : factory.createAwaitExpression(
+              dataApi === 'GraphQL'
+                ? graphqlLinkedRecordsFallback(relatedModelName)
+                : factory.createConditionalExpression(
+                    recordIdentifier,
+                    factory.createToken(SyntaxKind.QuestionToken),
+                    factory.createAwaitExpression(
                       factory.createCallExpression(
                         factory.createPropertyAccessExpression(
                           factory.createPropertyAccessExpression(recordIdentifier, factory.createIdentifier(fieldName)),
@@ -1270,9 +1279,9 @@ export const buildGetRelationshipModels = (
                         [],
                       ),
                     ),
-                factory.createToken(SyntaxKind.ColonToken),
-                factory.createArrayLiteralExpression([], false),
-              ),
+                    factory.createToken(SyntaxKind.ColonToken),
+                    factory.createArrayLiteralExpression([], false),
+                  ),
             ),
           ],
           NodeFlags.Const,