fix: fix datastore submit statement (#800)

* fix: fix incorrect branch out * chore: update snapshots * chore: remove unused function
aws-amplify · Nov 29, 2022 · f00cf16 · f00cf16
1 parent c25b427
commit f00cf16
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 333 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
@@ -7158,6 +7158,7 @@ export default function SchoolUpdateForm(props) {
           modelFields = onSubmit(modelFields);
         }
         try {
+          const promises = [];
           const studentsToLink = [];
           const studentsToUnLink = [];
           const studentsSet = new Set();
@@ -7174,7 +7175,6 @@ export default function SchoolUpdateForm(props) {
               studentsToLink.push(r);
             }
           });
-          const promises = [];
           studentsToUnLink.forEach((original) => {
             promises.push(
               DataStore.save(
@@ -7871,6 +7871,7 @@ function ArrayField({
   lengthLimit,
   getBadgeText,
 }) {
+  const labelElement = <Text>{label}</Text>;
   const { tokens } = useTheme();
   const [selectedBadgeIndex, setSelectedBadgeIndex] = React.useState();
   const [isEditing, setIsEditing] = React.useState();
@@ -7954,11 +7955,16 @@ function ArrayField({
     </React.Fragment>
   );
   if (lengthLimit !== undefined && items.length >= lengthLimit && !isEditing) {
-    return arraySection;
+    return (
+      <React.Fragment>
+        {labelElement}
+        {arraySection}
+      </React.Fragment>
+    );
   }
   return (
     <React.Fragment>
-      <Text>{label}</Text>
+      {labelElement}
       {isEditing && children}
       {!isEditing ? (
         <>
@@ -8140,6 +8146,7 @@ export default function TagUpdateForm(props) {
           modelFields = onSubmit(modelFields);
         }
         try {
+          const promises = [];
           const postsToLinkMap = new Map();
           const postsToUnLinkMap = new Map();
           const postsMap = new Map();
@@ -8176,7 +8183,6 @@ export default function TagUpdateForm(props) {
               postsToLinkMap.set(id, count);
             }
           });
-          const promises = [];
           postsToUnLinkMap.forEach(async (count, id) => {
             const tagPostRecords = await DataStore.query(TagPost, (r) =>
               r.and((r) => [r.postID.eq(id), r.tagID.eq(tagRecord.id)])
@@ -8264,9 +8270,10 @@ export default function TagUpdateForm(props) {
         items={Posts}
         hasError={errors.Posts?.hasError}
         getBadgeText={getDisplayValue.Posts}
-        setFieldValue={(model) =>
-          setCurrentPostsDisplayValue(getDisplayValue.Posts(model))
-        }
+        setFieldValue={(model) => {
+          setCurrentPostsDisplayValue(getDisplayValue.Posts(model));
+          setCurrentPostsValue(model);
+        }}
         inputFieldRef={PostsRef}
         defaultFieldValue={\\"\\"}
       >

diff --git a/packages/codegen-ui-react/lib/amplify-ui-renderers/form.ts b/packages/codegen-ui-react/lib/amplify-ui-renderers/form.ts
@@ -26,7 +26,7 @@ import { ReactComponentRenderer } from '../react-component-renderer';
 import { buildLayoutProperties, buildOpeningElementProperties } from '../react-component-render-helper';
 import { ImportCollection, ImportSource } from '../imports';
 import { buildDataStoreExpression } from '../forms';
-import { onSubmitValidationRun, buildModelFieldObject, getHasManyFieldConfigs } from '../forms/form-renderer-helper';
+import { onSubmitValidationRun, buildModelFieldObject } from '../forms/form-renderer-helper';
 import { hasTokenReference } from '../utils/forms/layout-helpers';
 import { resetFunctionCheck } from '../forms/form-renderer-helper/value-props';
 import { isModelDataType } from '../forms/form-renderer-helper/render-checkers';
@@ -98,7 +98,6 @@ export default class FormRenderer extends ReactComponentRenderer<BaseComponentPr
     if (!formMetadata) {
       throw new Error(`Form Metadata is missing from form: ${this.component.name}`);
     }
-    const hasManyFieldConfigs = getHasManyFieldConfigs(formMetadata.fieldConfigs);
 
     const onSubmitIdentifier = factory.createIdentifier('onSubmit');
 
@@ -134,7 +133,7 @@ export default class FormRenderer extends ReactComponentRenderer<BaseComponentPr
         factory.createTryStatement(
           factory.createBlock(
             [
-              ...buildDataStoreExpression(formActionType, importedModelName, hasManyFieldConfigs),
+              ...buildDataStoreExpression(formActionType, importedModelName, formMetadata.fieldConfigs),
               // call onSuccess hook if it exists
               factory.createIfStatement(
                 factory.createIdentifier('onSuccess'),