Skip to content

Commit acfa049

Browse files
committed
design changes
1 parent 21a37b6 commit acfa049

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.connectorEditFlyoutTabs {
2+
margin-bottom: '-25px';
3+
}

x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
EuiText,
2121
EuiLink,
2222
EuiTabs,
23-
EuiSpacer,
2423
EuiTab,
2524
} from '@elastic/eui';
2625
import { i18n } from '@kbn/i18n';
@@ -34,6 +33,7 @@ import { hasSaveActionsCapability } from '../../lib/capabilities';
3433
import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
3534
import { PLUGIN } from '../../constants/plugin';
3635
import { ActionTypeExecutorResult } from '../../../../../actions/common';
36+
import './connector_edit_flyout.scss';
3737

3838
export interface ConnectorEditProps {
3939
initialConnector: ActionConnectorTableItem;
@@ -230,16 +230,14 @@ export const ConnectorEditFlyout = ({
230230
) : null}
231231
<EuiFlexItem>{flyoutTitle}</EuiFlexItem>
232232
</EuiFlexGroup>
233-
</EuiFlyoutHeader>
234-
<EuiFlyoutBody>
235-
<EuiTabs>
233+
<EuiTabs className="connectorEditFlyoutTabs">
236234
<EuiTab
237235
onClick={() => setTab('config')}
238236
data-test-subj="configureConnectorTab"
239237
isSelected={'config' === selectedTab}
240238
>
241239
{i18n.translate('xpack.triggersActionsUI.sections.editConnectorForm.tabText', {
242-
defaultMessage: 'configuration',
240+
defaultMessage: 'Configuration',
243241
})}
244242
</EuiTab>
245243
<EuiTab
@@ -248,11 +246,12 @@ export const ConnectorEditFlyout = ({
248246
isSelected={'test' === selectedTab}
249247
>
250248
{i18n.translate('xpack.triggersActionsUI.sections.testConnectorForm.tabText', {
251-
defaultMessage: 'test',
249+
defaultMessage: 'Test',
252250
})}
253251
</EuiTab>
254252
</EuiTabs>
255-
<EuiSpacer size="l" />
253+
</EuiFlyoutHeader>
254+
<EuiFlyoutBody>
256255
{selectedTab === 'config' ? (
257256
!connector.isPreconfigured ? (
258257
<ActionConnectorForm
@@ -325,7 +324,6 @@ export const ConnectorEditFlyout = ({
325324
<EuiButton
326325
color="secondary"
327326
data-test-subj="saveEditedActionButton"
328-
iconType="check"
329327
isDisabled={hasErrorsInConnectorConfig || !hasChanges}
330328
isLoading={isSaving || isExecutingAction}
331329
onClick={async () => {
@@ -344,7 +342,6 @@ export const ConnectorEditFlyout = ({
344342
color="secondary"
345343
data-test-subj="saveAndCloseEditedActionButton"
346344
type="submit"
347-
iconType="check"
348345
isDisabled={hasErrorsInConnectorConfig || !hasChanges}
349346
isLoading={isSaving || isExecutingAction}
350347
onClick={async () => {

x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* or more contributor license agreements. Licensed under the Elastic License;
44
* you may not use this file except in compliance with the Elastic License.
55
*/
6-
import React, { Suspense } from 'react';
6+
import React, { Fragment, Suspense } from 'react';
77
import {
88
EuiFlexGroup,
99
EuiFlexItem,
@@ -13,6 +13,7 @@ import {
1313
EuiLoadingSpinner,
1414
EuiDescriptionList,
1515
EuiCallOut,
16+
EuiSpacer,
1617
} from '@elastic/eui';
1718
import { Option, map, getOrElse } from 'fp-ts/lib/Option';
1819
import { pipe } from 'fp-ts/lib/pipeable';
@@ -85,36 +86,35 @@ export const TestConnectorForm = ({
8586
{
8687
title: 'Execute the example action',
8788
children: (
88-
<EuiFlexGroup justifyContent="spaceBetween">
89-
<EuiFlexItem grow={false}>
90-
<EuiText>
91-
<EuiButton
92-
iconType={'play'}
93-
isLoading={isExecutingAction}
94-
isDisabled={!executeEnabled || hasErrors || isExecutingAction}
95-
data-test-subj="executeActionButton"
96-
onClick={onExecutAction}
97-
>
98-
<FormattedMessage
99-
defaultMessage="Execute"
100-
id="xpack.triggersActionsUI.sections.testConnectorForm.executeTestButton"
101-
/>
102-
</EuiButton>
103-
</EuiText>
104-
</EuiFlexItem>
89+
<Fragment>
10590
{executeEnabled ? null : (
106-
<EuiFlexItem>
107-
<EuiCallOut iconType="alert" size="s" color="warning">
91+
<Fragment>
92+
<EuiCallOut iconType="alert" color="warning">
10893
<p>
10994
<FormattedMessage
11095
defaultMessage="Unsaved changes must be saved before the connector can be tested"
11196
id="xpack.triggersActionsUI.sections.testConnectorForm.executeTestDisabled"
11297
/>
11398
</p>
11499
</EuiCallOut>
115-
</EuiFlexItem>
100+
<EuiSpacer size="s" />
101+
</Fragment>
116102
)}
117-
</EuiFlexGroup>
103+
<EuiText>
104+
<EuiButton
105+
iconType={'play'}
106+
isLoading={isExecutingAction}
107+
isDisabled={!executeEnabled || hasErrors || isExecutingAction}
108+
data-test-subj="executeActionButton"
109+
onClick={onExecutAction}
110+
>
111+
<FormattedMessage
112+
defaultMessage="Execute"
113+
id="xpack.triggersActionsUI.sections.testConnectorForm.executeTestButton"
114+
/>
115+
</EuiButton>
116+
</EuiText>
117+
</Fragment>
118118
),
119119
},
120120
{
@@ -146,7 +146,7 @@ const AwaitingExecution = () => (
146146
}
147147
)}
148148
data-test-subj="executionAwaiting"
149-
iconType="search"
149+
iconType="iInCircle"
150150
>
151151
<p>
152152
<FormattedMessage
@@ -168,7 +168,7 @@ const SuccessfulExecution = () => (
168168
)}
169169
color="success"
170170
data-test-subj="executionSuccessfulResult"
171-
iconType="play"
171+
iconType="check"
172172
>
173173
<p>
174174
<FormattedMessage

0 commit comments

Comments
 (0)