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

[8.x] Add rowgroup, row and cell attributes to log stream components (#192841) #194189

Merged
merged 1 commit into from
Sep 26, 2024
+41 −24
Merged

[8.x] Add rowgroup, row and cell attributes to log stream components (#192841) #194189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 35 additions & 21 deletions ...lity_solution/logs_shared/public/components/logging/log_text_stream/loading_item_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,28 @@ export class LogTextStreamLoadingItemView extends React.PureComponent<
onStreamStart,
} = this.props;

const shouldShowCta = !hasMore && !isStreaming;
const shouldShowCta = !hasMore && !isStreaming && !isLoading;

const extra = (
<LoadingItemViewExtra justifyContent="center" alignItems="center" gutterSize="m">
{isLoading || isStreaming ? (
<LoadingItemViewExtra
justifyContent="center"
alignItems="center"
gutterSize="m"
{...(shouldShowCta ? { role: 'row' } : {})}
>
{(isLoading || isStreaming) && (
<ProgressSpinner kind={isStreaming ? 'streaming' : 'loading'} />
) : shouldShowCta ? (
)}

{shouldShowCta && (
<ProgressCta
position={position}
onStreamStart={onStreamStart}
onExtendRange={onExtendRange}
startDateExpression={startDateExpression}
endDateExpression={endDateExpression}
/>
) : null}
)}
</LoadingItemViewExtra>
);

Expand Down Expand Up @@ -181,9 +188,15 @@ const ProgressCta: React.FC<ProgressCtaProps> = ({

if (rangeEdge === 'now' && position === 'end') {
return (
<EuiButton data-test-subj="infraProgressCtaStreamLiveButton" onClick={onStreamStart} size="s">
<FormattedMessage id="xpack.logsShared.logs.streamLive" defaultMessage="Stream live" />
</EuiButton>
<div role="cell">
<EuiButton
data-test-subj="infraProgressCtaStreamLiveButton"
onClick={onStreamStart}
size="s"
>
<FormattedMessage id="xpack.logsShared.logs.streamLive" defaultMessage="Stream live" />
</EuiButton>
</div>
);
}

Expand All @@ -197,19 +210,20 @@ const ProgressCta: React.FC<ProgressCtaProps> = ({
}

return (
<EuiButton
data-test-subj="infraProgressCtaButton"
onClick={() => {
if (typeof onExtendRange === 'function') {
onExtendRange(extendedRange.value);
}
}}
iconType={iconType}
size="s"
role="cell"
>
<ProgressExtendMessage amount={extendedRange.diffAmount} unit={extendedRange.diffUnit} />
</EuiButton>
<div role="cell">
<EuiButton
data-test-subj="infraProgressCtaButton"
onClick={() => {
if (typeof onExtendRange === 'function') {
onExtendRange(extendedRange.value);
}
}}
iconType={iconType}
size="s"
>
<ProgressExtendMessage amount={extendedRange.diffAmount} unit={extendedRange.diffUnit} />
</EuiButton>
</div>
);
};

Expand Down
8 changes: 5 additions & 3 deletions ...ity_solution/logs_shared/public/components/logging/log_text_stream/log_text_separator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
*/
export const LogTextSeparator: FC<PropsWithChildren<unknown>> = ({ children }) => {
return (
<EuiFlexGroup alignItems="center" gutterSize="s">
<EuiFlexItem grow={false}>{children}</EuiFlexItem>
<EuiFlexItem>
<EuiFlexGroup alignItems="center" gutterSize="s" role="row">
<EuiFlexItem grow={false} role="cell">
{children}
</EuiFlexItem>
<EuiFlexItem role="cell">
<EuiHorizontalRule aria-hidden="true" />
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
1 change: 1 addition & 0 deletions ..._solution/logs_shared/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ export class VerticalScrollPanel<Child> extends React.PureComponent<
ref={this.scrollRef}
tabIndex={0}
className="eui-scrollBar"
role="rowgroup"
>
{typeof children === 'function' ? children(this.registerChild) : null}
</ScrollPanelWrapper>
Expand Down