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

[7.x] [Logs UI] Fix Check for New Data button on empty indices screen (#56239) #56320

Merged
merged 2 commits into from
Jan 30, 2020
Merged

[7.x] [Logs UI] Fix Check for New Data button on empty indices screen (#56239) #56320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5a7ce6
[Logs UI] Fix Check for New Data button on empty indices screen (#56239)
Zacqary Jan 29, 2020
5da24de
Merge branch '7.x' into backport/7.x/pr-56239
elasticmachine Jan 30, 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
7 changes: 4 additions & 3 deletions ...ugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ interface ScrollableLogTextStreamViewProps {
fromScroll: boolean;
}) => any;
loadNewerItems: () => void;
reloadItems: () => void;
setFlyoutItem: (id: string) => void;
setFlyoutVisibility: (visible: boolean) => void;
highlightedItem: string | null;
Expand Down Expand Up @@ -269,10 +270,10 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
};

private handleReload = () => {
const { jumpToTarget, target } = this.props;
const { reloadItems } = this.props;

if (target) {
jumpToTarget(target);
if (reloadItems) {
reloadItems();
}
};

Expand Down
7 changes: 4 additions & 3 deletions x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export type LogEntriesStateParams = {

export interface LogEntriesCallbacks {
fetchNewerEntries: () => Promise<TimeKey | null | undefined>;
checkForNewEntries: () => Promise<void>;
}
export const logEntriesInitialCallbacks = {
fetchNewerEntries: async () => {},
Expand Down Expand Up @@ -231,16 +232,16 @@ const useFetchEntriesEffect = (
useEffect(fetchMoreEntriesEffect, fetchMoreEntriesEffectDependencies);
useEffect(streamEntriesEffect, streamEntriesEffectDependencies);

return { fetchNewerEntries };
return { fetchNewerEntries, checkForNewEntries: runFetchNewEntriesRequest };
};

export const useLogEntriesState: (
props: LogEntriesProps
) => [LogEntriesStateParams, LogEntriesCallbacks] = props => {
const [state, dispatch] = useReducer(logEntriesStateReducer, logEntriesInitialState);

const { fetchNewerEntries } = useFetchEntriesEffect(state, dispatch, props);
const callbacks = { fetchNewerEntries };
const { fetchNewerEntries, checkForNewEntries } = useFetchEntriesEffect(state, dispatch, props);
const callbacks = { fetchNewerEntries, checkForNewEntries };

return [state, callbacks];
};
Expand Down
2 changes: 2 additions & 0 deletions x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
items,
lastLoadedTime,
fetchNewerEntries,
checkForNewEntries,
}) => (
<ScrollableLogTextStreamView
columnConfigurations={(source && source.configuration.logColumns) || []}
Expand All @@ -94,6 +95,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
jumpToTarget={jumpToTargetPosition}
lastLoadedTime={lastLoadedTime}
loadNewerItems={fetchNewerEntries}
reloadItems={checkForNewEntries}
reportVisibleInterval={reportVisiblePositions}
scale={textScale}
target={targetPosition}
Expand Down