@aws-amplify/amplify-util-uibuilder 1.8.3 → 1.8.4-rc.2def814808.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/lib/clients/amplify-studio-client.d.ts +1 -0
- package/lib/clients/amplify-studio-client.d.ts.map +1 -1
- package/lib/clients/amplify-studio-client.js +11 -5
- package/lib/clients/amplify-studio-client.js.map +1 -1
- package/lib/commands/generateComponents.d.ts.map +1 -1
- package/lib/commands/generateComponents.js +2 -2
- package/lib/commands/generateComponents.js.map +1 -1
- package/package.json +25 -17
- package/src/__tests__/cloneComponentsFromEnv.test.ts +8 -0
- package/src/__tests__/generateComponents.test.ts +109 -10
- package/src/__tests__/getAmplifyDataSchema.test.ts +1 -2
- package/src/__tests__/prePushHandler.test.ts +7 -0
- package/src/__tests__/syncAmplifyUiComponents.test.ts +9 -0
- package/src/clients/amplify-studio-client.ts +12 -5
- package/src/commands/generateComponents.ts +3 -2
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.8.4-rc.2def814808.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.8.0...@aws-amplify/amplify-util-uibuilder@1.8.4-rc.2def814808.0) (2023-06-06)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* skip automatic form generation when datastore is not enabled ([e45fcc1](https://github.com/aws-amplify/amplify-cli/commit/e45fcc1a9bdff3d20645fb18bf2e2be34e16beb1))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [1.8.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.8.1...@aws-amplify/amplify-util-uibuilder@1.8.3) (2023-05-25)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -13,6 +13,7 @@ export default class AmplifyStudioClient {
|
|
|
13
13
|
#private;
|
|
14
14
|
metadata: StudioMetadata;
|
|
15
15
|
isGraphQLSupported: boolean;
|
|
16
|
+
isDataStoreEnabled: boolean;
|
|
16
17
|
static isAmplifyApp: (context: $TSContext, appId: string) => Promise<boolean>;
|
|
17
18
|
static setClientInfo(context: $TSContext, envName?: string, appId?: string): Promise<AmplifyStudioClient>;
|
|
18
19
|
constructor(awsConfigInfo: ServiceConfigurationOptions, appId: string, envName: string);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amplify-studio-client.d.ts","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgC,MAAM,+BAA+B,CAAC;AACzF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"amplify-studio-client.d.ts","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgC,MAAM,+BAA+B,CAAC;AACzF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAUpG,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE;QAChB,uBAAuB,EAAE,OAAO,CAAC;QACjC,mBAAmB,EAAE,OAAO,CAAC;KAC9B,CAAC;CACH,CAAC;AAqCF,MAAM,CAAC,OAAO,OAAO,mBAAmB;;IAKtC,QAAQ,EAAE,cAAc,CAAC;IACzB,kBAAkB,UAAS;IAC3B,kBAAkB,UAAS;IAK3B,MAAM,CAAC,YAAY,YAAmB,UAAU,SAAS,MAAM,KAAG,QAAQ,OAAO,CAAC,CAUhF;WAKW,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;gBA6BnG,aAAa,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAkBtF,YAAY,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ,IAAI,CAAC,CAqBpE;IAKF,cAAc,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ;QAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC,CAsB3F;IAKF,UAAU,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ;QAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;KAAE,CAAC,CAuBnF;IAEF,SAAS,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ;QAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;KAAE,CAAC,CAsBjF;IAEF,eAAe,cAAqB,mBAAmB,YAAY,MAAM,UAAU,MAAM,KAAG,QAAQ,SAAS,GAAG,SAAS,CAAC,CAexH;IAEF,UAAU,WAAkB,MAAM,YAAY,MAAM,UAAU,MAAM,KAAG,QAAQ,IAAI,CAAC,CASlF;IAEF,SAAS,iBAAwB,MAAM,YAAY,MAAM,UAAU,MAAM,KAAG,QAAQ,MAAM,GAAG,SAAS,CAAC,CAerG;CACH"}
|
|
@@ -17,6 +17,7 @@ const aws_sdk_1 = require("aws-sdk");
|
|
|
17
17
|
const amplify_prompts_1 = require("@aws-amplify/amplify-prompts");
|
|
18
18
|
const environmentHelpers_1 = require("../commands/utils/environmentHelpers");
|
|
19
19
|
const featureFlags_1 = require("../commands/utils/featureFlags");
|
|
20
|
+
const amplify_category_api_1 = require("@aws-amplify/amplify-category-api");
|
|
20
21
|
const buildAmplifyBackendClient = (awsConfigInfo) => {
|
|
21
22
|
const awsConfig = { ...awsConfigInfo };
|
|
22
23
|
if (process.env.AMPLIFY_BACKEND_ENDPOINT) {
|
|
@@ -41,11 +42,14 @@ class AmplifyStudioClient {
|
|
|
41
42
|
static async setClientInfo(context, envName, appId) {
|
|
42
43
|
const resolvedEnvName = (0, environmentHelpers_1.getEnvName)(context, envName);
|
|
43
44
|
const resolvedAppId = (0, environmentHelpers_1.getAppId)(context, appId);
|
|
44
|
-
const awsConfigInfo =
|
|
45
|
-
context,
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
const [awsConfigInfo, dataStoreStatus] = await Promise.all([
|
|
46
|
+
context.amplify.invokePluginMethod(context, 'awscloudformation', undefined, 'loadConfigurationForEnv', [
|
|
47
|
+
context,
|
|
48
|
+
resolvedEnvName,
|
|
49
|
+
resolvedAppId,
|
|
50
|
+
]),
|
|
51
|
+
(0, amplify_category_api_1.isDataStoreEnabled)(context),
|
|
52
|
+
]);
|
|
49
53
|
const client = new AmplifyStudioClient(awsConfigInfo, resolvedAppId, resolvedEnvName);
|
|
50
54
|
if ((await (0, featureFlags_1.getTransformerVersion)()) === 2) {
|
|
51
55
|
await client.loadMetadata();
|
|
@@ -54,6 +58,7 @@ class AmplifyStudioClient {
|
|
|
54
58
|
else {
|
|
55
59
|
client.isGraphQLSupported = false;
|
|
56
60
|
}
|
|
61
|
+
client.isDataStoreEnabled = dataStoreStatus;
|
|
57
62
|
return client;
|
|
58
63
|
}
|
|
59
64
|
constructor(awsConfigInfo, appId, envName) {
|
|
@@ -62,6 +67,7 @@ class AmplifyStudioClient {
|
|
|
62
67
|
_AmplifyStudioClient_appId.set(this, void 0);
|
|
63
68
|
_AmplifyStudioClient_envName.set(this, void 0);
|
|
64
69
|
this.isGraphQLSupported = false;
|
|
70
|
+
this.isDataStoreEnabled = false;
|
|
65
71
|
this.loadMetadata = async (envName, appId) => {
|
|
66
72
|
var _b, _c, _d, _e;
|
|
67
73
|
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amplify-studio-client.js","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAAyF;AAGzF,qCAA2D;AAC3D,kEAAuD;AACvD,6EAA4E;AAC5E,iEAAuE;AAiBvE,MAAM,yBAAyB,GAAG,CAAC,aAA0C,EAAkB,EAAE;IAC/F,MAAM,SAAS,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;IACvC,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE;QACxC,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;KAC3D;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE;QACtC,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;KACvD;IAED,OAAO,IAAI,wBAAc,CAAC,SAAS,CAAC,CAAC;AACvC,CAAC,CAAC;AAKF,MAAM,2BAA2B,GAAG,CAAC,aAA0C,EAAoB,EAAE;IACnG,MAAM,SAAS,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;IACvC,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;QACnC,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;KACtD;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;QACjC,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;KAClD;IAED,OAAO,IAAI,0BAAgB,CAAC,SAAS,CAAC,CAAC;AACzC,CAAC,CAAC;AAKF,MAAqB,mBAAmB;
|
|
1
|
+
{"version":3,"file":"amplify-studio-client.js","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAqB3D,eAAO,MAAM,GAAG,YAAmB,UAAU,aAAa,UAAU,GAAG,UAAU,KAAG,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAqB3D,eAAO,MAAM,GAAG,YAAmB,UAAU,aAAa,UAAU,GAAG,UAAU,KAAG,QAAQ,IAAI,CAwG/F,CAAC"}
|
|
@@ -21,7 +21,7 @@ const run = async (context, eventType) => {
|
|
|
21
21
|
studioClient.listForms(),
|
|
22
22
|
studioClient.isGraphQLSupported ? (0, utils_1.getAmplifyDataSchema)(context) : Promise.resolve(undefined),
|
|
23
23
|
]);
|
|
24
|
-
const nothingWouldAutogenerate = !dataSchema || !studioClient.metadata.autoGenerateForms || !studioClient.isGraphQLSupported;
|
|
24
|
+
const nothingWouldAutogenerate = !dataSchema || !studioClient.metadata.autoGenerateForms || !studioClient.isGraphQLSupported || !studioClient.isDataStoreEnabled;
|
|
25
25
|
if (nothingWouldAutogenerate && [componentSchemas, themeSchemas, formSchemas].every((group) => !group.entities.length)) {
|
|
26
26
|
amplify_prompts_1.printer.debug('Skipping UI component generation since none are found.');
|
|
27
27
|
return;
|
|
@@ -30,7 +30,7 @@ const run = async (context, eventType) => {
|
|
|
30
30
|
const generatedResults = {
|
|
31
31
|
component: (0, utils_1.generateUiBuilderComponents)(context, componentSchemas.entities, dataSchema),
|
|
32
32
|
theme: (0, utils_1.generateUiBuilderThemes)(context, themeSchemas.entities),
|
|
33
|
-
form: (0, utils_1.generateUiBuilderForms)(context, formSchemas.entities, dataSchema, studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported, studioClient.metadata.formFeatureFlags),
|
|
33
|
+
form: (0, utils_1.generateUiBuilderForms)(context, formSchemas.entities, dataSchema, studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported && studioClient.isDataStoreEnabled, studioClient.metadata.formFeatureFlags),
|
|
34
34
|
};
|
|
35
35
|
const successfulSchemas = [];
|
|
36
36
|
const detachedForms = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAsB;AACtB,kEAAuD;AAEvD,wCAAiD;AACjD,mCAciB;AAKV,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAE,SAAkC,EAAiB,EAAE;IAClG,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC,EAAE;QAC5C,OAAO;KACR;IACD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,EAAE,CAAC,CAAC;IACxB,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,6BAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClF,YAAY,CAAC,cAAc,EAAE;YAC7B,YAAY,CAAC,UAAU,EAAE;YACzB,YAAY,CAAC,SAAS,EAAE;YACxB,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;SAC7F,CAAC,CAAC;QAEH,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/amplify-util-uibuilder",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.4-rc.2def814808.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -14,34 +14,36 @@
|
|
|
14
14
|
"access": "public"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@aws-amplify/amplify-
|
|
18
|
-
"@aws-amplify/amplify-
|
|
17
|
+
"@aws-amplify/amplify-category-api": "^5.4.1",
|
|
18
|
+
"@aws-amplify/amplify-cli-core": "4.1.0-rc.2def814808.0",
|
|
19
|
+
"@aws-amplify/amplify-prompts": "2.8.0-rc.2def814808.0",
|
|
19
20
|
"@aws-amplify/codegen-ui": "2.14.1",
|
|
20
21
|
"@aws-amplify/codegen-ui-react": "2.14.1",
|
|
21
|
-
"amplify-codegen": "^
|
|
22
|
+
"amplify-codegen": "^4.1.1",
|
|
22
23
|
"aws-sdk": "^2.1354.0",
|
|
23
24
|
"fs-extra": "^8.1.0",
|
|
24
25
|
"ora": "^4.0.3",
|
|
25
26
|
"tiny-async-pool": "^2.1.0"
|
|
26
27
|
},
|
|
27
28
|
"devDependencies": {
|
|
28
|
-
"@aws-amplify/appsync-modelgen-plugin": "^2.4.
|
|
29
|
+
"@aws-amplify/appsync-modelgen-plugin": "^2.4.4",
|
|
29
30
|
"@types/fs-extra": "^8.0.1",
|
|
30
|
-
"@types/jest": "^
|
|
31
|
+
"@types/jest": "^29.5.1",
|
|
31
32
|
"@types/semver": "^7.1.0",
|
|
32
|
-
"@types/tiny-async-pool": "^2.0.0"
|
|
33
|
+
"@types/tiny-async-pool": "^2.0.0",
|
|
34
|
+
"ts-jest": "^29.1.0"
|
|
33
35
|
},
|
|
34
36
|
"jest": {
|
|
35
37
|
"testRunner": "jest-circus/runner",
|
|
36
38
|
"preset": "ts-jest",
|
|
37
39
|
"transform": {
|
|
38
|
-
"^.+\\.tsx?$":
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
40
|
+
"^.+\\.tsx?$": [
|
|
41
|
+
"ts-jest",
|
|
42
|
+
{
|
|
43
|
+
"window": {},
|
|
44
|
+
"diagnostics": true
|
|
45
|
+
}
|
|
46
|
+
]
|
|
45
47
|
},
|
|
46
48
|
"collectCoverage": true,
|
|
47
49
|
"collectCoverageFrom": [
|
|
@@ -55,8 +57,9 @@
|
|
|
55
57
|
"default",
|
|
56
58
|
"jest-junit"
|
|
57
59
|
],
|
|
58
|
-
"
|
|
59
|
-
|
|
60
|
+
"testEnvironmentOptions": {
|
|
61
|
+
"url": "http://localhost"
|
|
62
|
+
},
|
|
60
63
|
"testRegex": "((src/(__tests__|__e2e__|__e2e_v2__))/.*.test.ts)$",
|
|
61
64
|
"moduleFileExtensions": [
|
|
62
65
|
"ts",
|
|
@@ -73,5 +76,10 @@
|
|
|
73
76
|
"usePathForSuiteName": "true",
|
|
74
77
|
"addFileAttribute": "true"
|
|
75
78
|
},
|
|
76
|
-
"
|
|
79
|
+
"berry": {
|
|
80
|
+
"plugins": [
|
|
81
|
+
"@yarn/plugin-typescript"
|
|
82
|
+
]
|
|
83
|
+
},
|
|
84
|
+
"gitHead": "2340c9191a323113b41ef1e2f90a19e80c3bd29f"
|
|
77
85
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
|
|
2
2
|
import * as extractArgsDependency from '../commands/utils/extractArgs';
|
|
3
3
|
import { run } from '../commands/cloneComponentsFromEnv';
|
|
4
|
+
import { isDataStoreEnabled } from '@aws-amplify/amplify-category-api';
|
|
4
5
|
|
|
5
6
|
const extractArgsDependencyMock = extractArgsDependency as any;
|
|
6
7
|
const awsMock = aws as any;
|
|
@@ -8,9 +9,15 @@ const awsMock = aws as any;
|
|
|
8
9
|
jest.mock('../commands/utils/featureFlags', () => ({
|
|
9
10
|
getTransformerVersion: jest.fn().mockReturnValue(2),
|
|
10
11
|
}));
|
|
12
|
+
jest.mock('@aws-amplify/amplify-category-api', () => ({
|
|
13
|
+
...jest.requireActual('@aws-amplify/amplify-category-api'),
|
|
14
|
+
isDataStoreEnabled: jest.fn(),
|
|
15
|
+
}));
|
|
11
16
|
jest.mock('../commands/utils/extractArgs');
|
|
12
17
|
jest.mock('@aws-amplify/amplify-cli-core');
|
|
13
18
|
|
|
19
|
+
const isDataStoreEnabledMocked = jest.mocked(isDataStoreEnabled);
|
|
20
|
+
|
|
14
21
|
const mockedComponentExport = jest.fn((envName: string) => {
|
|
15
22
|
if (envName === 'newEnvName') {
|
|
16
23
|
return {
|
|
@@ -26,6 +33,7 @@ const mockedComponentCreate = jest.fn().mockReturnValue({ entity: {} });
|
|
|
26
33
|
describe('can clone components to new environment', () => {
|
|
27
34
|
let context: any;
|
|
28
35
|
beforeEach(() => {
|
|
36
|
+
isDataStoreEnabledMocked.mockResolvedValue(true);
|
|
29
37
|
context = {
|
|
30
38
|
amplify: {
|
|
31
39
|
invokePluginMethod: () => ({}),
|
|
@@ -1,12 +1,24 @@
|
|
|
1
1
|
import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
|
|
2
2
|
import * as utils from '../commands/utils';
|
|
3
3
|
import { run } from '../commands/generateComponents';
|
|
4
|
+
import { isDataStoreEnabled } from '@aws-amplify/amplify-category-api';
|
|
5
|
+
import { getTransformerVersion } from '../commands/utils/featureFlags';
|
|
4
6
|
|
|
5
7
|
jest.mock('../commands/utils');
|
|
6
8
|
jest.mock('@aws-amplify/amplify-cli-core');
|
|
9
|
+
jest.mock('@aws-amplify/amplify-category-api', () => ({
|
|
10
|
+
...jest.requireActual('@aws-amplify/amplify-category-api'),
|
|
11
|
+
isDataStoreEnabled: jest.fn(),
|
|
12
|
+
}));
|
|
13
|
+
jest.mock('../commands/utils/featureFlags', () => ({
|
|
14
|
+
...jest.requireActual('../commands/utils/featureFlags'),
|
|
15
|
+
getTransformerVersion: jest.fn(),
|
|
16
|
+
}));
|
|
7
17
|
const awsMock = aws as any;
|
|
8
18
|
const utilsMock = utils as any;
|
|
9
19
|
|
|
20
|
+
const isDataStoreEnabledMocked = jest.mocked(isDataStoreEnabled);
|
|
21
|
+
const getTransformerVersionMocked = jest.mocked(getTransformerVersion);
|
|
10
22
|
utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(true);
|
|
11
23
|
utilsMock.notifyMissingPackages = jest.fn().mockReturnValue(true);
|
|
12
24
|
utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue({});
|
|
@@ -19,7 +31,19 @@ describe('can generate components', () => {
|
|
|
19
31
|
let context: any;
|
|
20
32
|
let schemas: any;
|
|
21
33
|
let mockedExport: jest.Mock<any, any>;
|
|
34
|
+
const getMetadataPromise = jest.fn().mockReturnValue({
|
|
35
|
+
features: {
|
|
36
|
+
autoGenerateForms: 'true',
|
|
37
|
+
autoGenerateViews: 'true',
|
|
38
|
+
formFeatureFlags: {
|
|
39
|
+
isRelationshipSupported: 'false',
|
|
40
|
+
isNonModelSupported: 'false',
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
});
|
|
22
44
|
beforeEach(() => {
|
|
45
|
+
isDataStoreEnabledMocked.mockResolvedValue(true);
|
|
46
|
+
getTransformerVersionMocked.mockResolvedValue(2);
|
|
23
47
|
context = {
|
|
24
48
|
amplify: {
|
|
25
49
|
invokePluginMethod: () => ({}),
|
|
@@ -65,16 +89,7 @@ describe('can generate components', () => {
|
|
|
65
89
|
promise: () => mockedExport(),
|
|
66
90
|
}),
|
|
67
91
|
getMetadata: jest.fn().mockReturnValue({
|
|
68
|
-
promise:
|
|
69
|
-
features: {
|
|
70
|
-
autoGenerateForms: 'true',
|
|
71
|
-
autoGenerateViews: 'true',
|
|
72
|
-
formFeatureFlags: {
|
|
73
|
-
isRelationshipSupported: 'false',
|
|
74
|
-
isNonModelSupported: 'false',
|
|
75
|
-
},
|
|
76
|
-
},
|
|
77
|
-
}),
|
|
92
|
+
promise: getMetadataPromise,
|
|
78
93
|
}),
|
|
79
94
|
});
|
|
80
95
|
utilsMock.generateUiBuilderComponents = jest.fn().mockReturnValue(schemas.entities);
|
|
@@ -94,4 +109,88 @@ describe('can generate components', () => {
|
|
|
94
109
|
expect(utilsMock.generateUiBuilderForms).toBeCalledTimes(1);
|
|
95
110
|
expect(utilsMock.deleteDetachedForms).toBeCalledTimes(1);
|
|
96
111
|
});
|
|
112
|
+
|
|
113
|
+
it('should autogenerate forms if transformer v2 and datastore and feature flag are enabled', async () => {
|
|
114
|
+
isDataStoreEnabledMocked.mockResolvedValue(true);
|
|
115
|
+
getTransformerVersionMocked.mockResolvedValue(2);
|
|
116
|
+
getMetadataPromise.mockReturnValue({
|
|
117
|
+
features: {
|
|
118
|
+
autoGenerateForms: 'true',
|
|
119
|
+
autoGenerateViews: 'true',
|
|
120
|
+
formFeatureFlags: {
|
|
121
|
+
isRelationshipSupported: 'false',
|
|
122
|
+
isNonModelSupported: 'false',
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
});
|
|
126
|
+
await run(context, 'PostPull');
|
|
127
|
+
expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(expect.anything(), expect.anything(), undefined, true, expect.anything());
|
|
128
|
+
});
|
|
129
|
+
|
|
130
|
+
it('should not autogenerate forms if transformer v1', async () => {
|
|
131
|
+
isDataStoreEnabledMocked.mockResolvedValue(true);
|
|
132
|
+
getTransformerVersionMocked.mockResolvedValue(1);
|
|
133
|
+
getMetadataPromise.mockReturnValue({
|
|
134
|
+
features: {
|
|
135
|
+
autoGenerateForms: 'true',
|
|
136
|
+
autoGenerateViews: 'true',
|
|
137
|
+
formFeatureFlags: {
|
|
138
|
+
isRelationshipSupported: 'false',
|
|
139
|
+
isNonModelSupported: 'false',
|
|
140
|
+
},
|
|
141
|
+
},
|
|
142
|
+
});
|
|
143
|
+
await run(context, 'PostPull');
|
|
144
|
+
expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(
|
|
145
|
+
expect.anything(),
|
|
146
|
+
expect.anything(),
|
|
147
|
+
undefined,
|
|
148
|
+
false,
|
|
149
|
+
expect.anything(),
|
|
150
|
+
);
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
it('should not autogenerate forms if datastore is not enabled', async () => {
|
|
154
|
+
isDataStoreEnabledMocked.mockResolvedValue(false);
|
|
155
|
+
getMetadataPromise.mockReturnValue({
|
|
156
|
+
features: {
|
|
157
|
+
autoGenerateForms: 'true',
|
|
158
|
+
autoGenerateViews: 'true',
|
|
159
|
+
formFeatureFlags: {
|
|
160
|
+
isRelationshipSupported: 'false',
|
|
161
|
+
isNonModelSupported: 'false',
|
|
162
|
+
},
|
|
163
|
+
},
|
|
164
|
+
});
|
|
165
|
+
await run(context, 'PostPull');
|
|
166
|
+
expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(
|
|
167
|
+
expect.anything(),
|
|
168
|
+
expect.anything(),
|
|
169
|
+
undefined,
|
|
170
|
+
false,
|
|
171
|
+
expect.anything(),
|
|
172
|
+
);
|
|
173
|
+
});
|
|
174
|
+
|
|
175
|
+
it('should not autogenerate forms if feature flag isnot enabled', async () => {
|
|
176
|
+
isDataStoreEnabledMocked.mockResolvedValue(true);
|
|
177
|
+
getMetadataPromise.mockReturnValue({
|
|
178
|
+
features: {
|
|
179
|
+
autoGenerateForms: 'false',
|
|
180
|
+
autoGenerateViews: 'true',
|
|
181
|
+
formFeatureFlags: {
|
|
182
|
+
isRelationshipSupported: 'false',
|
|
183
|
+
isNonModelSupported: 'false',
|
|
184
|
+
},
|
|
185
|
+
},
|
|
186
|
+
});
|
|
187
|
+
await run(context, 'PostPull');
|
|
188
|
+
expect(utilsMock.generateUiBuilderForms).toHaveBeenCalledWith(
|
|
189
|
+
expect.anything(),
|
|
190
|
+
expect.anything(),
|
|
191
|
+
undefined,
|
|
192
|
+
false,
|
|
193
|
+
expect.anything(),
|
|
194
|
+
);
|
|
195
|
+
});
|
|
97
196
|
});
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { printer } from '@aws-amplify/amplify-prompts'; // eslint-disable-line import/no-extraneous-dependencies
|
|
2
|
-
import { mocked } from 'ts-jest/utils';
|
|
3
2
|
import { getAmplifyDataSchema } from '../commands/utils';
|
|
4
3
|
|
|
5
4
|
jest.mock('@aws-amplify/amplify-prompts');
|
|
6
5
|
|
|
7
|
-
const printerMock = mocked(printer);
|
|
6
|
+
const printerMock = jest.mocked(printer);
|
|
8
7
|
|
|
9
8
|
const sampleIntrospectionSchema = {
|
|
10
9
|
version: 1,
|
|
@@ -4,15 +4,21 @@ import { Form } from 'aws-sdk/clients/amplifyuibuilder'; // eslint-disable-line
|
|
|
4
4
|
import { printer } from '@aws-amplify/amplify-prompts'; // eslint-disable-line import/no-extraneous-dependencies
|
|
5
5
|
import * as utils from '../commands/utils';
|
|
6
6
|
import { prePushHandler } from '../utils/prePushHandler';
|
|
7
|
+
import { isDataStoreEnabled } from '@aws-amplify/amplify-category-api';
|
|
7
8
|
|
|
8
9
|
jest.mock('../commands/utils');
|
|
9
10
|
jest.mock('@aws-amplify/amplify-cli-core');
|
|
10
11
|
jest.mock('../commands/utils/featureFlags', () => ({
|
|
11
12
|
getTransformerVersion: jest.fn().mockImplementation(() => 2),
|
|
12
13
|
}));
|
|
14
|
+
jest.mock('@aws-amplify/amplify-category-api', () => ({
|
|
15
|
+
...jest.requireActual('@aws-amplify/amplify-category-api'),
|
|
16
|
+
isDataStoreEnabled: jest.fn(),
|
|
17
|
+
}));
|
|
13
18
|
|
|
14
19
|
const awsMock = aws as any;
|
|
15
20
|
const utilsMock = utils as any;
|
|
21
|
+
const isDataStoreEnabledMocked = jest.mocked(isDataStoreEnabled);
|
|
16
22
|
|
|
17
23
|
utilsMock.shouldRenderComponents = jest.fn().mockImplementation(() => true);
|
|
18
24
|
|
|
@@ -22,6 +28,7 @@ describe('handlePrePush', () => {
|
|
|
22
28
|
let exportedForms: Form[];
|
|
23
29
|
|
|
24
30
|
beforeEach(() => {
|
|
31
|
+
isDataStoreEnabledMocked.mockResolvedValue(true);
|
|
25
32
|
context = {
|
|
26
33
|
amplify: {
|
|
27
34
|
invokePluginMethod: jest.fn().mockResolvedValue({ models: { Comment: {} } }),
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
import { AmplifyStudioClient } from '../clients';
|
|
13
13
|
import * as createUiBuilderComponentDependency from '../commands/utils/codegenResources';
|
|
14
14
|
import { exampleSchema } from './utils';
|
|
15
|
+
import { isDataStoreEnabled } from '@aws-amplify/amplify-category-api';
|
|
15
16
|
|
|
16
17
|
jest.mock('@aws-amplify/amplify-cli-core', () => ({
|
|
17
18
|
...jest.requireActual('@aws-amplify/amplify-cli-core'),
|
|
@@ -24,12 +25,20 @@ jest.mock('../commands/utils/featureFlags', () => ({
|
|
|
24
25
|
getTransformerVersion: jest.fn().mockReturnValue(2),
|
|
25
26
|
}));
|
|
26
27
|
|
|
28
|
+
jest.mock('@aws-amplify/amplify-category-api', () => ({
|
|
29
|
+
...jest.requireActual('@aws-amplify/amplify-category-api'),
|
|
30
|
+
isDataStoreEnabled: jest.fn(),
|
|
31
|
+
}));
|
|
32
|
+
|
|
27
33
|
const awsMock = aws as any;
|
|
28
34
|
const stateManagerMock = stateManager as any;
|
|
29
35
|
const createUiBuilderComponentDependencyMock = createUiBuilderComponentDependency as any;
|
|
36
|
+
const isDataStoreEnabledMocked = jest.mocked(isDataStoreEnabled);
|
|
37
|
+
|
|
30
38
|
describe('should sync amplify ui builder components', () => {
|
|
31
39
|
let context: any;
|
|
32
40
|
beforeEach(() => {
|
|
41
|
+
isDataStoreEnabledMocked.mockResolvedValue(true);
|
|
33
42
|
context = {
|
|
34
43
|
exeInfo: {
|
|
35
44
|
projectConfig: {
|
|
@@ -5,6 +5,7 @@ import { AmplifyUIBuilder, AmplifyBackend } from 'aws-sdk';
|
|
|
5
5
|
import { printer } from '@aws-amplify/amplify-prompts';
|
|
6
6
|
import { getAppId, getEnvName } from '../commands/utils/environmentHelpers';
|
|
7
7
|
import { getTransformerVersion } from '../commands/utils/featureFlags';
|
|
8
|
+
import { isDataStoreEnabled } from '@aws-amplify/amplify-category-api';
|
|
8
9
|
|
|
9
10
|
/**
|
|
10
11
|
* studio client metadata
|
|
@@ -60,6 +61,7 @@ export default class AmplifyStudioClient {
|
|
|
60
61
|
#envName: string;
|
|
61
62
|
metadata: StudioMetadata;
|
|
62
63
|
isGraphQLSupported = false;
|
|
64
|
+
isDataStoreEnabled = false;
|
|
63
65
|
|
|
64
66
|
/**
|
|
65
67
|
* static function meant to check if given appId is studio enabled
|
|
@@ -82,11 +84,14 @@ export default class AmplifyStudioClient {
|
|
|
82
84
|
static async setClientInfo(context: $TSContext, envName?: string, appId?: string): Promise<AmplifyStudioClient> {
|
|
83
85
|
const resolvedEnvName = getEnvName(context, envName);
|
|
84
86
|
const resolvedAppId = getAppId(context, appId);
|
|
85
|
-
const awsConfigInfo =
|
|
86
|
-
context,
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
87
|
+
const [awsConfigInfo, dataStoreStatus] = await Promise.all([
|
|
88
|
+
context.amplify.invokePluginMethod(context, 'awscloudformation', undefined, 'loadConfigurationForEnv', [
|
|
89
|
+
context,
|
|
90
|
+
resolvedEnvName,
|
|
91
|
+
resolvedAppId,
|
|
92
|
+
]) as ServiceConfigurationOptions,
|
|
93
|
+
isDataStoreEnabled(context),
|
|
94
|
+
]);
|
|
90
95
|
|
|
91
96
|
const client = new AmplifyStudioClient(awsConfigInfo, resolvedAppId, resolvedEnvName);
|
|
92
97
|
|
|
@@ -97,6 +102,8 @@ export default class AmplifyStudioClient {
|
|
|
97
102
|
client.isGraphQLSupported = false;
|
|
98
103
|
}
|
|
99
104
|
|
|
105
|
+
client.isDataStoreEnabled = dataStoreStatus;
|
|
106
|
+
|
|
100
107
|
return client;
|
|
101
108
|
}
|
|
102
109
|
|
|
@@ -37,7 +37,8 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
|
|
|
37
37
|
studioClient.isGraphQLSupported ? getAmplifyDataSchema(context) : Promise.resolve(undefined),
|
|
38
38
|
]);
|
|
39
39
|
|
|
40
|
-
const nothingWouldAutogenerate =
|
|
40
|
+
const nothingWouldAutogenerate =
|
|
41
|
+
!dataSchema || !studioClient.metadata.autoGenerateForms || !studioClient.isGraphQLSupported || !studioClient.isDataStoreEnabled;
|
|
41
42
|
|
|
42
43
|
if (nothingWouldAutogenerate && [componentSchemas, themeSchemas, formSchemas].every((group) => !group.entities.length)) {
|
|
43
44
|
printer.debug('Skipping UI component generation since none are found.');
|
|
@@ -52,7 +53,7 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
|
|
|
52
53
|
context,
|
|
53
54
|
formSchemas.entities,
|
|
54
55
|
dataSchema,
|
|
55
|
-
studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported,
|
|
56
|
+
studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported && studioClient.isDataStoreEnabled,
|
|
56
57
|
studioClient.metadata.formFeatureFlags,
|
|
57
58
|
),
|
|
58
59
|
};
|