From b901a396bf18cf921d8af9bc511054a9a7208d1d Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Mon, 8 Aug 2022 18:24:36 +0200 Subject: [PATCH] fix: update account wording with connection --- packages/backend/src/apps/flickr/info.json | 16 +++--- packages/backend/src/apps/github/info.json | 52 +++++++++---------- packages/backend/src/apps/slack/info.json | 8 +-- packages/backend/src/apps/twitter/info.json | 16 +++--- .../index.tsx | 8 +-- .../web/src/components/FlowStep/index.tsx | 8 +-- 6 files changed, 54 insertions(+), 54 deletions(-) rename packages/web/src/components/{ChooseAccountSubstep => ChooseConnectionSubstep}/index.tsx (95%) diff --git a/packages/backend/src/apps/flickr/info.json b/packages/backend/src/apps/flickr/info.json index b9b572ed..3d1e6329 100644 --- a/packages/backend/src/apps/flickr/info.json +++ b/packages/backend/src/apps/flickr/info.json @@ -223,8 +223,8 @@ "description": "Triggers when you favorite a photo.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "testStep", @@ -238,8 +238,8 @@ "description": "Triggers when you add a new photo in an album.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -276,8 +276,8 @@ "description": "Triggers when you add a new photo.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "testStep", @@ -291,8 +291,8 @@ "description": "Triggers when you create a new album.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "testStep", diff --git a/packages/backend/src/apps/github/info.json b/packages/backend/src/apps/github/info.json index df74c31e..8e9db0e2 100644 --- a/packages/backend/src/apps/github/info.json +++ b/packages/backend/src/apps/github/info.json @@ -223,8 +223,8 @@ "description": "Triggers when a new repository is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "testStep", @@ -238,8 +238,8 @@ "description": "Triggers when a new organization is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "testStep", @@ -253,8 +253,8 @@ "description": "Triggers when a new branch is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -291,8 +291,8 @@ "description": "Triggers when a new notification is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -330,8 +330,8 @@ "description": "Triggers when a new pull request is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -368,8 +368,8 @@ "description": "Triggers when a new watcher is added to a repo", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -406,8 +406,8 @@ "description": "Triggers when a new milestone is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -444,8 +444,8 @@ "description": "Triggers when a new commit comment is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -482,8 +482,8 @@ "description": "Triggers when a new label is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -520,8 +520,8 @@ "description": "Triggers when a new collaborator is added to a repo", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -558,8 +558,8 @@ "description": "Triggers when a new release is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -596,8 +596,8 @@ "description": "Triggers when a new commit is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -657,8 +657,8 @@ "description": "Triggers when a new issue is created", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", diff --git a/packages/backend/src/apps/slack/info.json b/packages/backend/src/apps/slack/info.json index a1c89791..4e5cd4f8 100644 --- a/packages/backend/src/apps/slack/info.json +++ b/packages/backend/src/apps/slack/info.json @@ -105,8 +105,8 @@ "description": "Triggers when a new message is posted to a channel", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -164,8 +164,8 @@ "description": "Send a message to a specific channel you specify.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "setupAction", diff --git a/packages/backend/src/apps/twitter/info.json b/packages/backend/src/apps/twitter/info.json index 790438b3..dc3d0f3e 100644 --- a/packages/backend/src/apps/twitter/info.json +++ b/packages/backend/src/apps/twitter/info.json @@ -223,8 +223,8 @@ "description": "Will be triggered when you tweet something new.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "testStep", @@ -238,8 +238,8 @@ "description": "Will be triggered when a specific user tweet something new.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -265,8 +265,8 @@ "description": "Will be triggered when any user tweet something containing a specific keyword, phrase, username or hashtag.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseTrigger", @@ -294,8 +294,8 @@ "description": "Will create a tweet.", "substeps": [ { - "key": "chooseAccount", - "name": "Choose account" + "key": "chooseConnection", + "name": "Choose connection" }, { "key": "chooseAction", diff --git a/packages/web/src/components/ChooseAccountSubstep/index.tsx b/packages/web/src/components/ChooseConnectionSubstep/index.tsx similarity index 95% rename from packages/web/src/components/ChooseAccountSubstep/index.tsx rename to packages/web/src/components/ChooseConnectionSubstep/index.tsx index eda9327f..10aa73e4 100644 --- a/packages/web/src/components/ChooseAccountSubstep/index.tsx +++ b/packages/web/src/components/ChooseConnectionSubstep/index.tsx @@ -11,7 +11,7 @@ import type { IApp, IConnection, IStep, ISubstep } from '@automatisch/types'; import { GET_APP_CONNECTIONS } from 'graphql/queries/get-app-connections'; import { TEST_CONNECTION } from 'graphql/queries/test-connection'; -type ChooseAccountSubstepProps = { +type ChooseConnectionSubstepProps = { substep: ISubstep, expanded?: boolean; onExpand: () => void; @@ -28,7 +28,7 @@ const optionGenerator = (connection: IConnection): { label: string; value: strin const getOption = (options: Record[], connectionId?: string) => options.find(connection => connection.value === connectionId) || null; -function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElement { +function ChooseConnectionSubstep(props: ChooseConnectionSubstepProps): React.ReactElement { const { substep, expanded = false, @@ -119,7 +119,7 @@ function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElem disablePortal disableClearable options={connectionOptions} - renderInput={(params) => } + renderInput={(params) => } value={getOption(connectionOptions, connection?.id)} onChange={handleChange} loading={loading} @@ -140,4 +140,4 @@ function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElem ); } -export default ChooseAccountSubstep; +export default ChooseConnectionSubstep; diff --git a/packages/web/src/components/FlowStep/index.tsx b/packages/web/src/components/FlowStep/index.tsx index 8b2c35cb..d41e2fc3 100644 --- a/packages/web/src/components/FlowStep/index.tsx +++ b/packages/web/src/components/FlowStep/index.tsx @@ -19,7 +19,7 @@ import { StepExecutionsProvider } from 'contexts/StepExecutions'; import TestSubstep from 'components/TestSubstep'; import FlowSubstep from 'components/FlowSubstep'; import ChooseAppAndEventSubstep from 'components/ChooseAppAndEventSubstep'; -import ChooseAccountSubstep from 'components/ChooseAccountSubstep'; +import ChooseConnectionSubstep from 'components/ChooseConnectionSubstep'; import Form from 'components/Form'; import FlowStepContextMenu from 'components/FlowStepContextMenu'; import AppIcon from 'components/AppIcon'; @@ -251,8 +251,8 @@ export default function FlowStep( index: number ) => ( - {substep.key === 'chooseAccount' && ( - toggleSubstep(index + 1)} @@ -275,7 +275,7 @@ export default function FlowStep( /> )} - {['chooseAccount', 'testStep'].includes(substep.key) === + {['chooseConnection', 'testStep'].includes(substep.key) === false && (