Skip to content

Commit 4d76058

Browse files
author
Justin Shih
committed
fix: remove async map generic dataschema
1 parent f79a767 commit 4d76058

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

packages/amplify-util-uibuilder/src/__tests__/generateComponents.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const getUiBuilderComponentsPathMocked = getUiBuilderComponentsPath as any;
3535
utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(true);
3636
utilsMock.notifyMissingPackages = jest.fn().mockReturnValue(true);
3737
utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue({});
38+
utilsMock.mapGenericDataSchemaToCodegen = jest.fn().mockReturnValue({});
3839
utilsMock.isFormDetachedFromModel = jest.fn().mockReturnValue(false);
3940
utilsMock.extractUIComponents = jest.fn().mockReturnValue(undefined);
4041
utilsMock.waitForSucceededJob = jest

packages/amplify-util-uibuilder/src/commands/generateComponents.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
3535
studioClient.isGraphQLSupported ? getAmplifyDataSchema(context) : Promise.resolve(undefined),
3636
]);
3737
const genericDataSchema = dataSchema ? mapGenericDataSchemaToCodegen(dataSchema) : undefined;
38-
38+
3939
const canGenerateDataComponents = genericDataSchema && studioClient.isGraphQLSupported;
4040

4141
const apiConfiguration: AmplifyUIBuilder.ApiConfiguration = canGenerateDataComponents

packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ const mapDataFieldsToCodegen = (fields: { [fieldName: string]: GenericDataField
8787
return codegenFields;
8888
};
8989

90-
export const mapGenericDataSchemaToCodegen = async (genericDataSchema: GenericDataSchema): CodegenJobGenericDataSchema | undefined => {
90+
export const mapGenericDataSchemaToCodegen = (genericDataSchema: GenericDataSchema): CodegenJobGenericDataSchema => {
9191
const { models, nonModels, enums, dataSourceType } = genericDataSchema;
9292
const codegenModels: { [key: string]: CodegenGenericDataModel } = {};
9393
const codegenNonModels: { [key: string]: CodegenGenericDataNonModel } = {};

yarn.lock

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,17 @@ __metadata:
10431043
languageName: node
10441044
linkType: hard
10451045

1046+
"@aws-amplify/api@npm:5.4.5":
1047+
version: 5.4.5
1048+
resolution: "@aws-amplify/api@npm:5.4.5"
1049+
dependencies:
1050+
"@aws-amplify/api-graphql": 3.4.11
1051+
"@aws-amplify/api-rest": 3.5.5
1052+
tslib: ^1.8.0
1053+
checksum: 13f3551e5d2d29a201f5011a265fcaa24fdec4796afe835f2c0d9b8fcc76f243663d691de2273c680b2efbe4fea2fb1ecd7678ed393a605997ee97021f03d138
1054+
languageName: node
1055+
linkType: hard
1056+
10461057
"@aws-amplify/appsync-modelgen-plugin@npm:2.7.2, @aws-amplify/appsync-modelgen-plugin@npm:^2.6.0":
10471058
version: 2.7.2
10481059
resolution: "@aws-amplify/appsync-modelgen-plugin@npm:2.7.2"
@@ -12824,7 +12835,7 @@ __metadata:
1282412835
languageName: node
1282512836
linkType: hard
1282612837

12827-
"@types/node-fetch@npm:2.6.4":
12838+
"@types/node-fetch@npm:2.6.4, @types/node-fetch@npm:^2.6.1":
1282812839
version: 2.6.4
1282912840
resolution: "@types/node-fetch@npm:2.6.4"
1283012841
dependencies:
@@ -12834,16 +12845,6 @@ __metadata:
1283412845
languageName: node
1283512846
linkType: hard
1283612847

12837-
"@types/node-fetch@npm:^2.6.1":
12838-
version: 2.6.1
12839-
resolution: "@types/node-fetch@npm:2.6.1"
12840-
dependencies:
12841-
"@types/node": "*"
12842-
form-data: ^3.0.0
12843-
checksum: 033945215fa6b36d5597b21bbdd7d946a751dcd066f8fa71e5f5ab5698390bc2e76e38932ec6ac709def39b6371dfd61844e6804409c7ba812e24d1c820fbff8
12844-
languageName: node
12845-
linkType: hard
12846-
1284712848
"@types/node@npm:*, @types/node@npm:^18.16.1":
1284812849
version: 18.16.1
1284912850
resolution: "@types/node@npm:18.16.1"

0 commit comments

Comments
 (0)