@aws-amplify/amplify-util-uibuilder 1.5.0-studio-forms.0 → 1.5.0

package/lib/commands/utils/syncAmplifyUiBuilderComponents.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateUiBuilderForms = exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = void 0;
+exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = void 0;
 const amplify_prompts_1 = require("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 };
+            return { resultType: 'SUCCESS', component };
         }
         catch (e) {
             amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
@@ -25,7 +24,7 @@ const generateUiBuilderThemes = (context, themeSchemas) => {
     const themeResults = themeSchemas.map(schema => {
         try {
             const theme = (0, codegenResources_1.createUiBuilderTheme)(context, schema);
-            return { resultType: 'SUCCESS', schema: theme };
+            return { resultType: 'SUCCESS', theme };
         }
         catch (e) {
             amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
@@ -37,36 +36,4 @@ const generateUiBuilderThemes = (context, themeSchemas) => {
     return themeResults;
 };
 exports.generateUiBuilderThemes = generateUiBuilderThemes;
-const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateForms) => {
-    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) && !model.isJoinTable) {
-                modelMap[name] = new Set(['create', 'update']);
-            }
-        });
-    }
-    const codegenForm = (schema) => {
-        try {
-            const form = (0, codegenResources_1.createUiBuilderForm)(context, schema, dataSchema);
-            return { resultType: 'SUCCESS', schema: form };
-        }
-        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 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);
-        }
-        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;
-};
-exports.generateUiBuilderForms = generateUiBuilderForms;
 //# 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":";;;AAAA,qDAA0C;AAK1C,yDAAoF;AACpF,6EAA0E;AAMnE,MAAM,2BAA2B,GAAG,CAAC,OAAmB,EAAE,gBAAuB,EAAE,UAA8B,EAUnH,EAAE;IACL,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACrD,IAAI;YACF,MAAM,SAAS,GAAG,IAAA,2CAAwB,EAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YACxE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;SAC7C;QAAC,OAAO,CAAC,EAAE;YACV,yBAAO,CAAC,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1D,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;SACrE;IACH,CAAC,CAAC,CAAC;IAEH,yBAAO,CAAC,KAAK,CACX,aAAa,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,MAAM,kBAAkB,IAAA,uDAA0B,EAChI,OAAO,CACR,EAAE,CACJ,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AA5BW,QAAA,2BAA2B,+BA4BtC;AAMK,MAAM,uBAAuB,GAAG,CAAC,OAAmB,EAAE,YAAmB,EAU3E,EAAE;IACL,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAI;YACF,MAAM,KAAK,GAAG,IAAA,uCAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,yBAAO,CAAC,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1D,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;SACrE;IACH,CAAC,CAAC,CAAC;IAEH,yBAAO,CAAC,KAAK,CACX,aAAa,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,MAAM,cAAc,IAAA,uDAA0B,EAAC,OAAO,CAAC,EAAE,CACtI,CAAC;IACF,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AA1BW,QAAA,uBAAuB,2BA0BlC"}

package/lib/commands/version.d.ts

@@ -1,2 +1,2 @@
-export declare const run: () => Promise<void>;
+export declare function run(): Promise<void>;
 //# sourceMappingURL=version.d.ts.map

package/lib/commands/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,GAAG,QAAa,QAAQ,IAAI,CAExC,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,kBAExB"}

package/lib/commands/version.js

@@ -25,8 +25,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
 const path_1 = __importDefault(require("path"));
-const run = async () => {
+async function run() {
     amplify_prompts_1.printer.info((await Promise.resolve().then(() => __importStar(require(path_1.default.join(__dirname, '..', '..', 'package.json'))))).version);
-};
+}
 exports.run = run;
 //# sourceMappingURL=version.js.map

package/lib/commands/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA0C;AAC1C,gDAAwB;AAKjB,MAAM,GAAG,GAAG,KAAK,IAAmB,EAAE;IAC3C,yBAAO,CAAC,IAAI,CAAC,CAAC,wDAAa,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,GAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AACzF,CAAC,CAAC;AAFW,QAAA,GAAG,OAEd"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA0C;AAC1C,gDAAwB;AAEjB,KAAK,UAAU,GAAG;IACvB,yBAAO,CAAC,IAAI,CAAC,CAAC,wDAAa,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,GAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AACzF,CAAC;AAFD,kBAEC"}

package/lib/event-handlers/handle-PostEnvAdd.d.ts

@@ -1,3 +1,3 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare const run: (context: $TSContext) => Promise<void>;
+export declare function run(context: $TSContext): Promise<void>;
 //# sourceMappingURL=handle-PostEnvAdd.d.ts.map

package/lib/event-handlers/handle-PostEnvAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostEnvAdd.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQ9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAO3D,CAAC"}
+{"version":3,"file":"handle-PostEnvAdd.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,iBAU5C"}

package/lib/event-handlers/handle-PostEnvAdd.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
-const cloneComponentsFromEnv_1 = require("../commands/cloneComponentsFromEnv");
-const run = async (context) => {
+async function run(context) {
     try {
-        await (0, cloneComponentsFromEnv_1.run)(context);
+        await context.amplify.invokePluginMethod(context, 'ui-builder', undefined, 'executeAmplifyCommand', [
+            context,
+            'cloneComponentsFromEnv',
+        ]);
     }
     catch (e) {
         amplify_prompts_1.printer.debug(e);
     }
-};
+}
 exports.run = run;
 //# sourceMappingURL=handle-PostEnvAdd.js.map

package/lib/event-handlers/handle-PostEnvAdd.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostEnvAdd.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAC1C,+EAAmF;AAM5E,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IAC9D,IAAI;QACF,MAAM,IAAA,4BAAsB,EAAC,OAAO,CAAC,CAAC;KACvC;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAPW,QAAA,GAAG,OAOd"}
+{"version":3,"file":"handle-PostEnvAdd.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAEnC,KAAK,UAAU,GAAG,CAAC,OAAmB;IAC3C,IAAI;QACF,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,uBAAuB,EAAE;YAClG,OAAO;YACP,wBAAwB;SACzB,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAVD,kBAUC"}

package/lib/event-handlers/handle-PostPull.d.ts

@@ -1,3 +1,3 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare const run: (context: $TSContext) => Promise<void>;
+export declare function run(context: $TSContext): Promise<void>;
 //# sourceMappingURL=handle-PostPull.d.ts.map

package/lib/event-handlers/handle-PostPull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostPull.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAO3D,CAAC"}
+{"version":3,"file":"handle-PostPull.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,iBAO5C"}

package/lib/event-handlers/handle-PostPull.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
-const generateComponents_1 = require("../commands/generateComponents");
-const run = async (context) => {
+async function run(context) {
     try {
-        await (0, generateComponents_1.run)(context);
+        await context.amplify.invokePluginMethod(context, 'ui-builder', undefined, 'executeAmplifyCommand', [context, 'generateComponents']);
     }
     catch (e) {
         amplify_prompts_1.printer.debug(e);
     }
-};
+}
 exports.run = run;
 //# sourceMappingURL=handle-PostPull.js.map

package/lib/event-handlers/handle-PostPull.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostPull.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAC1C,uEAA2E;AAKpE,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IAC9D,IAAI;QACF,MAAM,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;KACnC;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAPW,QAAA,GAAG,OAOd"}
+{"version":3,"file":"handle-PostPull.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAEnC,KAAK,UAAU,GAAG,CAAC,OAAmB;IAC3C,IAAI;QACF,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,uBAAuB,EAAE,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC;KACtI;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAPD,kBAOC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.5.0-studio-forms.0",
+  "version": "1.5.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -13,12 +13,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "^2.5.1",
-    "@aws-amplify/codegen-ui-react": "^2.5.1",
-    "amplify-cli-core": "3.2.2-studio-forms.0",
-    "amplify-prompts": "2.6.0-studio-forms.0",
-    "aws-sdk": "^2.1221.0",
-    "fs-extra": "^8.1.0",
+    "@aws-amplify/codegen-ui": "^2.4.2",
+    "@aws-amplify/codegen-ui-react": "^2.4.2",
+    "amplify-cli-core": "3.2.2",
+    "amplify-prompts": "2.6.0",
+    "aws-sdk": "^2.1113.0",
     "ora": "^4.0.3"
   },
   "devDependencies": {
@@ -68,5 +67,5 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   },
-  "gitHead": "bfbfe627dd6e3b01f19425aad3bea39b0c3b5d6a"
+  "gitHead": "c4f1e5f3b3dc4e92ccc4561610fa00beac7b3a1f"
 }

package/src/__tests__/cloneComponentsFromEnv.test.ts

@@ -5,9 +5,6 @@ import { run } from '../commands/cloneComponentsFromEnv';
 const extractArgsDependencyMock = extractArgsDependency as any;
 const awsMock = aws as any;
 
-jest.mock('../commands/utils/featureFlags', () => ({
-  getTransformerVersion: jest.fn().mockImplementation(() => 2)
-}));
 jest.mock('../commands/utils/extractArgs');
 jest.mock('amplify-cli-core');
 
@@ -48,14 +45,6 @@ describe('can clone components to new environment', () => {
         promise: () => mockedComponentExport(environmentName),
       })),
       createComponent: jest.fn(() => ({ promise: () => mockedComponentCreate() })),
-      getMetadata: jest.fn(() => ({
-        promise: jest.fn(() => ({
-          features: {
-            autoGenerateForms: 'true',
-            autoGenerateViews: 'true',
-          },
-        })),
-      })),
     }));
   });
 

package/src/__tests__/createUiBuilderComponent.test.ts

@@ -3,12 +3,11 @@ import {
   generateAmplifyUiBuilderIndexFile,
   createUiBuilderTheme,
   createUiBuilderComponent,
-  createUiBuilderForm,
-  generateAmplifyUiBuilderUtilFile,
 } from '../commands/utils/codegenResources';
 
 jest.mock('@aws-amplify/codegen-ui');
 const codegenMock = codegen as any;
+const renderSchemaToTemplateMock = jest.fn();
 
 describe('can create a ui builder component', () => {
   let context: any;
@@ -43,7 +42,6 @@ describe('can create a ui builder component', () => {
       properties: {},
       variants: [],
     };
-    const renderSchemaToTemplateMock = jest.fn();
     codegenMock.StudioTemplateRendererManager = jest.fn().mockImplementation(() => ({
       renderSchemaToTemplate: renderSchemaToTemplateMock,
     }));
@@ -56,24 +54,8 @@ describe('can create a ui builder component', () => {
     createUiBuilderTheme(context, schema);
     expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
   });
-  it('calls the renderManager for forms', () => {
-    createUiBuilderForm(context, schema);
-    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
-  });
   it('calls the renderManager for index file', () => {
     generateAmplifyUiBuilderIndexFile(context, [schema]);
     expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
   });
-  it('calls the renderManager for utils file w/ validation, formatter, and fetchByPath helpers if there is a form', () => {
-    generateAmplifyUiBuilderUtilFile(context, { hasForms: true, hasViews: false });
-    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(expect.arrayContaining(['validation', 'formatter', 'fetchByPath']));
-  });
-  it('calls the renderManager for utils file w/ formatter helper if there is a view', () => {
-    generateAmplifyUiBuilderUtilFile(context, { hasForms: false, hasViews: true });
-    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(['formatter']);
-  });
-  it('should not call the renderManager for utils file if there is neither form nor views', () => {
-    generateAmplifyUiBuilderUtilFile(context, { hasForms: false, hasViews: false });
-    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledTimes(0);
-  });
 });

package/src/__tests__/generateComponents.test.ts

@@ -1,5 +1,4 @@
 import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
-import { CloudformationProviderFacade } from 'amplify-cli-core';
 import * as utils from '../commands/utils';
 import { run } from '../commands/generateComponents';
 
@@ -10,12 +9,6 @@ const utilsMock = utils as any;
 
 utilsMock.shouldRenderComponents = jest.fn().mockImplementation(() => true);
 utilsMock.notifyMissingPackages = jest.fn().mockImplementation(() => true);
-CloudformationProviderFacade.isAmplifyAdminApp = jest.fn().mockImplementation(() => ({
-  isAdminApp: true,
-}));
-jest.mock('../commands/utils/featureFlags', () => ({
-  getTransformerVersion: jest.fn().mockImplementation(() => 2)
-}));
 
 describe('can generate components', () => {
   let context: any;
@@ -53,44 +46,17 @@ describe('can generate components', () => {
       exportThemes: jest.fn(() => ({
         promise: () => mockedExport(),
       })),
-      exportForms: jest.fn(() => ({
-        promise: () => mockedExport(),
-      })),
-      exportViews: jest.fn(() => ({
-        promise: () => mockedExport(),
-      })),
-      getMetadata: jest.fn(() => ({
-        promise: jest.fn(() => ({
-          features: {
-            autoGenerateForms: 'true',
-            autoGenerateViews: 'true',
-          },
-        })),
-      })),
     }));
     utilsMock.generateUiBuilderComponents = jest.fn().mockImplementation(() => schemas.entities);
     utilsMock.generateUiBuilderThemes = jest.fn().mockImplementation(() => schemas.entities);
-    utilsMock.generateUiBuilderForms = jest.fn().mockImplementation(() => schemas.entities);
     utilsMock.getAmplifyDataSchema = jest.fn().mockImplementation(() => undefined);
     utilsMock.generateAmplifyUiBuilderIndexFile = jest.fn().mockImplementation(() => true);
-    utilsMock.generateAmplifyUiBuilderUtilFile = jest.fn().mockImplementation(() => true);
   });
 
   it('runs generateComponents', async () => {
     await run(context);
-    expect(mockedExport).toBeCalledTimes(3);
+    expect(mockedExport).toBeCalledTimes(2);
     expect(utilsMock.generateUiBuilderComponents).toBeCalledTimes(1);
     expect(utilsMock.generateUiBuilderThemes).toBeCalledTimes(1);
-    expect(utilsMock.generateUiBuilderForms).toBeCalledTimes(1);
-  });
-  it('does not run generateComponents if not Amplify Admin app', async () => {
-    CloudformationProviderFacade.isAmplifyAdminApp = jest.fn().mockImplementationOnce(() => ({
-      isAdminApp: false,
-    }));
-    await run(context);
-    expect(mockedExport).toBeCalledTimes(0);
-    expect(utilsMock.generateUiBuilderComponents).toBeCalledTimes(0);
-    expect(utilsMock.generateUiBuilderThemes).toBeCalledTimes(0);
-    expect(utilsMock.generateUiBuilderForms).toBeCalledTimes(0);
   });
 });

package/src/__tests__/getAmplifyDataSchema.test.ts

@@ -1,7 +1,6 @@
 import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
-import { AmplifyCategories, AmplifySupportedService, FeatureFlags } from 'amplify-cli-core'; // eslint-disable-line import/no-extraneous-dependencies
+import { AmplifyCategories, AmplifySupportedService } from 'amplify-cli-core'; // eslint-disable-line import/no-extraneous-dependencies
 import { printer } from 'amplify-prompts'; // eslint-disable-line import/no-extraneous-dependencies
-import { mocked } from 'ts-jest/utils';
 import { AmplifyStudioClient } from '../clients';
 import { getAmplifyDataSchema } from '../commands/utils';
 
@@ -18,19 +17,14 @@ jest.mock('amplify-cli-core', () => ({
         },
       },
     })),
-    getCLIJSON: jest.fn().mockReturnValue({ features: { graphqltransformer: { transformerversion: 1 } } }),
-    setCLIJSON: jest.fn(),
   },
   FeatureFlags: {
-    getBoolean: () => true,
-    getNumber: jest.fn(),
-    reloadValues: jest.fn(),
+    getBoolean: () => false,
+    getNumber: () => 0,
   },
 }));
 jest.mock('amplify-prompts');
 
-const mockedFeatureFlags = mocked(FeatureFlags);
-
 const getMockedSchema = jest.fn(
   // eslint-disable-next-line no-useless-escape, spellcheck/spell-checker
   () => `export const schema = {\n    \"models\": {\n        \"Blog\": {\n            \"name\": \"Blog\",\n            \"fields\": {\n                \"id\": {\n                    \"name\": \"id\",\n                    \"isArray\": false,\n                    \"type\": \"ID\",\n                    \"isRequired\": true,\n                    \"attributes\": []\n                },\n                \"title\": {\n                    \"name\": \"title\",\n                    \"isArray\": false,\n                    \"type\": \"String\",\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"content\": {\n                    \"name\": \"content\",\n                    \"isArray\": false,\n                    \"type\": \"String\",\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"status\": {\n                    \"name\": \"status\",\n                    \"isArray\": false,\n                    \"type\": {\n                        \"enum\": \"Status\"\n                    },\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"createdAt\": {\n                    \"name\": \"createdAt\",\n                    \"isArray\": false,\n                    \"type\": \"AWSDateTime\",\n                    \"isRequired\": false,\n                    \"attributes\": [],\n                    \"isReadOnly\": true\n                },\n                \"updatedAt\": {\n                    \"name\": \"updatedAt\",\n                    \"isArray\": false,\n                    \"type\": \"AWSDateTime\",\n                    \"isRequired\": false,\n                    \"attributes\": [],\n                    \"isReadOnly\": true\n                }\n            },\n            \"syncable\": true,\n            \"pluralName\": \"Blogs\",\n            \"attributes\": [\n                {\n                    \"type\": \"model\",\n                    \"properties\": {}\n                },\n                {\n                    \"type\": \"auth\",\n                    \"properties\": {\n                        \"rules\": [\n                            {\n                                \"allow\": \"public\",\n                                \"operations\": [\n                                    \"create\",\n                                    \"update\",\n                                    \"delete\",\n                                    \"read\"\n                                ]\n                            }\n                        ]\n                    }\n                }\n            ]\n        }\n    },\n    \"enums\": {\n        \"Status\": {\n            \"name\": \"Status\",\n            \"values\": [\n                \"ENABLED\",\n                \"DISABLED\"\n            ]\n        }\n    },\n    \"nonModels\": {},\n    \"version\": \"demo\"\n};`,
@@ -39,20 +33,6 @@ const getMockedSchema = jest.fn(
 describe('should sync amplify backend models', () => {
   let context: any;
 
-  beforeAll(() => {
-    // set metadata response
-    awsMock.AmplifyUIBuilder = jest.fn(() => ({
-      getMetadata: jest.fn(() => ({
-        promise: jest.fn(() => ({
-          features: {
-            autoGenerateForms: 'true',
-            autoGenerateViews: 'true',
-          },
-        })),
-      })),
-    }));
-  });
-
   beforeEach(() => {
     context = {
       exeInfo: {
@@ -76,11 +56,7 @@ describe('should sync amplify backend models', () => {
           envName: 'testEnvName',
         },
       },
-      print: { warning: jest.fn() },
     };
-
-    mockedFeatureFlags.getNumber.mockReturnValue(2);
-    getMockedSchema.mockClear();
   });
 
   it('should getAmplifyBackendModels', async () => {
@@ -98,22 +74,6 @@ describe('should sync amplify backend models', () => {
     expect(Object.keys(dataSchema!.models)).toContain('Blog');
   });
 
-  it('should not getAmplifyBackendModels and return undefined if graphQLTransformer version not supported', async () => {
-    mockedFeatureFlags.getNumber.mockReturnValue(1);
-
-    awsMock.AmplifyBackend = jest.fn(() => ({
-      getBackendAPIModels: jest.fn(() => ({
-        promise: () => ({
-          Models: getMockedSchema(),
-        }),
-      })),
-    }));
-    const client = await AmplifyStudioClient.setClientInfo(context);
-    const dataSchema = await getAmplifyDataSchema(client);
-    expect(getMockedSchema).not.toBeCalled();
-    expect(dataSchema).toBeUndefined();
-  });
-
   it('should handle Models not found', async () => {
     awsMock.AmplifyBackend = jest.fn(() => ({
       getBackendAPIModels: jest.fn(() => ({

package/src/__tests__/handleEvents.test.ts

@@ -0,0 +1,21 @@
+import { run as runPostEnvAdd } from '../event-handlers/handle-PostEnvAdd';
+import { run as runPostPull } from '../event-handlers/handle-PostPull';
+
+describe('can handle events', () => {
+  let context: any;
+  beforeEach(() => {
+    context = {
+      amplify: {
+        invokePluginMethod: jest.fn(),
+      },
+    };
+  });
+  it('handles postEnvAdd', async () => {
+    await runPostEnvAdd(context);
+    expect(context.amplify.invokePluginMethod).toBeCalledTimes(1);
+  });
+  it('handles postPull', async () => {
+    await runPostPull(context);
+    expect(context.amplify.invokePluginMethod).toBeCalledTimes(1);
+  });
+});