Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ interface RulesListAutoRefreshProps {
onRefresh: () => void;
}

const flexGroupStyle = {
marginLeft: 'auto',
};

const getLastUpdateText = (lastUpdate: string) => {
if (!moment(lastUpdate).isValid()) {
return '';
Expand Down Expand Up @@ -104,8 +100,13 @@ export const RulesListAutoRefresh = (props: RulesListAutoRefreshProps) => {
);

return (
<EuiFlexGroup data-test-subj="rulesListAutoRefresh" alignItems="center">
<EuiFlexItem grow={false} style={flexGroupStyle}>
<EuiFlexGroup
data-test-subj="rulesListAutoRefresh"
alignItems="center"
gutterSize="s"
responsive={false}
>
<EuiFlexItem grow={false}>
<EuiText data-test-subj="rulesListAutoRefresh-lastUpdateText" size="s" color="subdued">
{lastUpdateText}
</EuiText>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,40 +212,48 @@ export const RulesListFiltersBar = React.memo((props: RulesListFiltersBarProps)
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="m" />
<EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
<EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="m" wrap>
<EuiFlexItem grow={false}>
<RulesListStatuses
rulesStatuses={rulesStatusesTotal}
rulesLastRunOutcomes={rulesLastRunOutcomesTotal}
/>
</EuiFlexItem>
<EuiFlexItem>
<EuiFlexGroup alignItems="center" gutterSize="none">
<RulesListStatuses
rulesStatuses={rulesStatusesTotal}
rulesLastRunOutcomes={rulesLastRunOutcomesTotal}
/>
<RulesListAutoRefresh lastUpdate={lastUpdate} onRefresh={onRefreshRules} />
<EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="m" wrap>
<EuiFlexItem grow={false}>
<RulesListAutoRefresh lastUpdate={lastUpdate} onRefresh={onRefreshRules} />
</EuiFlexItem>
{rulesStatusesTotal.error > 0 && (
<EuiFlexItem grow={false}>
<EuiLink
data-test-subj="expandRulesError"
color="primary"
onClick={onToggleRuleErrors}
>
{!showErrors && (
<FormattedMessage
id="xpack.triggersActionsUI.sections.rulesList.showAllErrors"
defaultMessage="Show {totalStatusesError, plural, one {error} other {errors}}"
values={{
totalStatusesError: rulesStatusesTotal.error,
}}
/>
)}
{showErrors && (
<FormattedMessage
id="xpack.triggersActionsUI.sections.rulesList.hideAllErrors"
defaultMessage="Hide {totalStatusesError, plural, one {error} other {errors}}"
values={{
totalStatusesError: rulesStatusesTotal.error,
}}
/>
)}
</EuiLink>
</EuiFlexItem>
)}
</EuiFlexGroup>
</EuiFlexItem>
{rulesStatusesTotal.error > 0 && (
<EuiFlexItem grow={false}>
<EuiLink data-test-subj="expandRulesError" color="primary" onClick={onToggleRuleErrors}>
{!showErrors && (
<FormattedMessage
id="xpack.triggersActionsUI.sections.rulesList.showAllErrors"
defaultMessage="Show {totalStatusesError, plural, one {error} other {errors}}"
values={{
totalStatusesError: rulesStatusesTotal.error,
}}
/>
)}
{showErrors && (
<FormattedMessage
id="xpack.triggersActionsUI.sections.rulesList.hideAllErrors"
defaultMessage="Hide {totalStatusesError, plural, one {error} other {errors}}"
values={{
totalStatusesError: rulesStatusesTotal.error,
}}
/>
)}
</EuiLink>
</EuiFlexItem>
)}
</EuiFlexGroup>
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const RulesListStatuses = (props: RulesListStatusesProps) => {

if (isRuleUsingExecutionStatus) {
return (
<EuiFlexGroup alignItems="center" gutterSize="none">
<EuiFlexGroup alignItems="center" gutterSize="m" responsive={false} wrap>
<EuiFlexItem grow={false}>
<EuiHealth color={euiTheme.colors.success} data-test-subj="totalActiveRulesCount">
{RULE_STATUS_ACTIVE(rulesStatuses.active)}
Expand Down Expand Up @@ -70,7 +70,7 @@ export const RulesListStatuses = (props: RulesListStatusesProps) => {
}

return (
<EuiFlexGroup alignItems="center" gutterSize="none">
<EuiFlexGroup alignItems="center" gutterSize="m" responsive={false} wrap>
<EuiFlexItem grow={false}>
<EuiHealth color={euiTheme.colors.success} data-test-subj="totalSucceededRulesCount">
{RULE_LAST_RUN_OUTCOME_SUCCEEDED_DESCRIPTION(rulesLastRunOutcomes.succeeded)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -970,9 +970,21 @@ export const RulesListTable = (props: RulesListTableProps) => {

return (
<EuiFlexGroup gutterSize="none" direction="column">
<EuiFlexGroup justifyContent="spaceBetween" gutterSize="none" alignItems="center">
<EuiFlexGroup
justifyContent="spaceBetween"
gutterSize="none"
alignItems="center"
responsive={false}
wrap={false}
>
<EuiFlexItem grow={false}>
<EuiFlexGroup justifyContent="flexStart" gutterSize="s" alignItems="center">
<EuiFlexGroup
justifyContent="flexStart"
gutterSize="s"
alignItems="center"
responsive={false}
wrap={false}
>
<EuiFlexItem grow={false}>
{numberOfSelectedRules > 0 ? (
renderSelectAllDropdown?.()
Expand Down Expand Up @@ -1001,6 +1013,7 @@ export const RulesListTable = (props: RulesListTableProps) => {
</EuiFlexItem>
{numberOfFilters > 0 && (
<EuiFlexItem
grow={false}
css={{
borderLeft: euiTheme.border.thin,
paddingLeft: euiTheme.size.m,
Expand Down Expand Up @@ -1041,6 +1054,7 @@ export const RulesListTable = (props: RulesListTableProps) => {
columns={[selectionColumn, ...rulesListColumns]}
sorting={{ sort }}
rowHeader="name"
responsiveBreakpoint={false}
rowProps={rowProps}
css={ruleRowCss}
cellProps={(rule: RuleTableItem) => ({
Expand Down
Loading