fix: parse values for non-model arrays

aws-amplify · Jan 3, 2023 · ffb68b7 · ffb68b7
1 parent 47b179b
commit ffb68b7
Show file tree

Hide file tree

Showing 10 changed files with 946 additions and 90 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
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
@@ -22,6 +22,7 @@ import {
   Statement,
   VariableStatement,
   ExpressionStatement,
+  PropertyAssignment,
 } from 'typescript';
 import { getSetNameIdentifier, lowerCaseFirst } from '../../helpers';
 import { getDisplayValueObjectName } from './model-values';
@@ -198,10 +199,15 @@ export const buildDataStoreExpression = (
   const thisModelPrimaryKeys = dataSchema.models[modelName].primaryKeys;
   const hasManyDataStoreStatements: (VariableStatement | ExpressionStatement)[] = [];
   const hasManyRelationshipFields: string[] = [];
+  const nonModelArrayFields: string[] = [];
   const savedModelName = lowerCaseFirst(modelName);
 
   Object.entries(fieldConfigs).forEach((fieldConfig) => {
     const [fieldName, fieldConfigMetaData] = fieldConfig;
+    const { dataType, isArray } = fieldConfigMetaData;
+    if (isArray && dataType && typeof dataType === 'object' && 'nonModel' in dataType) {
+      nonModelArrayFields.push(fieldName);
+    }
     if (fieldConfigMetaData.relationship?.type === 'HAS_MANY') {
       hasManyRelationshipFields.push(fieldName);
 
@@ -250,6 +256,68 @@ export const buildDataStoreExpression = (
     );
   }
 
+  const propertyAssignments: PropertyAssignment[] = [];
+
+  hasManyRelationshipFields.forEach((field) => {
+    // CPKProjects: undefined
+    propertyAssignments.push(
+      factory.createPropertyAssignment(factory.createIdentifier(field), factory.createIdentifier('undefined')),
+    );
+  });
+
+  nonModelArrayFields.forEach((field) => {
+    // nonModelFieldArray: modelFields.nonModelFieldArray.map(s => JSON.parse(s))
+    propertyAssignments.push(
+      factory.createPropertyAssignment(
+        factory.createIdentifier(field),
+        factory.createCallExpression(
+          factory.createPropertyAccessExpression(
+            factory.createPropertyAccessExpression(
+              factory.createIdentifier('modelFields'),
+              factory.createIdentifier(field),
+            ),
+            factory.createIdentifier('map'),
+          ),
+          undefined,
+          [
+            factory.createArrowFunction(
+              undefined,
+              undefined,
+              [
+                factory.createParameterDeclaration(
+                  undefined,
+                  undefined,
+                  undefined,
+                  factory.createIdentifier('s'),
+                  undefined,
+                  undefined,
+                  undefined,
+                ),
+              ],
+              undefined,
+              factory.createToken(SyntaxKind.EqualsGreaterThanToken),
+              factory.createCallExpression(
+                factory.createPropertyAccessExpression(
+                  factory.createIdentifier('JSON'),
+                  factory.createIdentifier('parse'),
+                ),
+                undefined,
+                [factory.createIdentifier('s')],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  });
+
+  const modelFieldsObject = propertyAssignments.length
+    ? factory.createObjectLiteralExpression(
+        [factory.createSpreadAssignment(factory.createIdentifier('modelFields')), ...propertyAssignments],
+        true,
+      )
+    : factory.createIdentifier('modelFields');
+
   const genericSaveStatement = hasManyRelationshipFields.length
     ? [
         factory.createVariableStatement(
@@ -269,23 +337,7 @@ export const buildDataStoreExpression = (
                     undefined,
                     [
                       factory.createNewExpression(factory.createIdentifier(importedModelName), undefined, [
-                        // {
-                        //  ...modelFields,
-                        //  CPKClasses: undefined,
-                        //  CPKProjects: undefined
-                        // }
-                        factory.createObjectLiteralExpression(
-                          [
-                            factory.createSpreadAssignment(factory.createIdentifier('modelFields')),
-                            ...hasManyRelationshipFields.map((field) =>
-                              factory.createPropertyAssignment(
-                                factory.createIdentifier(field),
-                                factory.createIdentifier('undefined'),
-                              ),
-                            ),
-                          ],
-                          true,
-                        ),
+                        modelFieldsObject,
                       ]),
                     ],
                   ),
@@ -307,7 +359,7 @@ export const buildDataStoreExpression = (
               undefined,
               [
                 factory.createNewExpression(factory.createIdentifier(importedModelName), undefined, [
-                  factory.createIdentifier('modelFields'),
+                  modelFieldsObject,
                 ]),
               ],
             ),

diff --git a/packages/codegen-ui-react/lib/forms/form-renderer-helper/model-fields.ts b/packages/codegen-ui-react/lib/forms/form-renderer-helper/model-fields.ts
@@ -13,8 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-import { factory, NodeFlags, ObjectLiteralElementLike, SyntaxKind } from 'typescript';
-import { FieldConfigMetadata, isNonModelDataType } from '@aws-amplify/codegen-ui';
+import { factory, NodeFlags, ObjectLiteralElementLike } from 'typescript';
+import { FieldConfigMetadata } from '@aws-amplify/codegen-ui';
 
 /**
  * builds modelFields object which is used to validate, onSubmit, onSuccess/onError
@@ -38,7 +38,7 @@ export const buildModelFieldObject = (
   const fieldSet = new Set<string>();
   const fields = Object.keys(fieldConfigs).reduce<ObjectLiteralElementLike[]>((acc, value) => {
     const fieldName = value.split('.')[0];
-    const { sanitizedFieldName, dataType } = fieldConfigs[value];
+    const { sanitizedFieldName } = fieldConfigs[value];
     const renderedFieldName = sanitizedFieldName || fieldName;
     if (!fieldSet.has(renderedFieldName)) {
       let assignment: ObjectLiteralElementLike = factory.createShorthandPropertyAssignment(
@@ -56,23 +56,6 @@ export const buildModelFieldObject = (
         );
       }
 
-      /*
-       Empty string value for not required url field fails to save at datastore
-       let modelFields = {
-        url: url || undefined,
-       }
-      */
-      if ((dataType === 'AWSURL' || isNonModelDataType(dataType)) && !shouldBeConst) {
-        assignment = factory.createPropertyAssignment(
-          factory.createStringLiteral(fieldName),
-          factory.createBinaryExpression(
-            factory.createIdentifier(renderedFieldName),
-            factory.createToken(SyntaxKind.BarBarToken),
-            factory.createIdentifier('undefined'),
-          ),
-        );
-      }
-
       acc.push(assignment);
       fieldSet.add(renderedFieldName);
     }

diff --git a/packages/codegen-ui/example-schemas/datastore/post.json b/packages/codegen-ui/example-schemas/datastore/post.json
@@ -54,6 +54,15 @@
           "isRequired": false,
           "attributes": []
         },
+        "nonModelFieldArray": {
+          "name": "nonModelFieldArray",
+          "isArray": true,
+          "type": {
+            "nonModel": "CustomType"
+          },
+          "isRequired": false,
+          "attributes": []
+        },
         "createdAt": {
           "name": "createdAt",
           "isArray": false,

diff --git a/packages/test-generator/integration-test-templates/cypress/e2e/create-form-spec.cy.ts b/packages/test-generator/integration-test-templates/cypress/e2e/create-form-spec.cy.ts
@@ -132,6 +132,13 @@ describe('CreateForms', () => {
         getTextAreaByLabel('Non model field').type(JSON.stringify({ StringVal: 'myValue' }), {
           parseSpecialCharSequences: false,
         });
+
+        getArrayFieldButtonByLabel('Non model field array').click();
+        getTextAreaByLabel('Non model field array').type(JSON.stringify({ StringVal: 'index1StringValue' }), {
+          parseSpecialCharSequences: false,
+        });
+        clickAddToArray();
+
         getInputByLabel('Aws phone').type('714-234-4829');
         cy.get('select').select('San francisco');
 
@@ -196,6 +203,7 @@ describe('CreateForms', () => {
           expect(record.awsIPAddress).to.equal('192.0.2.146');
           expect(record.awsJson.myKey).to.equal('myValue');
           expect(record.nonModelField.StringVal).to.equal('myValue');
+          expect(record.nonModelFieldArray[0].StringVal).to.equal('index1StringValue');
           expect(record.awsPhone).to.equal('714-234-4829');
           expect(record.enum).to.equal('SAN_FRANCISCO');
           expect(record.stringArray[0]).to.equal('String1');

diff --git a/packages/test-generator/integration-test-templates/src/UpdateFormTests.tsx b/packages/test-generator/integration-test-templates/src/UpdateFormTests.tsx
@@ -116,7 +116,7 @@ const initializeAllSupportedFormFieldsTestData = async ({
       awsIPAddress: '123.12.34.56',
       boolean: true,
       awsJson: JSON.stringify({ myKey: 'myValue' }),
-      nonModelField: JSON.stringify({ StringVal: 'myValue' }),
+      nonModelField: { StringVal: 'myValue' },
       awsPhone: '713 343 5938',
       enum: 'NEW_YORK',
       HasOneUser: connectedUser,

diff --git a/packages/test-generator/integration-test-templates/src/models/index.d.ts b/packages/test-generator/integration-test-templates/src/models/index.d.ts
diff --git a/packages/test-generator/integration-test-templates/src/models/index.js b/packages/test-generator/integration-test-templates/src/models/index.js
@@ -52,6 +52,7 @@ const {
   CompositeToy,
   CompositeVet,
   CompositeDogCompositeVet,
+  CustomType,
 } = initSchema(schema);
 
 export {
@@ -77,4 +78,5 @@ export {
   CompositeToy,
   CompositeVet,
   CompositeDogCompositeVet,
+  CustomType,
 };
diff --git a/packages/test-generator/integration-test-templates/src/models/schema.js b/packages/test-generator/integration-test-templates/src/models/schema.js
@@ -741,6 +741,15 @@ export const schema = {
           isRequired: false,
           attributes: [],
         },
+        nonModelFieldArray: {
+          name: 'nonModelFieldArray',
+          isArray: true,
+          type: {
+            nonModel: 'CustomType',
+          },
+          isRequired: false,
+          attributes: [],
+        },
         HasOneUser: {
           name: 'HasOneUser',
           isArray: false,

diff --git a/packages/test-generator/lib/models/schema.ts b/packages/test-generator/lib/models/schema.ts
@@ -743,6 +743,15 @@ export default {
           isRequired: false,
           attributes: [],
         },
+        nonModelFieldArray: {
+          name: 'nonModelFieldArray',
+          isArray: true,
+          type: {
+            nonModel: 'CustomType',
+          },
+          isRequired: false,
+          attributes: [],
+        },
         HasOneUser: {
           name: 'HasOneUser',
           isArray: false,