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

Jump to bottom

Bug 1915898: Drop "undefined" and keep empty lines in Pipeline log output #7828

Merged
merged 1 commit into from
Jan 22, 2021
Merged

Bug 1915898: Drop "undefined" and keep empty lines in Pipeline log output #7828

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/packages/pipelines-plugin/src/components/pipelineruns/logs/Logs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@

&__content {
padding-left: var(--pf-global--spacer--md);
white-space: pre;
}
}
35 changes: 14 additions & 21 deletions frontend/packages/pipelines-plugin/src/components/pipelineruns/logs/Logs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,33 +29,22 @@ const Logs: React.FC<LogsProps> = ({
const { name } = container;
const { kind, metadata = {} } = resource;
const { name: resName, namespace: resNamespace } = metadata;
const scrollToRef = React.useRef<HTMLDivElement>(null);
const contentRef = React.useRef<HTMLDivElement>(null);
const [error, setError] = React.useState<boolean>(false);
const resourceStatusRef = React.useRef<string>(resourceStatus);
const onCompleteRef = React.useRef<(name) => void>();
onCompleteRef.current = onComplete;

const appendMessage = React.useRef<(blockContent) => void>();
const prevFetchNewline = React.useRef(true);

appendMessage.current = React.useCallback(
(blockContent: string) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logically, this method should be cleaned up more. Your two if-statements share the same logical check.

const contentLines = blockContent.split('\n').filter((line) => !!line);
if (!prevFetchNewline.current && contentRef.current.lastChild) {
contentRef.current.lastChild.textContent += contentLines.shift();
if (contentRef.current && blockContent) {
contentRef.current.innerText += blockContent;
}
prevFetchNewline.current = blockContent.endsWith('\n');
if (contentRef.current && contentLines.length >= 0) {
const elements = contentLines.map((content) => {
const customElement = document.createElement('div');
customElement.textContent = content;
return customElement;
});
elements.forEach((element) => {
contentRef.current.append(element);
});
const lastElement = elements[elements.length - 1];
if (render && lastElement && autoScroll) {
lastElement.scrollIntoView({ behavior: 'smooth', block: 'end' });
}
if (scrollToRef.current && blockContent && render && autoScroll) {
scrollToRef.current.scrollIntoView({ behavior: 'smooth' });
}
},
[autoScroll, render],
Expand Down Expand Up @@ -118,10 +107,11 @@ const Logs: React.FC<LogsProps> = ({
}, [kind, name, resName, resNamespace]);

React.useEffect(() => {
if (contentRef.current && render && autoScroll) {
contentRef.current.scrollIntoView({ behavior: 'smooth', block: 'end' });
if (scrollToRef.current && render && autoScroll) {
scrollToRef.current.scrollIntoView({ behavior: 'smooth' });
}
}, [autoScroll, render]);

return (
<div className="odc-logs" style={{ display: render ? '' : 'none' }}>
<p className="odc-logs__name">{name}</p>
Expand All @@ -132,7 +122,10 @@ const Logs: React.FC<LogsProps> = ({
title={t('pipelines-plugin~An error occurred while retrieving the requested logs.')}
/>
)}
<div className="odc-logs__content" ref={contentRef} />
<div>
<div className="odc-logs__content" ref={contentRef} />
<div ref={scrollToRef} />
</div>
</div>
);
};
Expand Down