From 57b7f954a17936f39aa9b757998b5b25e9442601 Mon Sep 17 00:00:00 2001 From: Yury Shkoda Date: Tue, 18 Apr 2023 16:16:58 +0300 Subject: [PATCH] fix(log): fixed single chunk scrolling --- .../internal/components/log/logChunk.tsx | 1 - .../internal/components/log/logComponent.tsx | 118 ++++++++---------- 2 files changed, 52 insertions(+), 67 deletions(-) diff --git a/web/src/containers/Studio/internal/components/log/logChunk.tsx b/web/src/containers/Studio/internal/components/log/logChunk.tsx index 2d15afe..37c59da 100644 --- a/web/src/containers/Studio/internal/components/log/logChunk.tsx +++ b/web/src/containers/Studio/internal/components/log/logChunk.tsx @@ -145,7 +145,6 @@ const LogChunk = (props: LogChunkProps) => {
{ } } + const hasErrorsOrWarnings = + logObject.errors?.length !== 0 || logObject.warnings?.length !== 0 + return ( <> {selectedRunTime === RunTimeType.SAS && logObject.body ? ( @@ -151,71 +154,54 @@ const LogComponent = (props: LogComponentProps) => { gap: 10 }} >
-
- } - defaultExpandIcon={} - > - {logObject.errors && logObject.errors.length !== 0 && ( - - {`Errors (${logObject.errors.length})`} - - } - > - {logObject.errors && - logObject.errors.map((error, ind) => ( - } - key={`error_${ind}`} - onClick={() => { - setLogChunksState((prevState) => { - const newState = [...prevState] - - newState[ind] = true - - return newState - }) - - goToLogLine(error, ind) - }} - /> - ))} - - )} - {logObject.warnings && logObject.warnings.length !== 0 && ( - {`Warnings (${logObject.warnings.length})`} - } - > - {logObject.warnings && - logObject.warnings.map((warning, ind) => ( - } - key={`warning_${ind}`} - onClick={() => { - setLogChunksState((prevState) => { - const newState = [...prevState] - - newState[ind] = true - - return newState - }) - - goToLogLine(warning, ind) - }} - /> - ))} - - )} - -
+ {hasErrorsOrWarnings && ( +
+ } + defaultExpandIcon={} + style={{ paddingBottom: 10 }} + > + {logObject.errors && logObject.errors.length !== 0 && ( + + {`Errors (${logObject.errors.length})`} + + } + > + {logObject.errors && + logObject.errors.map((error, ind) => ( + } + key={`error_${ind}`} + onClick={() => goToLogLine(error, ind)} + /> + ))} + + )} + {logObject.warnings && logObject.warnings.length !== 0 && ( + {`Warnings (${logObject.warnings.length})`} + } + > + {logObject.warnings && + logObject.warnings.map((warning, ind) => ( + } + key={`warning_${ind}`} + onClick={() => goToLogLine(warning, ind)} + /> + ))} + + )} + +
+ )} {Array.isArray(logChunks) ? ( @@ -227,7 +213,7 @@ const LogComponent = (props: LogComponentProps) => { key={`log-chunk-${id}`} logLineCount={logObject.linesCount} scrollToLogInstance={scrollToLogInstance} - onClick={(evt, chunkNumber) => { + onClick={(_, chunkNumber) => { setLogChunksState((prevState) => { const newState = [...prevState] const expand = !newState[chunkNumber]