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

[Logs UI] Set streamLive false in URL state when arriving from link-to #56329

Merged
merged 12 commits into from
Feb 7, 2020
Merged

[Logs UI] Set streamLive false in URL state when arriving from link-to #56329

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8a3fcb
[Logs UI] Remove streamLive false from URL state
Zacqary Jan 29, 2020
9abff9a
Merge branch 'master' into 55652-url-fix
elasticmachine Jan 29, 2020
3b4f32f
Force false livestream boolean from link-to
Zacqary Jan 30, 2020
5139b58
Merge branch '55652-url-fix' of github.com:Zacqary/kibana into 55652-…
Zacqary Jan 30, 2020
b4d8112
Update type def
Zacqary Jan 30, 2020
515488f
Update snapshots
Zacqary Jan 31, 2020
19c51b0
Fix snapshot typo
Zacqary Jan 31, 2020
f80615e
Fix snapshot again
Zacqary Jan 31, 2020
ec16be6
Fix node test snapshot
Zacqary Feb 3, 2020
2f06bd5
Merge remote-tracking branch 'upstream/master' into 55652-url-fix
Zacqary Feb 3, 2020
58b087d
Merge remote-tracking branch 'upstream/master' into 55652-url-fix
Zacqary Feb 6, 2020
c2b597d
Merge branch 'master' into 55652-url-fix
elasticmachine Feb 6, 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
16 changes: 6 additions & 10 deletions .../legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@ export const WithLogPositionUrlState = () => {
startLiveStreaming,
stopLiveStreaming,
} = useContext(LogPositionState.Context);
const urlState = useMemo(
() => ({
position: visibleMidpoint ? pickTimeKey(visibleMidpoint) : null,
streamLive: isAutoReloading,
}),
[visibleMidpoint, isAutoReloading]
);
const urlState = useMemo(() => {
const position = visibleMidpoint ? pickTimeKey(visibleMidpoint) : null;
if (isAutoReloading) return { position, streamLive: true };
return { position };
}, [visibleMidpoint, isAutoReloading]);
return (
<UrlStateContainer
urlState={urlState}
Expand Down Expand Up @@ -72,7 +70,7 @@ const mapToUrlState = (value: any): LogPositionUrlState | undefined =>
value
? {
position: mapToPositionUrlState(value.position),
streamLive: mapToStreamLiveUrlState(value.streamLive),
...(value.streamLive ? { streamLive: true } : {}),
}
: undefined;

Expand All @@ -81,8 +79,6 @@ const mapToPositionUrlState = (value: any) =>
? pickTimeKey(value)
: undefined;

const mapToStreamLiveUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined);

export const replaceLogPositionInQueryString = (time: number) =>
Number.isNaN(time)
? (value: string) => value
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/infra/link_to.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
state: undefined,
};
const expectedSearchString =
"logFilter=(expression:'trace.id:433b4651687e18be2c6c8e3b11f53d09',kind:kuery)&logPosition=(position:(tiebreaker:0,time:1565707203194),streamLive:!f)&sourceId=default";
"logFilter=(expression:'trace.id:433b4651687e18be2c6c8e3b11f53d09',kind:kuery)&logPosition=(position:(tiebreaker:0,time:1565707203194))&sourceId=default";
const expectedRedirectPath = '/logs/stream?';

await pageObjects.common.navigateToActualUrl(
Expand Down