fix: update inputs for linking and unlinking bidirectional relationships

aws-amplify · Aug 18, 2023 · c52c565 · c52c565
1 parent 99ea1ae
commit c52c565
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 26 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
@@ -342,8 +342,8 @@ export default function CreateOwnerForm(props) {
                 query: updateDog,
                 variables: {
                   input: {
-                    ...Dog,
-                    owner: owner,
+                    id: Dog.id,
+                    dogOwnerId: owner.id,
                   },
                 },
               })
@@ -355,9 +355,8 @@ export default function CreateOwnerForm(props) {
                   query: updateOwner,
                   variables: {
                     input: {
-                      ...ownerToUnlink,
-                      Dog: undefined,
-                      ownerDogId: undefined,
+                      id: ownerToUnlink.id,
+                      ownerDogId: null,
                     },
                   },
                 })
@@ -15632,8 +15631,11 @@ export default function CreateCompositeDogForm(props) {
                 query: updateCompositeOwner,
                 variables: {
                   input: {
-                    ...CompositeOwner,
-                    CompositeDog: compositeDog,
+                    lastName: CompositeOwner.lastName,
+                    firstName: CompositeOwner.firstName,
+                    compositeOwnerCompositeDogName: compositeDog.name,
+                    compositeOwnerCompositeDogDescription:
+                      compositeDog.description,
                   },
                 },
               })
@@ -15646,10 +15648,10 @@ export default function CreateCompositeDogForm(props) {
                   query: updateCompositeDog,
                   variables: {
                     input: {
-                      ...compositeDogToUnlink,
-                      CompositeOwner: undefined,
-                      compositeDogCompositeOwnerLastName: undefined,
-                      compositeDogCompositeOwnerFirstName: undefined,
+                      name: compositeDogToUnlink.name,
+                      description: compositeDogToUnlink.description,
+                      compositeDogCompositeOwnerLastName: null,
+                      compositeDogCompositeOwnerFirstName: null,
                     },
                   },
                 })
@@ -18708,7 +18710,6 @@ import {
   useTheme,
 } from \\"@aws-amplify/ui-react\\";
 import { getOverrideProps } from \\"@aws-amplify/ui-react/internal\\";
-import { Owner } from \\"../API\\";
 import { fetchByPath, validateField } from \\"./utils\\";
 import { API } from \\"aws-amplify\\";
 import { listOwners } from \\"../graphql/queries\\";
@@ -19034,8 +19035,8 @@ export default function CreateDogForm(props) {
                 query: updateOwner,
                 variables: {
                   input: {
-                    ...Owner,
-                    Dog: dog,
+                    id: owner.id,
+                    ownerDogId: dog.id,
                   },
                 },
               })
@@ -19581,8 +19582,8 @@ export default function CreateOwnerForm(props) {
                 query: updateDog,
                 variables: {
                   input: {
-                    ...Dog,
-                    owner: owner,
+                    id: Dog.id,
+                    dogOwnerId: owner.id,
                   },
                 },
               })
@@ -19594,9 +19595,8 @@ export default function CreateOwnerForm(props) {
                   query: updateOwner,
                   variables: {
                     input: {
-                      ...ownerToUnlink,
-                      Dog: undefined,
-                      ownerDogId: undefined,
+                      id: ownerToUnlink.id,
+                      ownerDogId: null,
                     },
                   },
                 })

diff --git a/packages/codegen-ui-react/lib/forms/form-renderer-helper/bidirectional-relationship.ts b/packages/codegen-ui-react/lib/forms/form-renderer-helper/bidirectional-relationship.ts
@@ -85,13 +85,15 @@ function getFieldBiDirectionalWith({
 
 function unlinkModelRecordExpression({
   modelName,
+  primaryKeys,
   recordNameToUnlink,
   fieldName,
   associatedFields,
   importCollection,
   dataApi,
 }: {
   modelName: string;
+  primaryKeys: string[];
   recordNameToUnlink: string;
   fieldName: string;
   associatedFields: string[];
@@ -100,10 +102,14 @@ function unlinkModelRecordExpression({
 }) {
   if (dataApi === 'GraphQL') {
     const inputs = [
-      factory.createSpreadAssignment(factory.createIdentifier(recordNameToUnlink)),
-      factory.createPropertyAssignment(factory.createIdentifier(fieldName), factory.createIdentifier('undefined')),
+      ...primaryKeys.map((primaryKey) =>
+        factory.createPropertyAssignment(
+          factory.createIdentifier(primaryKey),
+          factory.createPropertyAccessChain(factory.createIdentifier(recordNameToUnlink), undefined, primaryKey),
+        ),
+      ),
       ...associatedFields.map((field) =>
-        factory.createPropertyAssignment(factory.createIdentifier(field), factory.createIdentifier('undefined')),
+        factory.createPropertyAssignment(factory.createIdentifier(field), factory.createNull()),
       ),
     ];
 
@@ -254,23 +260,38 @@ function linkModelRecordExpression({
   importedRelatedModelName,
   relatedRecordToLink,
   fieldBiDirectionalWithName,
+  fieldName,
   currentRecord,
   importCollection,
+  primaryKeys,
+  associatedPrimaryKeys,
+  associatedFieldsBiDirectionalWith,
   dataApi,
 }: {
   importedRelatedModelName: string;
   relatedRecordToLink: string;
   fieldBiDirectionalWithName: string;
+  fieldName: string;
   currentRecord: string;
   importCollection: ImportCollection;
+  primaryKeys: string[];
+  associatedPrimaryKeys: string[];
+  associatedFieldsBiDirectionalWith: string[];
   dataApi?: DataApiKind;
 }) {
   if (dataApi === 'GraphQL') {
     const inputs = [
-      factory.createSpreadAssignment(factory.createIdentifier(importedRelatedModelName)),
-      factory.createPropertyAssignment(
-        factory.createIdentifier(fieldBiDirectionalWithName),
-        factory.createIdentifier(currentRecord),
+      ...associatedPrimaryKeys.map((associatedPrimaryKey) =>
+        factory.createPropertyAssignment(
+          factory.createIdentifier(associatedPrimaryKey),
+          factory.createPropertyAccessChain(factory.createIdentifier(fieldName), undefined, associatedPrimaryKey),
+        ),
+      ),
+      ...associatedFieldsBiDirectionalWith.map((associatedField, index) =>
+        factory.createPropertyAssignment(
+          factory.createIdentifier(associatedField),
+          factory.createPropertyAccessChain(factory.createIdentifier(currentRecord), undefined, primaryKeys[index]),
+        ),
       ),
     ];
 
@@ -351,6 +372,7 @@ export function getBiDirectionalRelationshipStatements({
   fieldConfig,
   modelName,
   savedRecordName,
+  thisModelPrimaryKeys,
   dataApi,
 }: {
   formActionType: 'create' | 'update';
@@ -359,6 +381,7 @@ export function getBiDirectionalRelationshipStatements({
   fieldConfig: [string, FieldConfigMetadata];
   modelName: string;
   savedRecordName: string;
+  thisModelPrimaryKeys: string[];
   dataApi?: DataApiKind;
 }) {
   const getFieldBiDirectionalWithReturnValue = getFieldBiDirectionalWith({
@@ -445,6 +468,7 @@ export function getBiDirectionalRelationshipStatements({
                   })
                 : unlinkModelRecordExpression({
                     modelName: importedRelatedModelName,
+                    primaryKeys: thisModelPrimaryKeys,
                     recordNameToUnlink: relatedRecordToUnlink,
                     fieldName: fieldBiDirectionalWithName,
                     associatedFields: associatedFieldsBiDirectionalWith,
@@ -530,8 +554,12 @@ export function getBiDirectionalRelationshipStatements({
               importedRelatedModelName,
               relatedRecordToLink,
               fieldBiDirectionalWithName,
+              fieldName,
               currentRecord,
               importCollection,
+              primaryKeys: thisModelPrimaryKeys,
+              associatedPrimaryKeys: fieldBiDirectionalWithPrimaryKeys,
+              associatedFieldsBiDirectionalWith,
               dataApi,
             }),
             factory.createVariableStatement(
@@ -571,6 +599,7 @@ export function getBiDirectionalRelationshipStatements({
                       })
                     : unlinkModelRecordExpression({
                         modelName: importedThisModelName,
+                        primaryKeys: thisModelPrimaryKeys,
                         recordNameToUnlink: thisModelRecordToUnlink,
                         fieldName,
                         associatedFields,

diff --git a/packages/codegen-ui-react/lib/forms/form-renderer-helper/cta-props.ts b/packages/codegen-ui-react/lib/forms/form-renderer-helper/cta-props.ts
@@ -271,6 +271,7 @@ export const buildExpression = (
         fieldConfig,
         modelName,
         savedRecordName,
+        thisModelPrimaryKeys,
         dataApi,
       }),
     );