Skip to content

Commit

Permalink
design changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gmmorris committed Sep 15, 2020
1 parent 21a37b6 commit acfa049
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.connectorEditFlyoutTabs {
margin-bottom: '-25px';
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
EuiText,
EuiLink,
EuiTabs,
EuiSpacer,
EuiTab,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
Expand All @@ -34,6 +33,7 @@ import { hasSaveActionsCapability } from '../../lib/capabilities';
import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
import { PLUGIN } from '../../constants/plugin';
import { ActionTypeExecutorResult } from '../../../../../actions/common';
import './connector_edit_flyout.scss';

export interface ConnectorEditProps {
initialConnector: ActionConnectorTableItem;
Expand Down Expand Up @@ -230,16 +230,14 @@ export const ConnectorEditFlyout = ({
) : null}
<EuiFlexItem>{flyoutTitle}</EuiFlexItem>
</EuiFlexGroup>
</EuiFlyoutHeader>
<EuiFlyoutBody>
<EuiTabs>
<EuiTabs className="connectorEditFlyoutTabs">
<EuiTab
onClick={() => setTab('config')}
data-test-subj="configureConnectorTab"
isSelected={'config' === selectedTab}
>
{i18n.translate('xpack.triggersActionsUI.sections.editConnectorForm.tabText', {
defaultMessage: 'configuration',
defaultMessage: 'Configuration',
})}
</EuiTab>
<EuiTab
Expand All @@ -248,11 +246,12 @@ export const ConnectorEditFlyout = ({
isSelected={'test' === selectedTab}
>
{i18n.translate('xpack.triggersActionsUI.sections.testConnectorForm.tabText', {
defaultMessage: 'test',
defaultMessage: 'Test',
})}
</EuiTab>
</EuiTabs>
<EuiSpacer size="l" />
</EuiFlyoutHeader>
<EuiFlyoutBody>
{selectedTab === 'config' ? (
!connector.isPreconfigured ? (
<ActionConnectorForm
Expand Down Expand Up @@ -325,7 +324,6 @@ export const ConnectorEditFlyout = ({
<EuiButton
color="secondary"
data-test-subj="saveEditedActionButton"
iconType="check"
isDisabled={hasErrorsInConnectorConfig || !hasChanges}
isLoading={isSaving || isExecutingAction}
onClick={async () => {
Expand All @@ -344,7 +342,6 @@ export const ConnectorEditFlyout = ({
color="secondary"
data-test-subj="saveAndCloseEditedActionButton"
type="submit"
iconType="check"
isDisabled={hasErrorsInConnectorConfig || !hasChanges}
isLoading={isSaving || isExecutingAction}
onClick={async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React, { Suspense } from 'react';
import React, { Fragment, Suspense } from 'react';
import {
EuiFlexGroup,
EuiFlexItem,
Expand All @@ -13,6 +13,7 @@ import {
EuiLoadingSpinner,
EuiDescriptionList,
EuiCallOut,
EuiSpacer,
} from '@elastic/eui';
import { Option, map, getOrElse } from 'fp-ts/lib/Option';
import { pipe } from 'fp-ts/lib/pipeable';
Expand Down Expand Up @@ -85,36 +86,35 @@ export const TestConnectorForm = ({
{
title: 'Execute the example action',
children: (
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiText>
<EuiButton
iconType={'play'}
isLoading={isExecutingAction}
isDisabled={!executeEnabled || hasErrors || isExecutingAction}
data-test-subj="executeActionButton"
onClick={onExecutAction}
>
<FormattedMessage
defaultMessage="Execute"
id="xpack.triggersActionsUI.sections.testConnectorForm.executeTestButton"
/>
</EuiButton>
</EuiText>
</EuiFlexItem>
<Fragment>
{executeEnabled ? null : (
<EuiFlexItem>
<EuiCallOut iconType="alert" size="s" color="warning">
<Fragment>
<EuiCallOut iconType="alert" color="warning">
<p>
<FormattedMessage
defaultMessage="Unsaved changes must be saved before the connector can be tested"
id="xpack.triggersActionsUI.sections.testConnectorForm.executeTestDisabled"
/>
</p>
</EuiCallOut>
</EuiFlexItem>
<EuiSpacer size="s" />
</Fragment>
)}
</EuiFlexGroup>
<EuiText>
<EuiButton
iconType={'play'}
isLoading={isExecutingAction}
isDisabled={!executeEnabled || hasErrors || isExecutingAction}
data-test-subj="executeActionButton"
onClick={onExecutAction}
>
<FormattedMessage
defaultMessage="Execute"
id="xpack.triggersActionsUI.sections.testConnectorForm.executeTestButton"
/>
</EuiButton>
</EuiText>
</Fragment>
),
},
{
Expand Down Expand Up @@ -146,7 +146,7 @@ const AwaitingExecution = () => (
}
)}
data-test-subj="executionAwaiting"
iconType="search"
iconType="iInCircle"
>
<p>
<FormattedMessage
Expand All @@ -168,7 +168,7 @@ const SuccessfulExecution = () => (
)}
color="success"
data-test-subj="executionSuccessfulResult"
iconType="play"
iconType="check"
>
<p>
<FormattedMessage
Expand Down

0 comments on commit acfa049

Please sign in to comment.