@aws-amplify/amplify-util-uibuilder 1.8.5-rds.1 → 1.9.0-cdk228withdata3.0

package/lib/commands/utils/syncAmplifyUiBuilderComponents.js

@@ -1,92 +1,204 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateUiBuilderForms = exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = void 0;
+exports.extractUIComponents = exports.fetchWithRetries = exports.waitForSucceededJob = exports.mapGenericDataSchemaToCodegen = void 0;
 const amplify_prompts_1 = require("@aws-amplify/amplify-prompts");
-const codegen_ui_1 = require("@aws-amplify/codegen-ui");
-const codegenResources_1 = require("./codegenResources");
-const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
-const generateUiBuilderComponents = (context, componentSchemas, dataSchema) => {
-    const componentResults = componentSchemas.map((schema) => {
-        try {
-            const component = (0, codegenResources_1.createUiBuilderComponent)(context, schema, dataSchema);
-            return { resultType: 'SUCCESS', schema: component };
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const perf_hooks_1 = require("perf_hooks");
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const tiny_async_pool_1 = __importDefault(require("tiny-async-pool"));
+const mapRelationshipTypeToCodegen = (relationship) => {
+    if (!relationship)
+        return undefined;
+    switch (relationship.type) {
+        case 'HAS_MANY':
+            return {
+                type: 'HAS_MANY',
+                relatedModelFields: relationship.relatedModelFields,
+                canUnlinkAssociatedModel: !!relationship.canUnlinkAssociatedModel,
+                relatedJoinFieldName: relationship.relatedJoinFieldName,
+                relatedJoinTableName: relationship.relatedJoinTableName,
+                belongsToFieldOnRelatedModel: relationship.belongsToFieldOnRelatedModel,
+                relatedModelName: relationship.relatedModelName,
+            };
+        case 'HAS_ONE':
+            return {
+                type: 'HAS_ONE',
+                associatedFields: relationship.associatedFields,
+                isHasManyIndex: !!relationship.isHasManyIndex,
+                relatedModelName: relationship.relatedModelName,
+            };
+        case 'BELONGS_TO':
+            return {
+                type: 'BELONGS_TO',
+                associatedFields: relationship.associatedFields,
+                isHasManyIndex: !!relationship.isHasManyIndex,
+                relatedModelName: relationship.relatedModelName,
+            };
+        default:
+            throw new Error('Invalid relationship type');
+    }
+};
+const mapDataFieldsToCodegen = (fields) => {
+    const codegenFields = {};
+    Object.entries(fields).forEach(([fieldName, dataField]) => {
+        let dataType = '';
+        let dataTypeValue = '';
+        if (typeof dataField.dataType === 'object' && dataField.dataType !== null) {
+            if ('enum' in dataField.dataType) {
+                dataType = 'Enum';
+                dataTypeValue = dataField.dataType.enum;
+            }
+            else if ('model' in dataField.dataType) {
+                dataType = 'Model';
+                dataTypeValue = dataField.dataType.model;
+            }
+            else if ('nonModel' in dataField.dataType) {
+                dataType = 'NonModel';
+                dataTypeValue = dataField.dataType.nonModel;
+            }
+        }
+        else {
+            dataType = dataField.dataType;
+            dataTypeValue = dataField.dataType;
         }
-        catch (e) {
-            amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
-            amplify_prompts_1.printer.debug(e);
-            return { resultType: 'FAILURE', schemaName: schema.name, error: e };
+        codegenFields[fieldName] = {
+            dataType: dataType,
+            dataTypeValue: dataTypeValue,
+            required: dataField.required,
+            readOnly: dataField.readOnly,
+            isArray: dataField.isArray,
+        };
+        if (dataField.relationship) {
+            codegenFields[fieldName].relationship = mapRelationshipTypeToCodegen(dataField.relationship);
         }
     });
-    amplify_prompts_1.printer.debug(`Generated ${componentResults.filter((result) => result.resultType === 'SUCCESS').length} components in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
-    return componentResults;
+    return codegenFields;
 };
-exports.generateUiBuilderComponents = generateUiBuilderComponents;
-const generateUiBuilderThemes = (context, themeSchemas) => {
-    if (themeSchemas.length === 0) {
-        return [generateDefaultTheme(context)];
-    }
-    const themeResults = themeSchemas.map((schema) => {
-        try {
-            const theme = (0, codegenResources_1.createUiBuilderTheme)(context, schema);
-            return { resultType: 'SUCCESS', schema: theme };
-        }
-        catch (e) {
-            amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
-            amplify_prompts_1.printer.debug(e);
-            return { resultType: 'FAILURE', schemaName: schema.name, error: e };
-        }
+const mapGenericDataSchemaToCodegen = (genericDataSchema) => {
+    const { models, nonModels, enums, dataSourceType } = genericDataSchema;
+    const codegenModels = {};
+    const codegenNonModels = {};
+    const codegenEnums = {};
+    Object.entries(models).forEach(([modelName, genericDataModel]) => {
+        const modelFields = mapDataFieldsToCodegen(genericDataModel.fields);
+        codegenModels[modelName] = {
+            isJoinTable: genericDataModel.isJoinTable,
+            primaryKeys: genericDataModel.primaryKeys,
+            fields: modelFields,
+        };
+    });
+    Object.entries(nonModels).forEach(([nonModelName, genericDataModel]) => {
+        const nonModelFields = mapDataFieldsToCodegen(genericDataModel.fields);
+        codegenNonModels[nonModelName] = {
+            fields: nonModelFields,
+        };
     });
-    amplify_prompts_1.printer.debug(`Generated ${themeResults.filter((result) => result.resultType === 'SUCCESS').length} themes in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
-    return themeResults;
+    Object.entries(enums).forEach(([enumName, genericEnum]) => {
+        codegenEnums[enumName] = {
+            values: genericEnum.values,
+        };
+    });
+    return {
+        models: codegenModels,
+        nonModels: codegenNonModels,
+        enums: codegenEnums,
+        dataSourceType,
+    };
 };
-exports.generateUiBuilderThemes = generateUiBuilderThemes;
-const generateDefaultTheme = (context) => {
-    try {
-        const theme = (0, codegenResources_1.createUiBuilderTheme)(context, { name: 'studioTheme', values: [] }, { renderDefaultTheme: true });
-        amplify_prompts_1.printer.debug(`Generated default theme in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
-        return { resultType: 'SUCCESS', schema: theme };
+exports.mapGenericDataSchemaToCodegen = mapGenericDataSchemaToCodegen;
+function delay(durationMs) {
+    return new Promise((r) => setTimeout(() => r(), durationMs));
+}
+const waitForSucceededJob = async (getJob, { pollInterval }) => {
+    const startTime = perf_hooks_1.performance.now();
+    const waitTimeout = process.env.UI_BUILDER_CODEGENJOB_TIMEOUT ? parseInt(process.env.UI_BUILDER_CODEGENJOB_TIMEOUT) : 1000 * 60 * 2;
+    const endTime = startTime + waitTimeout;
+    while (perf_hooks_1.performance.now() < endTime) {
+        const job = await getJob();
+        if (!job) {
+            amplify_prompts_1.printer.error('Codegen job not found');
+            throw new Error('Codegen job not found');
+        }
+        if (job.status === 'failed') {
+            amplify_prompts_1.printer.error('Codegen job status is failed', { message: job.statusMessage });
+            throw new Error(job.statusMessage);
+        }
+        if (job.status === 'succeeded') {
+            amplify_prompts_1.printer.debug(`Polling time: ${perf_hooks_1.performance.now() - startTime}`);
+            return job;
+        }
+        await delay(pollInterval);
     }
-    catch (e) {
-        amplify_prompts_1.printer.debug(`Failure caught rendering default theme`);
-        amplify_prompts_1.printer.debug(e);
-        return { resultType: 'FAILURE', schemaName: 'studioTheme', error: e };
+    if (perf_hooks_1.performance.now() > endTime) {
+        amplify_prompts_1.printer.error(`Codegen job never succeeded before timeout`);
     }
+    throw new Error('Failed to return codegen job');
 };
-const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateForms, formFeatureFlags) => {
-    const modelMap = {};
-    if ((dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.dataSourceType) === 'DataStore' && autoGenerateForms) {
-        Object.entries(dataSchema.models).forEach(([name, model]) => {
-            if ((0, codegen_ui_1.checkIsSupportedAsForm)(model, formFeatureFlags) && !model.isJoinTable) {
-                modelMap[name] = new Set(['create', 'update']);
-            }
-        });
-    }
-    const codegenForm = (schema) => {
+exports.waitForSucceededJob = waitForSucceededJob;
+const fetchWithRetries = async (url, retries = 3, delay = 300) => {
+    let retryCount = 0;
+    let retryDelay = delay;
+    while (retryCount < retries) {
         try {
-            const form = (0, codegenResources_1.createUiBuilderForm)(context, schema, dataSchema, formFeatureFlags);
-            return { resultType: 'SUCCESS', schema: form };
+            const response = await (0, node_fetch_1.default)(url);
+            return response;
         }
-        catch (e) {
-            amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
-            amplify_prompts_1.printer.debug(e);
-            return {
-                resultType: 'FAILURE',
-                schemaName: schema.name,
-                schema,
-                error: e,
-            };
+        catch (error) {
+            amplify_prompts_1.printer.debug(`Error fetching ${url}: ${error}`);
+            retryCount = retryCount + 1;
+            await new Promise((res) => setTimeout(res, delay));
+            retryDelay = retryDelay * 2;
         }
-    };
-    const formResults = formSchemas.map((schema) => {
-        var _a, _b;
-        if ((schema === null || schema === void 0 ? void 0 : schema.dataType) && ((_a = schema.dataType) === null || _a === void 0 ? void 0 : _a.dataSourceType) === 'DataStore') {
-            (_b = modelMap[schema.dataType.dataTypeName]) === null || _b === void 0 ? void 0 : _b.delete(schema.formActionType);
+    }
+    throw new Error('Fetch reached max number of retries without succeeding');
+};
+exports.fetchWithRetries = fetchWithRetries;
+const extractUIComponents = async (url, uiBuilderComponentsPath) => {
+    try {
+        if (!fs_1.default.existsSync(uiBuilderComponentsPath)) {
+            fs_1.default.mkdirSync(uiBuilderComponentsPath, { recursive: true });
         }
-        return codegenForm(schema);
-    });
-    formResults.push(...(0, codegenResources_1.generateBaseForms)(modelMap).map(codegenForm));
-    amplify_prompts_1.printer.debug(`Generated ${formResults.filter((result) => result.resultType === 'SUCCESS').length} forms in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
-    return formResults;
+        const response = await (0, exports.fetchWithRetries)(url);
+        if (!response.ok) {
+            throw new Error('Failed to download component manifest file');
+        }
+        const manifestFile = await response.json();
+        const downloadComponent = async (output) => {
+            if (output.downloadUrl && !output.error) {
+                try {
+                    const response = await (0, exports.fetchWithRetries)(output.downloadUrl);
+                    if (!response.ok) {
+                        amplify_prompts_1.printer.debug(`Failed to download ${output.fileName}`);
+                        throw new Error(`Failed to download ${output.fileName}`);
+                    }
+                    return { content: await response.text(), error: undefined, fileName: output.fileName };
+                }
+                catch (error) {
+                    amplify_prompts_1.printer.debug(`Skipping ${output.fileName} because of an error downloading the component`);
+                    return { error: `Failed to download ${output.fileName}`, content: undefined, fileName: output.fileName };
+                }
+            }
+            else {
+                amplify_prompts_1.printer.debug(`Skipping ${output.fileName} because of an error generating the component`);
+                return { error: output.error, content: undefined, fileName: output.fileName };
+            }
+        };
+        for await (const downloaded of (0, tiny_async_pool_1.default)(5, manifestFile.Output, downloadComponent)) {
+            if (downloaded.content) {
+                fs_1.default.writeFileSync(path_1.default.join(uiBuilderComponentsPath, downloaded.fileName), downloaded.content);
+                amplify_prompts_1.printer.debug(`Downloaded ${downloaded.fileName}`);
+            }
+        }
+        amplify_prompts_1.printer.debug('ui-components downloaded successfully');
+    }
+    catch (error) {
+        amplify_prompts_1.printer.error('failed to download ui-components');
+        throw error;
+    }
 };
-exports.generateUiBuilderForms = generateUiBuilderForms;
+exports.extractUIComponents = extractUIComponents;
 //# sourceMappingURL=syncAmplifyUiBuilderComponents.js.map

package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.8.5-rds.1",
+  "version": "1.9.0-cdk228withdata3.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,14 +14,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-api": "^5.5.0-rds.3",
-    "@aws-amplify/amplify-cli-core": "4.1.1-rds.0",
+    "@aws-amplify/amplify-category-api": "^5.4.6",
+    "@aws-amplify/amplify-cli-core": "4.2.0-cdk228withdata3.0",
     "@aws-amplify/amplify-prompts": "2.8.0",
     "@aws-amplify/codegen-ui": "2.14.2",
     "@aws-amplify/codegen-ui-react": "2.14.2",
-    "amplify-codegen": "^4.1.3-rds.0",
-    "aws-sdk": "^2.1354.0",
+    "amplify-codegen": "^4.1.3",
+    "aws-sdk": "^2.1405.0",
     "fs-extra": "^8.1.0",
+    "node-fetch": "^2.6.7",
     "ora": "^4.0.3",
     "tiny-async-pool": "^2.1.0"
   },
@@ -81,5 +82,5 @@
       "@yarn/plugin-typescript"
     ]
   },
-  "gitHead": "2176bcf454e80fff0a517bebaed03472bf21765f"
+  "gitHead": "360dbf23b8f0b1b7a4c99db6071ffe713fb7cc6a"
 }

package/src/__tests__/__snapshots__/syncAmplifyUiComponents.test.ts.snap

@@ -0,0 +1,46 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should sync amplify ui builder components can map generic data schema to start codegen job request 1`] = `
+{
+  "dataSourceType": "DataStore",
+  "enums": {
+    "Status": {
+      "values": [
+        "ENABLED",
+        "DISABLED",
+        "HIDDEN",
+      ],
+    },
+  },
+  "models": {
+    "Blog": {
+      "fields": {
+        "id": {
+          "dataType": "ID",
+          "dataTypeValue": "ID",
+          "isArray": false,
+          "readOnly": false,
+          "required": true,
+        },
+      },
+      "isJoinTable": undefined,
+      "primaryKeys": [
+        "id",
+      ],
+    },
+  },
+  "nonModels": {
+    "Metadata": {
+      "fields": {
+        "name": {
+          "dataType": "String",
+          "dataTypeValue": "String",
+          "isArray": false,
+          "readOnly": false,
+          "required": false,
+        },
+      },
+    },
+  },
+}
+`;

package/src/__tests__/detachedFormCleanup.test.ts

@@ -1,12 +1,13 @@
-// @aws-amplify/codegen-ui is in project dependencies
-import { StudioSchema } from '@aws-amplify/codegen-ui'; // eslint-disable-line import/no-extraneous-dependencies
 import { AmplifyStudioClient } from '../clients'; // eslint-disable-line import/no-extraneous-dependencies
 import { isFormDetachedFromModel, isFormSchemaCustomized, isStudioForm, deleteDetachedForms } from '../commands/utils';
+import { Form } from 'aws-sdk/clients/amplifyuibuilder';
 
 const amplifyStudioClientMock = AmplifyStudioClient as any;
 
-const formWithNoCustomization: StudioSchema = {
+const formWithNoCustomization: Form = {
   id: 'f-123456',
+  appId: 'd1234',
+  environmentName: 'staging',
   name: 'BlogCreateForm',
   formActionType: 'create',
   dataType: {
@@ -17,9 +18,10 @@ const formWithNoCustomization: StudioSchema = {
   sectionalElements: {},
   style: {},
   cta: {},
+  schemaVersion: '1.0',
 };
 
-const formWithStyle: StudioSchema = {
+const formWithStyle: Form = {
   ...formWithNoCustomization,
   dataType: { dataSourceType: 'Custom', dataTypeName: 'Blog' },
   style: {
@@ -27,7 +29,7 @@ const formWithStyle: StudioSchema = {
   },
 };
 
-const formWithFields: StudioSchema = {
+const formWithFields: Form = {
   ...formWithNoCustomization,
   dataType: { dataSourceType: 'Custom', dataTypeName: 'Blog' },
   fields: {

package/src/__tests__/generateComponents.test.ts

@@ -22,6 +22,11 @@ const getTransformerVersionMocked = jest.mocked(getTransformerVersion);
 utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(true);
 utilsMock.notifyMissingPackages = jest.fn().mockReturnValue(true);
 utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue({});
+utilsMock.isFormDetachedFromModel = jest.fn().mockReturnValue(false);
+utilsMock.extractUIComponents = jest.fn().mockReturnValue(undefined);
+utilsMock.waitForSucceededJob = jest
+  .fn()
+  .mockReturnValue({ asset: { downloadUrl: 'amazon.com' }, statusMessage: `{\"codegenErrors\": [{\"schemaName\": \"BlogUpdateForm\"}]}` });
 
 jest.mock('../commands/utils/featureFlags', () => ({
   getTransformerVersion: jest.fn().mockReturnValue(2),
@@ -41,6 +46,12 @@ describe('can generate components', () => {
       },
     },
   });
+  const startCodegenJobPromise = jest.fn().mockReturnValue({
+    entity: { id: 'jobId123' },
+  });
+  const mockStartCodegenJob = jest.fn().mockReturnValue({
+    promise: startCodegenJobPromise,
+  });
   beforeEach(() => {
     isDataStoreEnabledMocked.mockResolvedValue(true);
     getTransformerVersionMocked.mockResolvedValue(2);
@@ -58,13 +69,11 @@ describe('can generate components', () => {
     schemas = {
       entities: [
         {
-          resultType: 'SUCCESS',
           schemaName: 'testSchema',
           name: 'testSchema',
           schemaVersion: '1.0',
         },
         {
-          resultType: 'FAILURE',
           schemaName: 'testSchema',
           name: 'testSchema',
           schemaVersion: '1.0',
@@ -91,6 +100,10 @@ describe('can generate components', () => {
       getMetadata: jest.fn().mockReturnValue({
         promise: getMetadataPromise,
       }),
+      startCodegenJob: mockStartCodegenJob,
+      getCodegenJob: jest.fn().mockReturnValue({
+        promise: jest.fn().mockReturnValue({ status: 'succeeded' }),
+      }),
     });
     utilsMock.generateUiBuilderComponents = jest.fn().mockReturnValue(schemas.entities);
     utilsMock.generateUiBuilderThemes = jest.fn().mockReturnValue(schemas.entities);
@@ -102,11 +115,13 @@ describe('can generate components', () => {
   });
 
   it('runs generateComponents', async () => {
+    utilsMock.isFormDetachedFromModel = jest.fn().mockReturnValueOnce(true);
     await run(context, 'PostPull');
     expect(mockedExport).toBeCalledTimes(3);
-    expect(utilsMock.generateUiBuilderComponents).toBeCalledTimes(1);
-    expect(utilsMock.generateUiBuilderThemes).toBeCalledTimes(1);
-    expect(utilsMock.generateUiBuilderForms).toBeCalledTimes(1);
+    expect(startCodegenJobPromise).toBeCalledTimes(1);
+    expect(utilsMock.waitForSucceededJob).toBeCalledTimes(1);
+    expect(utilsMock.getUiBuilderComponentsPath).toBeCalledTimes(1);
+    expect(utilsMock.extractUIComponents).toBeCalledTimes(1);
     expect(utilsMock.deleteDetachedForms).toBeCalledTimes(1);
   });
 
@@ -124,7 +139,26 @@ describe('can generate components', () => {
       },
     });
     await run(context, 'PostPull');
-    expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(expect.anything(), expect.anything(), undefined, true, expect.anything());
+    expect(mockStartCodegenJob).toHaveBeenCalledWith({
+      appId: 'testAppId',
+      environmentName: 'testEnvName',
+      codegenJobToCreate: {
+        renderConfig: {
+          react: {
+            module: 'es2020',
+            target: 'es2020',
+            script: 'jsx',
+            renderTypeDeclarations: true,
+          },
+        },
+        genericDataSchema: undefined,
+        autoGenerateForms: true,
+        features: {
+          isNonModelSupported: false,
+          isRelationshipSupported: false,
+        },
+      },
+    });
   });
 
   it('should not autogenerate forms if transformer v1', async () => {
@@ -141,13 +175,26 @@ describe('can generate components', () => {
       },
     });
     await run(context, 'PostPull');
-    expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.anything(),
-      undefined,
-      false,
-      expect.anything(),
-    );
+    expect(mockStartCodegenJob).toHaveBeenCalledWith({
+      appId: 'testAppId',
+      environmentName: 'testEnvName',
+      codegenJobToCreate: {
+        renderConfig: {
+          react: {
+            module: 'es2020',
+            target: 'es2020',
+            script: 'jsx',
+            renderTypeDeclarations: true,
+          },
+        },
+        genericDataSchema: undefined,
+        autoGenerateForms: false,
+        features: {
+          isNonModelSupported: false,
+          isRelationshipSupported: false,
+        },
+      },
+    });
   });
 
   it('should not autogenerate forms if datastore is not enabled', async () => {
@@ -163,16 +210,29 @@ describe('can generate components', () => {
       },
     });
     await run(context, 'PostPull');
-    expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.anything(),
-      undefined,
-      false,
-      expect.anything(),
-    );
+    expect(mockStartCodegenJob).toHaveBeenCalledWith({
+      appId: 'testAppId',
+      environmentName: 'testEnvName',
+      codegenJobToCreate: {
+        renderConfig: {
+          react: {
+            module: 'es2020',
+            target: 'es2020',
+            script: 'jsx',
+            renderTypeDeclarations: true,
+          },
+        },
+        genericDataSchema: undefined,
+        autoGenerateForms: false,
+        features: {
+          isNonModelSupported: false,
+          isRelationshipSupported: false,
+        },
+      },
+    });
   });
 
-  it('should not autogenerate forms if feature flag  isnot enabled', async () => {
+  it('should not autogenerate forms if feature flag  is not enabled', async () => {
     isDataStoreEnabledMocked.mockResolvedValue(true);
     getMetadataPromise.mockReturnValue({
       features: {
@@ -185,12 +245,25 @@ describe('can generate components', () => {
       },
     });
     await run(context, 'PostPull');
-    expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.anything(),
-      undefined,
-      false,
-      expect.anything(),
-    );
+    expect(mockStartCodegenJob).toHaveBeenCalledWith({
+      appId: 'testAppId',
+      environmentName: 'testEnvName',
+      codegenJobToCreate: {
+        renderConfig: {
+          react: {
+            module: 'es2020',
+            target: 'es2020',
+            script: 'jsx',
+            renderTypeDeclarations: true,
+          },
+        },
+        genericDataSchema: undefined,
+        autoGenerateForms: false,
+        features: {
+          isNonModelSupported: false,
+          isRelationshipSupported: false,
+        },
+      },
+    });
   });
 });