groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #419 from automatisch/issue-418

Browse Source 
fix: update account wording with connection
This commit is contained in:
Ömer Faruk Aydın
2022-08-08 19:43:04 +03:00
committed by GitHub
parent fa92375e33 b901a396bf
commit 7990c68d65
6 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend/src/apps/flickr/info.json
View File

@@ -223,8 +223,8 @@
"description": "Triggers when you favorite a photo.", "description": "Triggers when you favorite a photo.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "testStep", "key": "testStep",
@@ -238,8 +238,8 @@
"description": "Triggers when you add a new photo in an album.", "description": "Triggers when you add a new photo in an album.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -276,8 +276,8 @@
"description": "Triggers when you add a new photo.", "description": "Triggers when you add a new photo.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "testStep", "key": "testStep",
@@ -291,8 +291,8 @@
"description": "Triggers when you create a new album.", "description": "Triggers when you create a new album.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "testStep", "key": "testStep",

52
packages/backend/src/apps/github/info.json
View File

@@ -223,8 +223,8 @@
"description": "Triggers when a new repository is created", "description": "Triggers when a new repository is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "testStep", "key": "testStep",
@@ -238,8 +238,8 @@
"description": "Triggers when a new organization is created", "description": "Triggers when a new organization is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "testStep", "key": "testStep",
@@ -253,8 +253,8 @@
"description": "Triggers when a new branch is created", "description": "Triggers when a new branch is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -291,8 +291,8 @@
"description": "Triggers when a new notification is created", "description": "Triggers when a new notification is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -330,8 +330,8 @@
"description": "Triggers when a new pull request is created", "description": "Triggers when a new pull request is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -368,8 +368,8 @@
"description": "Triggers when a new watcher is added to a repo", "description": "Triggers when a new watcher is added to a repo",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -406,8 +406,8 @@
"description": "Triggers when a new milestone is created", "description": "Triggers when a new milestone is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -444,8 +444,8 @@
"description": "Triggers when a new commit comment is created", "description": "Triggers when a new commit comment is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -482,8 +482,8 @@
"description": "Triggers when a new label is created", "description": "Triggers when a new label is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -520,8 +520,8 @@
"description": "Triggers when a new collaborator is added to a repo", "description": "Triggers when a new collaborator is added to a repo",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -558,8 +558,8 @@
"description": "Triggers when a new release is created", "description": "Triggers when a new release is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -596,8 +596,8 @@
"description": "Triggers when a new commit is created", "description": "Triggers when a new commit is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -657,8 +657,8 @@
"description": "Triggers when a new issue is created", "description": "Triggers when a new issue is created",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",

8
packages/backend/src/apps/slack/info.json
View File

@@ -105,8 +105,8 @@
"description": "Triggers when a new message is posted to a channel", "description": "Triggers when a new message is posted to a channel",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -164,8 +164,8 @@
"description": "Send a message to a specific channel you specify.", "description": "Send a message to a specific channel you specify.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "setupAction", "key": "setupAction",

16
packages/backend/src/apps/twitter/info.json
View File

@@ -223,8 +223,8 @@
"description": "Will be triggered when you tweet something new.", "description": "Will be triggered when you tweet something new.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "testStep", "key": "testStep",
@@ -238,8 +238,8 @@
"description": "Will be triggered when a specific user tweet something new.", "description": "Will be triggered when a specific user tweet something new.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -265,8 +265,8 @@
"description": "Will be triggered when any user tweet something containing a specific keyword, phrase, username or hashtag.", "description": "Will be triggered when any user tweet something containing a specific keyword, phrase, username or hashtag.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseTrigger", "key": "chooseTrigger",
@@ -294,8 +294,8 @@
"description": "Will create a tweet.", "description": "Will create a tweet.",
"substeps": [ "substeps": [
{ {
"key": "chooseAccount", "key": "chooseConnection",
"name": "Choose account" "name": "Choose connection"
}, },
{ {
"key": "chooseAction", "key": "chooseAction",

8
packages/web/src/components/ChooseAccountSubstep/index.tsx → packages/web/src/components/ChooseConnectionSubstep/index.tsx
View File

@@ -11,7 +11,7 @@ import type { IApp, IConnection, IStep, ISubstep } from '@automatisch/types';
import { GET_APP_CONNECTIONS } from 'graphql/queries/get-app-connections'; import { GET_APP_CONNECTIONS } from 'graphql/queries/get-app-connections';
import { TEST_CONNECTION } from 'graphql/queries/test-connection'; import { TEST_CONNECTION } from 'graphql/queries/test-connection';
type ChooseAccountSubstepProps = { type ChooseConnectionSubstepProps = {
substep: ISubstep, substep: ISubstep,
expanded?: boolean; expanded?: boolean;
onExpand: () => void; onExpand: () => void;
@@ -28,7 +28,7 @@ const optionGenerator = (connection: IConnection): { label: string; value: strin
const getOption = (options: Record<string, unknown>[], connectionId?: string) => options.find(connection => connection.value === connectionId) || null; const getOption = (options: Record<string, unknown>[], connectionId?: string) => options.find(connection => connection.value === connectionId) || null;
function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElement { function ChooseConnectionSubstep(props: ChooseConnectionSubstepProps): React.ReactElement {
const { const {
substep, substep,
expanded = false, expanded = false,
@@ -119,7 +119,7 @@ function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElem
disablePortal disablePortal
disableClearable disableClearable
options={connectionOptions} options={connectionOptions}
renderInput={(params) => <TextField {...params} label="Choose account" />} renderInput={(params) => <TextField {...params} label="Choose connection" />}
value={getOption(connectionOptions, connection?.id)} value={getOption(connectionOptions, connection?.id)}
onChange={handleChange} onChange={handleChange}
loading={loading} loading={loading}
@@ -140,4 +140,4 @@ function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElem
); );
} }
export default ChooseAccountSubstep; export default ChooseConnectionSubstep;

8
packages/web/src/components/FlowStep/index.tsx
View File

@@ -19,7 +19,7 @@ import { StepExecutionsProvider } from 'contexts/StepExecutions';
import TestSubstep from 'components/TestSubstep'; import TestSubstep from 'components/TestSubstep';
import FlowSubstep from 'components/FlowSubstep'; import FlowSubstep from 'components/FlowSubstep';
import ChooseAppAndEventSubstep from 'components/ChooseAppAndEventSubstep'; import ChooseAppAndEventSubstep from 'components/ChooseAppAndEventSubstep';
import ChooseAccountSubstep from 'components/ChooseAccountSubstep'; import ChooseConnectionSubstep from 'components/ChooseConnectionSubstep';
import Form from 'components/Form'; import Form from 'components/Form';
import FlowStepContextMenu from 'components/FlowStepContextMenu'; import FlowStepContextMenu from 'components/FlowStepContextMenu';
import AppIcon from 'components/AppIcon'; import AppIcon from 'components/AppIcon';
@@ -251,8 +251,8 @@ export default function FlowStep(
index: number index: number
) => ( ) => (
<React.Fragment key={`${substep?.name}-${index}`}> <React.Fragment key={`${substep?.name}-${index}`}>
{substep.key === 'chooseAccount' && ( {substep.key === 'chooseConnection' && (
<ChooseAccountSubstep <ChooseConnectionSubstep
expanded={currentSubstep === index + 1} expanded={currentSubstep === index + 1}
substep={substep} substep={substep}
onExpand={() => toggleSubstep(index + 1)} onExpand={() => toggleSubstep(index + 1)}
@@ -275,7 +275,7 @@ export default function FlowStep(
/> />
)} )}
{['chooseAccount', 'testStep'].includes(substep.key) === {['chooseConnection', 'testStep'].includes(substep.key) ===
false && ( false && (
<FlowSubstep <FlowSubstep
expanded={currentSubstep === index + 1} expanded={currentSubstep === index + 1}