Skip to content

Commit

Permalink
[8.x] 🌊 Streams: Fix routing UI for no-condition routing (elastic#206752
Browse files Browse the repository at this point in the history 
) (elastic#206965)

# Backport

This will backport the following commits from `main` to `8.x`:
- [🌊 Streams: Fix routing UI for no-condition routing
(elastic#206752)](elastic#206752)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Joe
Reuter","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-16T15:23:18Z","message":"🌊
Streams: Fix routing UI for no-condition routing (elastic#206752)\n\nIt is
possible for a stream to end up with no routing condition. This
is\nuseful to stop routing to a child, but keep the child stream
around.\nCurrently, this is not handled well by the UI - the font size
is wrong\nand there is no way to change it:\n<img width=\"671\"
alt=\"Screenshot 2025-01-15 at 13 25
12\"\nsrc=\"https://github.com/user-attachments/assets/25d45969-eff8-449b-9f75-831aa6c46a25\"\n/>\n\nThis
PR fixes this:\n<img width=\"684\" alt=\"Screenshot 2025-01-15 at 13 24
38\"\nsrc=\"https://github.com/user-attachments/assets/dd9399e9-0841-4962-a8af-b15dc922cc6d\"\n/>\n\n<img
width=\"660\" alt=\"Screenshot 2025-01-15 at 13 33
47\"\nsrc=\"https://github.com/user-attachments/assets/c0a33aec-3c94-46c4-b440-2d582522f89e\"\n/>","sha":"49f97246801835373c77222eda97c4c48ceb027f","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:version","v8.18.0","Feature:Streams"],"title":"🌊
Streams: Fix routing UI for no-condition
routing","number":206752,"url":"https://github.com/elastic/kibana/pull/206752","mergeCommit":{"message":"🌊
Streams: Fix routing UI for no-condition routing (elastic#206752)\n\nIt is
possible for a stream to end up with no routing condition. This
is\nuseful to stop routing to a child, but keep the child stream
around.\nCurrently, this is not handled well by the UI - the font size
is wrong\nand there is no way to change it:\n<img width=\"671\"
alt=\"Screenshot 2025-01-15 at 13 25
12\"\nsrc=\"https://github.com/user-attachments/assets/25d45969-eff8-449b-9f75-831aa6c46a25\"\n/>\n\nThis
PR fixes this:\n<img width=\"684\" alt=\"Screenshot 2025-01-15 at 13 24
38\"\nsrc=\"https://github.com/user-attachments/assets/dd9399e9-0841-4962-a8af-b15dc922cc6d\"\n/>\n\n<img
width=\"660\" alt=\"Screenshot 2025-01-15 at 13 33
47\"\nsrc=\"https://github.com/user-attachments/assets/c0a33aec-3c94-46c4-b440-2d582522f89e\"\n/>","sha":"49f97246801835373c77222eda97c4c48ceb027f"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/206752","number":206752,"mergeCommit":{"message":"🌊
Streams: Fix routing UI for no-condition routing (elastic#206752)\n\nIt is
possible for a stream to end up with no routing condition. This
is\nuseful to stop routing to a child, but keep the child stream
around.\nCurrently, this is not handled well by the UI - the font size
is wrong\nand there is no way to change it:\n<img width=\"671\"
alt=\"Screenshot 2025-01-15 at 13 25
12\"\nsrc=\"https://github.com/user-attachments/assets/25d45969-eff8-449b-9f75-831aa6c46a25\"\n/>\n\nThis
PR fixes this:\n<img width=\"684\" alt=\"Screenshot 2025-01-15 at 13 24
38\"\nsrc=\"https://github.com/user-attachments/assets/dd9399e9-0841-4962-a8af-b15dc922cc6d\"\n/>\n\n<img
width=\"660\" alt=\"Screenshot 2025-01-15 at 13 33
47\"\nsrc=\"https://github.com/user-attachments/assets/c0a33aec-3c94-46c4-b440-2d582522f89e\"\n/>","sha":"49f97246801835373c77222eda97c4c48ceb027f"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Joe Reuter <[email protected]>
  • Loading branch information
@kibanamachine @flash1293
kibanamachine and flash1293 authored Jan 16, 2025
1 parent 96a0ecf commit fcdaf0b
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 52 deletions.
48 changes: 34 additions & 14 deletions .../solutions/observability/plugins/streams_app/public/components/condition_editor/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@

import {
EuiBadge,
EuiButton,
EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiPanel,
EuiSelect,
EuiSwitch,
EuiText,
EuiToolTip,
} from '@elastic/eui';
import {
AndCondition,
Expand All @@ -32,9 +34,6 @@ export function ConditionEditor(props: {
readonly?: boolean;
onConditionChange?: (condition: Condition) => void;
}) {
if (!props.condition) {
return null;
}
if (props.readonly) {
return (
<EuiPanel color="subdued" borderRadius="none" hasShadow={false} paddingSize="xs">
Expand Down Expand Up @@ -67,7 +66,7 @@ export function ConditionForm(props: {
}, [syntaxEditor, props.condition]);
return (
<EuiFlexGroup direction="column" gutterSize="xs">
<EuiFlexGroup>
<EuiFlexGroup alignItems="center" gutterSize="xs">
<EuiFlexItem grow>
<EuiText
className={css`
Expand All @@ -78,6 +77,22 @@ export function ConditionForm(props: {
{i18n.translate('xpack.streams.conditionEditor.title', { defaultMessage: 'Condition' })}
</EuiText>
</EuiFlexItem>
<EuiToolTip
content={i18n.translate('xpack.streams.conditionEditor.disableTooltip', {
defaultMessage: 'Route no documents to this stream without deleting existing data',
})}
>
<EuiButton
size={'xs' as 's'} // TODO: remove this cast when EUI is updated - EuiButton takes xs, but the type is wrong
onClick={() => props.onConditionChange(undefined)}
disabled={props.condition === undefined}
>
{i18n.translate('xpack.streams.conditionEditor.disable', {
defaultMessage: 'Disable routing',
})}
</EuiButton>
</EuiToolTip>

<EuiSwitch
label={i18n.translate('xpack.streams.conditionEditor.switch', {
defaultMessage: 'Syntax editor',
Expand All @@ -102,16 +117,15 @@ export function ConditionForm(props: {
}
}}
/>
) : !props.condition || 'operator' in props.condition ? (
<FilterForm
condition={
(props.condition as FilterCondition) || { field: '', operator: 'eq', value: '' }
}
onConditionChange={props.onConditionChange}
/>
) : (
props.condition &&
('operator' in props.condition ? (
<FilterForm
condition={props.condition as FilterCondition}
onConditionChange={props.onConditionChange}
/>
) : (
<pre>{JSON.stringify(props.condition, null, 2)}</pre>
))
<pre>{JSON.stringify(props.condition, null, 2)}</pre>
)}
</EuiFlexGroup>
);
Expand Down Expand Up @@ -213,7 +227,13 @@ function FilterForm(props: {

export function ConditionDisplay(props: { condition: Condition }) {
if (!props.condition) {
return null;
return (
<>
{i18n.translate('xpack.streams.streamDetailRouting.noCondition', {
defaultMessage: 'No condition, no documents will be routed',
})}
</>
);
}
return (
<>
Expand Down
58 changes: 20 additions & 38 deletions ...tions/observability/plugins/streams_app/public/components/stream_detail_routing/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -906,25 +906,16 @@ function RoutingStreamEntry({
})}
/>
</EuiFlexGroup>
{child.condition && (
<ConditionEditor
readonly={!edit}
condition={child.condition}
onConditionChange={(condition) => {
onChildChange({
...child,
condition,
});
}}
/>
)}
{!child.condition && (
<EuiText>
{i18n.translate('xpack.streams.streamDetailRouting.noCondition', {
defaultMessage: 'No condition, no documents will be routed',
})}
</EuiText>
)}
<ConditionEditor
readonly={!edit}
condition={child.condition}
onConditionChange={(condition) => {
onChildChange({
...child,
condition,
});
}}
/>
</EuiPanel>
);
}
Expand Down Expand Up @@ -958,25 +949,16 @@ function NewRoutingStreamEntry({
}}
/>
</EuiFormRow>
{child.condition && (
<ConditionEditor
readonly={false}
condition={child.condition}
onConditionChange={(condition) => {
onChildChange({
...child,
condition,
});
}}
/>
)}
{!child.condition && (
<EuiText>
{i18n.translate('xpack.streams.streamDetailRouting.noCondition', {
defaultMessage: 'No condition, no documents will be routed',
})}
</EuiText>
)}
<ConditionEditor
readonly={false}
condition={child.condition}
onConditionChange={(condition) => {
onChildChange({
...child,
condition,
});
}}
/>
</EuiFlexGroup>
</EuiPanel>
);
Expand Down

0 comments on commit fcdaf0b

Please sign in to comment.