Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: onSubmit for custom forms #552

Merged
merged 1 commit into from
Aug 3, 2022
Merged

fix: onSubmit for custom forms #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions ...s/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react-forms.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
useStateMutationAction,
} from \\"@aws-amplify/ui-react/internal\\";
import { Button, Flex, Grid, TextField } from \\"@aws-amplify/ui-react\\";
import { DataStore } from \\"aws-amplify\\";
export default function customDataForm(props) {
const {
onSubmit: customDataFormOnSubmit,
Expand All @@ -26,22 +25,7 @@ export default function customDataForm(props) {
<form
onSubmit={async (event) => {
event.preventDefault();
if (onSubmitBefore) {
setModelFields(onSubmitBefore({ fields: modelFields }));
}
try {
await DataStore.save(new Post(modelFields));
if (onSubmitComplete) {
onSubmitComplete({ saveSuccessful: true });
}
} catch (err) {
if (onSubmitComplete) {
onSubmitComplete({
saveSuccessful: false,
errorMessage: err.message,
});
}
}
await customDataFormOnSubmit(modelFields);
}}
{...rest}
{...getOverrideProps(overrides, \\"customDataForm\\")}
Expand Down
37 changes: 35 additions & 2 deletions packages/codegen-ui-react/lib/__tests__/__utils__/amplify-renderer-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,26 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
import { StudioTemplateRendererFactory, GenericDataSchema, StudioComponent } from '@aws-amplify/codegen-ui';
import {
StudioTemplateRendererFactory,
GenericDataSchema,
StudioComponent,
getGenericFromDataStore,
Schema,
StudioForm,
} from '@aws-amplify/codegen-ui';
import { AmplifyFormRenderer } from '../../amplify-ui-renderers/amplify-form-renderer';
import { AmplifyRenderer } from '../../amplify-ui-renderers/amplify-renderer';
import { ReactRenderConfig } from '../../react-render-config';
import { ModuleKind, ReactRenderConfig, ScriptKind, ScriptTarget } from '../../react-render-config';
import { loadSchemaFromJSONFile } from './example-schema';

export const defaultCLIRenderConfig: ReactRenderConfig = {
module: ModuleKind.ES2020,
target: ScriptTarget.ES2020,
script: ScriptKind.JSX,
renderTypeDeclarations: true,
};

export const generateWithAmplifyRenderer = (
jsonSchemaFile: string,
renderConfig: ReactRenderConfig = {},
Expand All @@ -32,3 +47,21 @@ export const generateWithAmplifyRenderer = (
? { componentText: renderer.renderSampleCodeSnippet().compText }
: renderer.renderComponent();
};

export const generateWithAmplifyFormRenderer = (
formJsonFile: string,
dataSchemaJsonFile: string | undefined,
renderConfig: ReactRenderConfig = defaultCLIRenderConfig,
): { componentText: string; declaration?: string } => {
let dataSchema: GenericDataSchema | undefined;
if (dataSchemaJsonFile) {
const dataStoreSchema = loadSchemaFromJSONFile<Schema>(dataSchemaJsonFile);
dataSchema = getGenericFromDataStore(dataStoreSchema);
}
const rendererFactory = new StudioTemplateRendererFactory(
(component: StudioForm) => new AmplifyFormRenderer(component, dataSchema, renderConfig),
);

const renderer = rendererFactory.buildRenderer(loadSchemaFromJSONFile<StudioForm>(formJsonFile));
return renderer.renderComponent();
};
33 changes: 2 additions & 31 deletions packages/codegen-ui-react/lib/__tests__/studio-ui-codegen-react-forms.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/

import { StudioTemplateRendererFactory } from '@aws-amplify/codegen-ui/lib/template-renderer-factory';
import { StudioForm, Schema, GenericDataSchema, getGenericFromDataStore } from '@aws-amplify/codegen-ui';
import { ReactRenderConfig, AmplifyFormRenderer, ModuleKind, ScriptKind, ScriptTarget } from '..';
import { loadSchemaFromJSONFile } from './__utils__';

export const defaultCLIRenderConfig: ReactRenderConfig = {
module: ModuleKind.ES2020,
target: ScriptTarget.ES2020,
script: ScriptKind.JSX,
renderTypeDeclarations: true,
};

export const generateWithAmplifyFormRenderer = (
formJsonFile: string,
dataSchemaJsonFile: string | undefined,
renderConfig: ReactRenderConfig = defaultCLIRenderConfig,
): { componentText: string; declaration?: string } => {
let dataSchema: GenericDataSchema | undefined;
if (dataSchemaJsonFile) {
const dataStoreSchema = loadSchemaFromJSONFile<Schema>(dataSchemaJsonFile);
dataSchema = getGenericFromDataStore(dataStoreSchema);
}
const rendererFactory = new StudioTemplateRendererFactory(
(component: StudioForm) => new AmplifyFormRenderer(component, dataSchema, renderConfig),
);

const renderer = rendererFactory.buildRenderer(loadSchemaFromJSONFile<StudioForm>(formJsonFile));
return renderer.renderComponent();
};
import { generateWithAmplifyFormRenderer } from './__utils__';

describe('amplify form renderer tests', () => {
describe('datastore form tests', () => {
Expand Down Expand Up @@ -70,7 +41,7 @@ describe('amplify form renderer tests', () => {
describe('custom form tests', () => {
it('should render a custom backed form', () => {
const { componentText, declaration } = generateWithAmplifyFormRenderer('forms/post-custom-create', undefined);
expect(componentText.replace(/\s/g, '')).toContain('setModelFields(onSubmitBefore');
expect(componentText.replace(/\s/g, '')).toContain('onSubmit:customDataFormOnSubmit');
expect(componentText).toMatchSnapshot();
expect(declaration).toMatchSnapshot();
});
Expand Down
Loading