Skip to content

#RI-2745 - fix showing log #563

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

Merged
merged 1 commit into from
Apr 21, 2022
Merged

#RI-2745 - fix showing log #563

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
13 changes: 4 additions & 9 deletions redisinsight/ui/src/components/monitor/Monitor/Monitor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ const Monitor = (props: Props) => {
</div>
<div className={styles.saveLogContainer}>
<EuiToolTip
title="Allows you to download the generated log file after pausing the Profiler."
title="Allows you to download the generated log file after pausing the Profiler"
content="Profiler log is saved to a file on your local machine with no size limitation.
The temporary log file will be automatically rewritten when the Profiler is reset"
The temporary log file will be automatically rewritten when the Profiler is reset."
>
<EuiSwitch
compressed
Expand Down Expand Up @@ -122,7 +122,7 @@ const Monitor = (props: Props) => {

return (
<>
<div className={styles.container} data-testid="monitor">
<div className={cx(styles.container, { [styles.isRunning]: isRunning && !isPaused })} data-testid="monitor">
{(error && !isRunning)
? (<MonitorError />)
: (
Expand Down Expand Up @@ -151,12 +151,7 @@ const Monitor = (props: Props) => {
)}
</div>
)}
{isRunning && isPaused && !isSaveToFile && (
<div data-testid="monitor-stopped" className={styles.monitorStoppedText}>
Profiler is paused.
</div>
)}
{(isStarted && isPaused && isSaveToFile) && (
{(isStarted && isPaused) && (
<MonitorLog />
)}
</div>
Expand Down
5 changes: 5 additions & 0 deletions redisinsight/ui/src/components/monitor/Monitor/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@

z-index: 10;
overflow: auto;

&.isRunning {
outline: 1px solid var(--euiColorPrimary);
border-top-color: transparent;
}
}

.listWrapper {
Expand Down
34 changes: 18 additions & 16 deletions redisinsight/ui/src/components/monitor/MonitorLog/MonitorLog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const MIDDLE_SCREEN_RESOLUTION = 460 - PADDINGS_OUTSIDE
const SMALL_SCREEN_RESOLUTION = 360 - PADDINGS_OUTSIDE

const MonitorLog = () => {
const { timestamp, logFileId } = useSelector(monitorSelector)
const { timestamp, logFileId, isSaveToFile } = useSelector(monitorSelector)
const dispatch = useDispatch()

const duration = cutDurationText(
Expand Down Expand Up @@ -74,22 +74,24 @@ const MonitorLog = () => {
responsive={false}
>
<EuiFlexItem grow={false}>
<EuiToolTip
content="Download Profiler Log"
>
<EuiButton
size="s"
color="secondary"
href={linkToDownload}
iconType="download"
className={styles.btn}
data-testid="download-log-btn"
{...downloadBtnProps}
{isSaveToFile && (
<EuiToolTip
content="Download Profiler Log"
>
{width > SMALL_SCREEN_RESOLUTION && ' Download '}
Log
</EuiButton>
</EuiToolTip>
<EuiButton
size="s"
color="secondary"
href={linkToDownload}
iconType="download"
className={styles.btn}
data-testid="download-log-btn"
{...downloadBtnProps}
>
{width > SMALL_SCREEN_RESOLUTION && ' Download '}
Log
</EuiButton>
</EuiToolTip>
)}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ const AddStandaloneForm = (props: Props) => {
<EuiCheckbox
id={`${htmlIdGenerator()()} over db`}
name="showDb"
label="Select the Redis logical database"
label="Select Logical Database"
checked={!!formik.values.showDb}
onChange={handleChangeDbIndexCheckbox}
data-testid="showDb"
Expand Down