feat: various workflow cleanup (#383)

aws-amplify · Feb 25, 2022 · db2c7c6 · db2c7c6
1 parent 91f6786
commit db2c7c6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/packages/codegen-ui-react/lib/react-component-renderer.ts b/packages/codegen-ui-react/lib/react-component-renderer.ts
@@ -95,7 +95,7 @@ export class ReactComponentRenderer<TPropIn> extends ComponentRendererBase<
       .map(([key]) =>
         buildOpeningElementControlEvents(
           getSetStateName({ componentName: this.component.name || '', property: key }),
-          'change', // TODO: use component event mapping
+          'change',
         ),
       );
 

diff --git a/packages/codegen-ui-react/lib/react-component-with-children-renderer.ts b/packages/codegen-ui-react/lib/react-component-with-children-renderer.ts
@@ -93,7 +93,7 @@ export class ReactComponentWithChildrenRenderer<TPropIn> extends ComponentWithCh
       .map(([key]) =>
         buildOpeningElementControlEvents(
           getSetStateName({ componentName: this.component.name || '', property: key }),
-          'change', // TODO: use component event mapping
+          'change',
         ),
       );
 

diff --git a/packages/codegen-ui-react/lib/workflow/action.ts b/packages/codegen-ui-react/lib/workflow/action.ts
@@ -108,9 +108,11 @@ export function buildUseActionStatement(
           factory.createIdentifier(identifier),
           undefined,
           undefined,
-          factory.createCallExpression(factory.createIdentifier(actionHookImportValue), undefined, [
-            buildActionParameters(action, importCollection),
-          ]),
+          factory.createCallExpression(
+            factory.createIdentifier(actionHookImportValue),
+            undefined,
+            buildActionArguments(action, importCollection),
+          ),
         ),
       ],
       ts.NodeFlags.Const,
@@ -165,24 +167,25 @@ export function buildMutationActionStatement(component: StudioComponent, action:
  *
  * model and fields are special cases. All other fields are StudioComponentProperty
  */
-export function buildActionParameters(
+export function buildActionArguments(
   action: ActionStudioComponentEvent,
   importCollection: ImportCollection,
-): ObjectLiteralExpression {
+): ObjectLiteralExpression[] | undefined {
   if (action.parameters) {
-    // TODO: add special case for model and fields
-    return factory.createObjectLiteralExpression(
-      Object.entries(action.parameters).map(([key, value]) =>
-        factory.createPropertyAssignment(
-          factory.createIdentifier(key),
-          getActionParameterValue(key, value, importCollection),
+    return [
+      factory.createObjectLiteralExpression(
+        Object.entries(action.parameters).map(([key, value]) =>
+          factory.createPropertyAssignment(
+            factory.createIdentifier(key),
+            getActionParameterValue(key, value, importCollection),
+          ),
         ),
+        false,
       ),
-      false,
-    );
+    ];
   }
-  // TODO: determine what should be used when no parameters
-  return factory.createObjectLiteralExpression([], false);
+
+  return undefined;
 }
 
 export function getActionParameterValue(