fix: change GraphQL unlink to use update action instead of delete

aws-amplify · Jul 25, 2023 · 0a4d469 · 0a4d469
1 parent 690f928
commit 0a4d469
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 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
@@ -4232,7 +4232,7 @@ import { getOverrideProps } from \\"@aws-amplify/ui-react/internal\\";
 import { fetchByPath, validateField } from \\"./utils\\";
 import { API } from \\"aws-amplify\\";
 import { commentsByPostID, getPost, listComments } from \\"../graphql/queries\\";
-import { deleteComment, updateComment, updatePost } from \\"../graphql/mutations\\";
+import { updateComment, updatePost } from \\"../graphql/mutations\\";
 function ArrayField({
   items = [],
   onChange,
@@ -4620,10 +4620,11 @@ export default function PostUpdateForm(props) {
             }
             promises.push(
               API.graphql({
-                query: deleteComment,
+                query: updateComment,
                 variables: {
                   input: {
                     id: original.id,
+                    postID: null,
                   },
                 },
               })
@@ -7739,7 +7740,6 @@ import {
 } from \\"../graphql/queries\\";
 import {
   createCPKTeacherCPKClass,
-  deleteCPKProject,
   deleteCPKTeacherCPKClass,
   updateCPKProject,
   updateCPKTeacher,
@@ -8321,10 +8321,11 @@ export default function UpdateCPKTeacherForm(props) {
             }
             promises.push(
               API.graphql({
-                query: deleteCPKProject,
+                query: updateCPKProject,
                 variables: {
                   input: {
                     specialProjectId: original.specialProjectId,
+                    cPKTeacherID: null,
                   },
                 },
               })

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
@@ -39,7 +39,7 @@ import {
   getRecordName,
 } from './form-state';
 import { buildBaseCollectionVariableStatement } from '../../react-studio-template-renderer-helper';
-import { ImportCollection, ImportSource } from '../../imports';
+import { ImportCollection } from '../../imports';
 import { lowerCaseFirst, getSetNameIdentifier, capitalizeFirstLetter } from '../../helpers';
 import { isManyToManyRelationship } from './map-from-fieldConfigs';
 import { extractModelAndKeys, getIDValueCallChain, getMatchEveryModelFieldCallExpression } from './model-values';
@@ -1233,7 +1233,7 @@ export const buildHasManyRelationshipStatements = (
   fieldName = fieldConfigMetaData.sanitizedFieldName || fieldName;
   const { relatedModelName, relatedModelFields, belongsToFieldOnRelatedModel } =
     fieldConfigMetaData.relationship as HasManyRelationshipType;
-  const relatedModelVariableName = importCollection.getMappedAlias(ImportSource.LOCAL_MODELS, relatedModelName);
+  const relatedModelVariableName = importCollection.getMappedModelAlias(relatedModelName);
   const linkedDataName = getLinkedDataName(fieldName);
   const dataToLink = `${lowerCaseFirst(fieldName)}ToLink`;
   const dataToUnLink = `${lowerCaseFirst(fieldName)}ToUnLink`;
@@ -1566,16 +1566,25 @@ export const buildHasManyRelationshipStatements = (
                       undefined,
                       [
                         dataApi === 'GraphQL'
-                          ? getGraphqlCallExpression(ActionType.DELETE, relatedModelName, importCollection, {
-                              inputs: keys.map((key) =>
-                                factory.createPropertyAssignment(
-                                  factory.createIdentifier(key),
-                                  factory.createPropertyAccessExpression(
-                                    factory.createIdentifier('original'),
+                          ? getGraphqlCallExpression(ActionType.UPDATE, relatedModelName, importCollection, {
+                              inputs: keys
+                                .map((key) =>
+                                  factory.createPropertyAssignment(
                                     factory.createIdentifier(key),
+                                    factory.createPropertyAccessExpression(
+                                      factory.createIdentifier('original'),
+                                      factory.createIdentifier(key),
+                                    ),
+                                  ),
+                                )
+                                .concat(
+                                  relatedModelFields.map((key) =>
+                                    factory.createPropertyAssignment(
+                                      factory.createIdentifier(key),
+                                      factory.createNull(),
+                                    ),
                                   ),
                                 ),
-                              ),
                             })
                           : getUpdateRelatedModelExpression(
                               thisModelRecord,