Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More design cleanups #4

Merged
merged 4 commits into from
Mar 18, 2020
Merged

More design cleanups #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
603a332
design cleanup in progress
andreadelrio Mar 18, 2020
43a602a
updating classNames
andreadelrio Mar 18, 2020
00f091e
Merge branch 'actions/license-checks-ui' of https://github.com/mikeco…
andreadelrio Mar 18, 2020
e6d2b42
using EuiIconTip
andreadelrio Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
.actCheckActionTypeEnabled__disabledActionWarningCard {
background-color: $euiColorLightestShade;
}

.actAccordionActionForm {
.euiCard {
box-shadow: none;
}
}
1 change: 1 addition & 0 deletions x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export function checkActionTypeEnabled(
),
messageCard: (
<EuiCard
titleSize="xs"
title={i18n.translate(
'xpack.triggersActionsUI.sections.alertForm.actionTypeDisabledByLicenseMessageTitle',
{
Expand Down
5 changes: 0 additions & 5 deletions ...ns/triggers_actions_ui/public/application/sections/action_connector_form/action_form.scss
View file
Open in desktop

This file was deleted.

62 changes: 36 additions & 26 deletions ...ins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
EuiEmptyPrompt,
EuiButtonEmpty,
EuiToolTip,
EuiIconTip,
EuiLink,
} from '@elastic/eui';
import { HttpSetup, ToastsApi } from 'kibana/public';
Expand All @@ -40,7 +41,6 @@ import { TypeRegistry } from '../../type_registry';
import { actionTypeCompare } from '../../lib/action_type_compare';
import { checkActionTypeEnabled } from '../../lib/check_action_type_enabled';
import { VIEW_LICENSE_OPTIONS_LINK } from '../../../common/constants';
import './action_form.scss';

interface ActionAccordionFormProps {
actions: AlertAction[];
Expand Down Expand Up @@ -263,8 +263,8 @@ export const ActionForm = ({
initialIsOpen={true}
key={index}
id={index.toString()}
className="euiAccordionForm"
buttonContentClassName="euiAccordionForm__button"
className="actAccordionActionForm"
buttonContentClassName="actAccordionActionForm__button"
data-test-subj={`alertActionAccordion-${defaultActionGroupId}`}
buttonContent={
<EuiFlexGroup gutterSize="s" alignItems="center">
Expand All @@ -274,24 +274,35 @@ export const ActionForm = ({
<EuiFlexItem>
<EuiTitle size="s">
<h5>
<FormattedMessage
defaultMessage="Action: {actionConnectorName}"
id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
values={{
actionConnectorName: actionConnector.name,
}}
/>
{checkEnabledResult.isEnabled === false && (
<Fragment>
<span className="actActionForm__disabledActionWarningTitle">
<EuiIcon type="alert" />
<FormattedMessage
defaultMessage="This action is disabled"
id="xpack.triggersActionsUI.sections.alertForm.actionDisabledTitle"
/>
</span>
</Fragment>
)}
<EuiFlexGroup gutterSize="s">
<EuiFlexItem grow={false}>
<FormattedMessage
defaultMessage="Action: {actionConnectorName}"
id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
values={{
actionConnectorName: actionConnector.name,
}}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
{checkEnabledResult.isEnabled === false && (
<Fragment>
<EuiIconTip
type="alert"
color="danger"
label="Beta"
content={i18n.translate(
'xpack.triggersActionsUI.sections.alertForm.actionDisabledTitle',
{
defaultMessage: 'This action is disabled',
}
)}
position="right"
/>
</Fragment>
)}
</EuiFlexItem>
</EuiFlexGroup>
</h5>
</EuiTitle>
</EuiFlexItem>
Expand All @@ -301,7 +312,7 @@ export const ActionForm = ({
<EuiButtonIcon
iconType="cross"
color="danger"
className="euiAccordionForm__extraAction"
className="actAccordionActionForm__extraAction"
aria-label={i18n.translate(
'xpack.triggersActionsUI.sections.alertForm.accordion.deleteIconAriaLabel',
{
Expand Down Expand Up @@ -338,8 +349,8 @@ export const ActionForm = ({
initialIsOpen={true}
key={index}
id={index.toString()}
className="euiAccordionForm"
buttonContentClassName="euiAccordionForm__button"
className="actAccordionActionForm"
buttonContentClassName="actAccordionActionForm__button"
data-test-subj={`alertActionAccordion-${defaultActionGroupId}`}
buttonContent={
<EuiFlexGroup gutterSize="s" alignItems="center">
Expand All @@ -365,7 +376,7 @@ export const ActionForm = ({
<EuiButtonIcon
iconType="cross"
color="danger"
className="euiAccordionForm__extraAction"
className="actAccordionActionForm__extraAction"
aria-label={i18n.translate(
'xpack.triggersActionsUI.sections.alertForm.accordion.deleteIconAriaLabel',
{
Expand Down Expand Up @@ -549,7 +560,6 @@ export const ActionForm = ({
target="_blank"
className="actActionForm__getMoreActionsLink"
>
<EuiIcon type="starEmptySpace" />
<FormattedMessage
defaultMessage="Get more actions"
id="xpack.triggersActionsUI.sections.actionForm.getMoreActionsTitle"
Expand Down
1 change: 1 addition & 0 deletions ...riggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export const ActionTypeMenu = ({
const checkEnabledResult = checkActionTypeEnabled(item.actionType);
const card = (
<EuiCard
titleSize="xs"
data-test-subj={`${item.actionType.id}-card`}
icon={<EuiIcon size="l" type={item.iconClass} />}
title={item.name}
Expand Down
1 change: 0 additions & 1 deletion ...ers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ const upgradeYourLicenseCallOut = (
'xpack.triggersActionsUI.sections.actionConnectorAdd.upgradeYourPlanBannerTitle',
{ defaultMessage: 'Upgrade your plan to access more connector types' }
)}
iconType="starEmptySpace"
>
<FormattedMessage
id="xpack.triggersActionsUI.sections.actionConnectorAdd.upgradeYourPlanBannerMessage"
Expand Down
16 changes: 9 additions & 7 deletions ...ublic/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
EuiTitle,
EuiLink,
EuiLoadingSpinner,
EuiToolTip,
EuiIconTip,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
Expand Down Expand Up @@ -159,12 +159,14 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
return checkEnabledResult.isEnabled ? (
link
) : (
<EuiToolTip position="top" content={checkEnabledResult.message}>
<Fragment>
{link}
<EuiIcon type="questionInCircle" />
</Fragment>
</EuiToolTip>
<Fragment>
{link}
<EuiIconTip
type="questionInCircle"
content={checkEnabledResult.message}
position="right"
/>
</Fragment>
);
},
},
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ export const AlertEdit = ({
{hasActionsDisabled && (
<Fragment>
<EuiCallOut
size="s"
color="danger"
iconType="alert"
title={i18n.translate(
Expand Down