From 127584bc5efe0364c9d90aaf891bd6fd51412a91 Mon Sep 17 00:00:00 2001 From: Alexander Harris Date: Mon, 7 Feb 2022 11:15:07 -0800 Subject: [PATCH] fix: bringing action names back inline with external model --- package-lock.json | 12 ++++++------ packages/codegen-ui-react/lib/workflow/action.ts | 16 ++++++++-------- .../workflow/anchorNavigationAction.json | 2 +- .../workflow/dataStoreCreateItem.json | 2 +- .../workflow/dataStoreDeleteItem.json | 2 +- .../workflow/dataStoreUpdateItem.json | 2 +- .../example-schemas/workflow/form.json | 2 +- .../workflow/hardNavigationAction.json | 2 +- .../workflow/newTabNavigationAction.json | 2 +- .../workflow/reloadNavigationAction.json | 2 +- .../components/workflow/dataStoreActions.json | 6 +++--- .../lib/components/workflow/formWithState.json | 2 +- .../components/workflow/navigationActions.json | 8 ++++---- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44ad5013e..7e0d50196 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3925,9 +3925,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001252", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz", - "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==", + "version": "1.0.30001309", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz", + "integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==", "dev": true, "funding": { "type": "opencollective", @@ -16418,9 +16418,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001252", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz", - "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==", + "version": "1.0.30001309", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz", + "integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==", "dev": true }, "caseless": { diff --git a/packages/codegen-ui-react/lib/workflow/action.ts b/packages/codegen-ui-react/lib/workflow/action.ts index 525f26afb..6ded6c3e4 100644 --- a/packages/codegen-ui-react/lib/workflow/action.ts +++ b/packages/codegen-ui-react/lib/workflow/action.ts @@ -29,10 +29,10 @@ import { ImportCollection, ImportSource, ImportValue } from '../imports'; import { getChildPropMappingForComponentName } from './utils'; enum Action { - 'Amplify.Navigate' = 'Amplify.Navigate', - 'Amplify.DataStoreCreateItem' = 'Amplify.DataStoreCreateItem', - 'Amplify.DataStoreUpdateItem' = 'Amplify.DataStoreUpdateItem', - 'Amplify.DataStoreDeleteItem' = 'Amplify.DataStoreDeleteItem', + 'Amplify.Navigation' = 'Amplify.Navigation', + 'Amplify.DataStoreCreateItemAction' = 'Amplify.DataStoreCreateItemAction', + 'Amplify.DataStoreUpdateItemAction' = 'Amplify.DataStoreUpdateItemAction', + 'Amplify.DataStoreDeleteItemAction' = 'Amplify.DataStoreDeleteItemAction', 'Amplify.AuthSignOut' = 'Amplify.AuthSignOut', 'Amplify.Mutation' = 'Amplify.Mutation', } @@ -40,10 +40,10 @@ enum Action { export default Action; export const ActionNameMapping: Partial> = { - [Action['Amplify.Navigate']]: ImportValue.USE_NAVIGATE_ACTION, - [Action['Amplify.DataStoreCreateItem']]: ImportValue.USE_DATA_STORE_CREATE_ACTION, - [Action['Amplify.DataStoreUpdateItem']]: ImportValue.USE_DATA_STORE_UPDATE_ACTION, - [Action['Amplify.DataStoreDeleteItem']]: ImportValue.USE_DATA_STORE_DELETE_ACTION, + [Action['Amplify.Navigation']]: ImportValue.USE_NAVIGATE_ACTION, + [Action['Amplify.DataStoreCreateItemAction']]: ImportValue.USE_DATA_STORE_CREATE_ACTION, + [Action['Amplify.DataStoreUpdateItemAction']]: ImportValue.USE_DATA_STORE_UPDATE_ACTION, + [Action['Amplify.DataStoreDeleteItemAction']]: ImportValue.USE_DATA_STORE_DELETE_ACTION, [Action['Amplify.AuthSignOut']]: ImportValue.USE_AUTH_SIGN_OUT_ACTION, [Action['Amplify.Mutation']]: ImportValue.USE_STATE_MUTATION_ACTION, }; diff --git a/packages/codegen-ui/example-schemas/workflow/anchorNavigationAction.json b/packages/codegen-ui/example-schemas/workflow/anchorNavigationAction.json index f0f07588d..68aae6d39 100644 --- a/packages/codegen-ui/example-schemas/workflow/anchorNavigationAction.json +++ b/packages/codegen-ui/example-schemas/workflow/anchorNavigationAction.json @@ -8,7 +8,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "anchor" diff --git a/packages/codegen-ui/example-schemas/workflow/dataStoreCreateItem.json b/packages/codegen-ui/example-schemas/workflow/dataStoreCreateItem.json index b6dddc949..75e98e20c 100644 --- a/packages/codegen-ui/example-schemas/workflow/dataStoreCreateItem.json +++ b/packages/codegen-ui/example-schemas/workflow/dataStoreCreateItem.json @@ -3,7 +3,7 @@ "name": "CreateCustomerButton", "events": { "click": { - "action": "Amplify.DataStoreCreateItem", + "action": "Amplify.DataStoreCreateItemAction", "parameters": { "model": "Customer", "fields": { diff --git a/packages/codegen-ui/example-schemas/workflow/dataStoreDeleteItem.json b/packages/codegen-ui/example-schemas/workflow/dataStoreDeleteItem.json index 4f1f0f22b..e8f8ee62d 100644 --- a/packages/codegen-ui/example-schemas/workflow/dataStoreDeleteItem.json +++ b/packages/codegen-ui/example-schemas/workflow/dataStoreDeleteItem.json @@ -3,7 +3,7 @@ "name": "DeleteCustomerButton", "events": { "click": { - "action": "Amplify.DataStoreDeleteItem", + "action": "Amplify.DataStoreDeleteItemAction", "parameters": { "model": "Customer", "id": { diff --git a/packages/codegen-ui/example-schemas/workflow/dataStoreUpdateItem.json b/packages/codegen-ui/example-schemas/workflow/dataStoreUpdateItem.json index bfb7b907c..59854e90f 100644 --- a/packages/codegen-ui/example-schemas/workflow/dataStoreUpdateItem.json +++ b/packages/codegen-ui/example-schemas/workflow/dataStoreUpdateItem.json @@ -3,7 +3,7 @@ "name": "UpdateCustomerButton", "events": { "click": { - "action": "Amplify.DataStoreUpdateItem", + "action": "Amplify.DataStoreUpdateItemAction", "parameters": { "model": "Customer", "id": { diff --git a/packages/codegen-ui/example-schemas/workflow/form.json b/packages/codegen-ui/example-schemas/workflow/form.json index 13b8fb762..64bca0f28 100644 --- a/packages/codegen-ui/example-schemas/workflow/form.json +++ b/packages/codegen-ui/example-schemas/workflow/form.json @@ -21,7 +21,7 @@ "name": "SubmitButton", "events": { "click": { - "action": "Amplify.DataStoreUpdateItem", + "action": "Amplify.DataStoreUpdateItemAction", "parameters": { "model": "Customer", "id": { diff --git a/packages/codegen-ui/example-schemas/workflow/hardNavigationAction.json b/packages/codegen-ui/example-schemas/workflow/hardNavigationAction.json index 6b1c5e7bd..d1c5f0866 100644 --- a/packages/codegen-ui/example-schemas/workflow/hardNavigationAction.json +++ b/packages/codegen-ui/example-schemas/workflow/hardNavigationAction.json @@ -8,7 +8,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "url" diff --git a/packages/codegen-ui/example-schemas/workflow/newTabNavigationAction.json b/packages/codegen-ui/example-schemas/workflow/newTabNavigationAction.json index f02acebfc..2d8567d9b 100644 --- a/packages/codegen-ui/example-schemas/workflow/newTabNavigationAction.json +++ b/packages/codegen-ui/example-schemas/workflow/newTabNavigationAction.json @@ -8,7 +8,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "url" diff --git a/packages/codegen-ui/example-schemas/workflow/reloadNavigationAction.json b/packages/codegen-ui/example-schemas/workflow/reloadNavigationAction.json index bbc18572a..f355540d0 100644 --- a/packages/codegen-ui/example-schemas/workflow/reloadNavigationAction.json +++ b/packages/codegen-ui/example-schemas/workflow/reloadNavigationAction.json @@ -8,7 +8,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "reload" diff --git a/packages/test-generator/lib/components/workflow/dataStoreActions.json b/packages/test-generator/lib/components/workflow/dataStoreActions.json index 4258f51d7..2f8200d44 100644 --- a/packages/test-generator/lib/components/workflow/dataStoreActions.json +++ b/packages/test-generator/lib/components/workflow/dataStoreActions.json @@ -24,7 +24,7 @@ }, "events": { "click": { - "action": "Amplify.DataStoreCreateItem", + "action": "Amplify.DataStoreCreateItemAction", "parameters": { "model": "User", "fields": { @@ -52,7 +52,7 @@ }, "events": { "click": { - "action": "Amplify.DataStoreUpdateItem", + "action": "Amplify.DataStoreUpdateItemAction", "parameters": { "model": "User", "id": { @@ -85,7 +85,7 @@ }, "events": { "click": { - "action": "Amplify.DataStoreDeleteItem", + "action": "Amplify.DataStoreDeleteItemAction", "parameters": { "model": "User", "id": { diff --git a/packages/test-generator/lib/components/workflow/formWithState.json b/packages/test-generator/lib/components/workflow/formWithState.json index d3a267231..c8ab32aae 100644 --- a/packages/test-generator/lib/components/workflow/formWithState.json +++ b/packages/test-generator/lib/components/workflow/formWithState.json @@ -29,7 +29,7 @@ "name": "SubmitButton", "events": { "click": { - "action": "Amplify.DataStoreUpdateItem", + "action": "Amplify.DataStoreUpdateItemAction", "parameters": { "model": "User", "id": { diff --git a/packages/test-generator/lib/components/workflow/navigationActions.json b/packages/test-generator/lib/components/workflow/navigationActions.json index addb1b3b6..8912bbcba 100644 --- a/packages/test-generator/lib/components/workflow/navigationActions.json +++ b/packages/test-generator/lib/components/workflow/navigationActions.json @@ -16,7 +16,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "url" @@ -41,7 +41,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "anchor" @@ -66,7 +66,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "url" @@ -94,7 +94,7 @@ }, "events": { "click": { - "action": "Amplify.Navigate", + "action": "Amplify.Navigation", "parameters": { "type": { "value": "reload"