Skip to content

[Streams] EditIlmPhasesFlyout and EditDslStepsFlyout UI fixes #254930

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

Merged
damian-polewski merged 15 commits into from
Mar 4, 2026
Merged

[Streams] EditIlmPhasesFlyout and EditDslStepsFlyout UI fixes #254930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9b8e1e0
fix: update copy
damian-polewski Feb 25, 2026
ee8515e
fix: show help text even if error is present
damian-polewski Feb 25, 2026
82c5dee
fix: update fixed_interval help text
damian-polewski Feb 25, 2026
2a79ed5
fix: adjust unit tests for parsing decimal values
damian-polewski Feb 25, 2026
22462ec
Merge branch 'main' into streams/downsampling_flyouts_ui_fixes
damian-polewski Feb 26, 2026
77d0e35
fix: scroll element into view when switching tabs externally
damian-polewski Feb 26, 2026
bd79d60
fix: update copy 2
damian-polewski Feb 26, 2026
e76ed64
fix: remove fade effect from tabs row
damian-polewski Feb 26, 2026
02c3ad1
fix: scrollIntoView optional chaining
damian-polewski Feb 26, 2026
c6928fc
fix: adjust unit tests
damian-polewski Feb 26, 2026
4642fef
Merge branch 'main' into streams/downsampling_flyouts_ui_fixes
damian-polewski Feb 27, 2026
80cfa44
fix: address feedback
damian-polewski Feb 27, 2026
243c56f
Merge branch 'main' into streams/downsampling_flyouts_ui_fixes
damian-polewski Mar 2, 2026
97ff4d8
fix: simplify scrollIntoView logic
damian-polewski Mar 2, 2026
85d0071
Merge branch 'main' into streams/downsampling_flyouts_ui_fixes
damian-polewski Mar 4, 2026
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
12 changes: 6 additions & 6 deletions ...eam_detail_lifecycle/downsampling/edit_dsl_steps_flyout/edit_dsl_steps_flyout.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ export const Default: Story = {
data_retention: '30d',
downsample: [
{
after: '30d',
after: '5d',
fixed_interval: '1h',
},
{
after: '40d',
fixed_interval: '5d',
after: '10d',
fixed_interval: '2h',
},
],
},
Expand Down Expand Up @@ -111,10 +111,10 @@ export const StepSyncing: Story = {
const [isOpen, setIsOpen] = useState(false);
const [steps, setSteps] = useState<IngestStreamLifecycleDSL>({
dsl: {
data_retention: '30d',
data_retention: '90d',
downsample: [
{ after: '30d', fixed_interval: '1h' },
{ after: '40d', fixed_interval: '5d' },
{ after: '1h', fixed_interval: '1h' },
{ after: '2h', fixed_interval: '2h' },
],
},
});
Expand Down
6 changes: 3 additions & 3 deletions ...nt/stream_detail_lifecycle/downsampling/edit_dsl_steps_flyout/form/fields/after_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ export const AfterField = ({
return (
<EuiFormRow
label={i18n.translate('xpack.streams.editDslStepsFlyout.afterLabel', {
defaultMessage: 'Downsample after data stored',
defaultMessage: 'Downsample data after',
})}
helpText={isInvalid ? undefined : helpText}
helpText={helpText}
isInvalid={isInvalid}
error={isInvalid ? errorMessage : null}
>
Expand All @@ -206,7 +206,7 @@ export const AfterField = ({
aria-label={i18n.translate(
'xpack.streams.editDslStepsFlyout.afterAriaLabel',
{
defaultMessage: 'Downsample after value',
defaultMessage: 'Downsample data after value',
}
)}
value={currentValue}
Expand Down
40 changes: 33 additions & 7 deletions ..._detail_lifecycle/downsampling/edit_dsl_steps_flyout/form/fields/fixed_interval_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,37 @@ export const FixedIntervalField = ({
unit: currentUnit,
});

const helpText =
upperBoundMs === undefined
? i18n.translate('xpack.streams.editDslStepsFlyout.fixedIntervalHelpLowerBound', {
defaultMessage: 'Must be larger than {min} based on current configuration.',
values: { min },
})
const showMultipleOfPreviousStep = stepIndex > 0 && lowerBoundMs > 0;
const helpText = (() => {
if (upperBoundMs === undefined) {
return showMultipleOfPreviousStep
? i18n.translate(
'xpack.streams.editDslStepsFlyout.fixedIntervalHelpLowerBoundMultiple',
{
defaultMessage:
'Must be larger than {min} and a multiple of {multipleOf} based on current configuration.',
values: { min, multipleOf: min },
}
)
: i18n.translate('xpack.streams.editDslStepsFlyout.fixedIntervalHelpLowerBound', {
defaultMessage: 'Must be larger than {min} based on current configuration.',
values: { min },
});
}

return showMultipleOfPreviousStep
? i18n.translate(
'xpack.streams.editDslStepsFlyout.fixedIntervalHelpRangeMultiple',
{
defaultMessage:
'Must be larger than {min}, smaller than {max}, and a multiple of {multipleOf} based on current configuration.',
values: {
min,
max,
multipleOf: min,
},
}
)
: i18n.translate('xpack.streams.editDslStepsFlyout.fixedIntervalHelpRange', {
defaultMessage:
'Must be larger than {min} and smaller than {max} based on current configuration.',
Expand All @@ -154,13 +179,14 @@ export const FixedIntervalField = ({
max,
},
});
})();

return (
<EuiFormRow
label={i18n.translate('xpack.streams.editDslStepsFlyout.fixedIntervalLabel', {
defaultMessage: 'Downsample interval',
})}
helpText={isInvalid ? undefined : helpText}
helpText={helpText}
isInvalid={isInvalid}
error={isInvalid ? errorMessage : null}
>
Expand Down
4 changes: 2 additions & 2 deletions ...ement/stream_detail_lifecycle/downsampling/edit_dsl_steps_flyout/form/validations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ describe('streams DSL steps flyout validations', () => {
);

expect(result).toEqual({
message: 'Must be smaller than the data retention period (30d).',
message: 'Must not exceed the data retention period (30d).',
});
});

Expand All @@ -221,7 +221,7 @@ describe('streams DSL steps flyout validations', () => {
);

expect(result).toEqual({
message: 'Must be smaller than the data retention period (30d).',
message: 'Must not exceed the data retention period (30d).',
});
});

Expand Down
2 changes: 1 addition & 1 deletion ...management/stream_detail_lifecycle/downsampling/edit_dsl_steps_flyout/form/validations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export const afterSmallerThanDataRetention = ({
if (ms >= 0 && ms >= retentionMs) {
return {
message: i18n.translate('xpack.streams.editDslStepsFlyout.afterGreaterThanRetentionError', {
defaultMessage: 'Must be smaller than the data retention period ({retention}).',
defaultMessage: 'Must not exceed the data retention period ({retention}).',
values: { retention: retentionEsFormat },
}),
};
Expand Down
3 changes: 1 addition & 2 deletions ...gement/stream_detail_lifecycle/downsampling/edit_dsl_steps_flyout/sections/step_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ export const StepPanel = ({
onClick={() => onRemoveStep(stepIndex)}
>
{i18n.translate('xpack.streams.editDslStepsFlyout.removeStep', {
defaultMessage: 'Remove step {stepNumber}',
values: { stepNumber },
defaultMessage: 'Remove this step',
})}
</EuiButton>
</div>
Expand Down
64 changes: 39 additions & 25 deletions ...ent/stream_detail_lifecycle/downsampling/edit_dsl_steps_flyout/sections/step_tabs_row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import React, { useMemo } from 'react';
import React, { useMemo, useRef } from 'react';
import { i18n } from '@kbn/i18n';
import {
EuiButtonIcon,
Expand Down Expand Up @@ -42,8 +42,9 @@ export const StepTabsRow = ({
tabHasErrors,
dataTestSubj,
}: StepTabsRowProps) => {
const tabsScrollCss = useEuiOverflowScroll('x', true);
const tabsScrollCss = useEuiOverflowScroll('x');
const { tabsContainerStyles, tabsErrorSelectedUnderlineStyles } = useStyles();
const tabRefs = useRef<Array<HTMLSpanElement | null>>([]);

const tabs = useMemo(() => {
return items.map((item, index) => {
Expand All @@ -54,31 +55,44 @@ export const StepTabsRow = ({
});

return (
<EuiTab
<span
key={item.id}
onClick={() => setSelectedStepIndex(index)}
isSelected={index === selectedStepIndex}
className={hasErrors ? 'streamsDslStepsTab--hasErrors' : undefined}
data-test-subj={`${dataTestSubj}Tab-step-${index + 1}`}
prepend={
hasErrors ? (
<EuiIcon
type="warning"
color="danger"
size="m"
aria-label={i18n.translate(
'xpack.streams.editDslStepsFlyout.stepTabHasErrorsIconAriaLabel',
{
defaultMessage: 'Step {stepNumber} has errors',
values: { stepNumber: index + 1 },
}
)}
/>
) : undefined
}
ref={(node) => {
tabRefs.current[index] = node;
if (node && selectedStepIndex === index) {
node.scrollIntoView?.({
behavior: 'smooth',
block: 'nearest',
inline: 'nearest',
});
}
}}
>
{hasErrors ? <EuiTextColor color="danger">{label}</EuiTextColor> : label}
</EuiTab>
<EuiTab
onClick={() => setSelectedStepIndex(index)}
isSelected={index === selectedStepIndex}
className={hasErrors ? 'streamsDslStepsTab--hasErrors' : undefined}
data-test-subj={`${dataTestSubj}Tab-step-${index + 1}`}
prepend={
hasErrors ? (
<EuiIcon
type="warning"
color="danger"
size="m"
aria-label={i18n.translate(
'xpack.streams.editDslStepsFlyout.stepTabHasErrorsIconAriaLabel',
{
defaultMessage: 'Step {stepNumber} has errors',
values: { stepNumber: index + 1 },
}
)}
/>
) : undefined
}
>
{hasErrors ? <EuiTextColor color="danger">{label}</EuiTextColor> : label}
</EuiTab>
</span>
);
});
}, [dataTestSubj, items, selectedStepIndex, setSelectedStepIndex, tabHasErrors]);
Expand Down
31 changes: 27 additions & 4 deletions ...l_lifecycle/downsampling/edit_ilm_phases_flyout/form/fields/downsample_interval_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,36 @@ export const DownsampleIntervalField = ({
unit: currentUnit,
});

const showMultipleOfPreviousPhase = lowerBoundMs > 0;
const helpText =
upperBoundMs === undefined
? showMultipleOfPreviousPhase
? i18n.translate(
'xpack.streams.editIlmPhasesFlyout.downsamplingIntervalHelpLowerBoundMultiple',
{
defaultMessage:
'Must be larger than {min} and a multiple of {multipleOf} based on current configuration.',
values: { min, multipleOf: min },
}
)
: i18n.translate(
'xpack.streams.editIlmPhasesFlyout.downsamplingIntervalHelpLowerBound',
{
defaultMessage: 'Must be larger than {min} based on current configuration.',
values: { min },
}
)
: showMultipleOfPreviousPhase
? i18n.translate(
'xpack.streams.editIlmPhasesFlyout.downsamplingIntervalHelpLowerBound',
'xpack.streams.editIlmPhasesFlyout.downsamplingIntervalHelpRangeMultiple',
{
defaultMessage: 'Must be larger than {min} based on current configuration.',
values: { min },
defaultMessage:
'Must be larger than {min}, smaller than {max}, and a multiple of {multipleOf} based on current configuration.',
values: {
min,
max,
multipleOf: min,
},
}
)
: i18n.translate(
Expand All @@ -120,7 +143,7 @@ export const DownsampleIntervalField = ({
defaultMessage: 'Interval',
}
)}
helpText={showInvalid ? undefined : helpText}
helpText={helpText}
isInvalid={showInvalid}
error={showError}
>
Expand Down
8 changes: 4 additions & 4 deletions ...stream_detail_lifecycle/downsampling/edit_ilm_phases_flyout/form/fields/min_age_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ export const MinAgeField = ({ phaseName, dataTestSubj, timeUnitOptions }: MinAge
defaultMessage: 'Delete after data stored',
})
: i18n.translate('xpack.streams.editIlmPhasesFlyout.moveAfterLabel', {
defaultMessage: 'Move after data stored',
defaultMessage: 'Move data after',
});

const fieldAriaLabel = isDeletePhase
? i18n.translate('xpack.streams.editIlmPhasesFlyout.deleteAfterAriaLabel', {
defaultMessage: 'Delete after value',
})
: i18n.translate('xpack.streams.editIlmPhasesFlyout.moveAfterAriaLabel', {
defaultMessage: 'Move after value',
defaultMessage: 'Move data after value',
});

return (
Expand Down Expand Up @@ -131,7 +131,7 @@ export const MinAgeField = ({ phaseName, dataTestSubj, timeUnitOptions }: MinAge
return (
<EuiFormRow
label={fieldLabel}
helpText={isInvalid ? undefined : helpText}
helpText={helpText}
isInvalid={isInvalid}
error={errorMessage}
>
Expand Down Expand Up @@ -162,7 +162,7 @@ export const MinAgeField = ({ phaseName, dataTestSubj, timeUnitOptions }: MinAge
aria-label={i18n.translate(
'xpack.streams.editIlmPhasesFlyout.moveAfterUnitAriaLabel',
{
defaultMessage: 'Move after unit',
defaultMessage: 'Move data after unit',
}
)}
options={unitOptions}
Expand Down
Loading
Loading