Skip to content

#RI-2967 #691

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
May 24, 2022
Merged

#RI-2967 #691

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
2 changes: 1 addition & 1 deletion redisinsight/ui/src/constants/durationUnits.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const DURATION_UNITS: EuiSuperSelectOption<DurationUnits>[] = [

export const MINUS_ONE = -1
export const DEFAULT_SLOWLOG_MAX_LEN = 128
export const DEFAULT_SLOWLOG_SLOWER_THAN = 10000
export const DEFAULT_SLOWLOG_SLOWER_THAN = 10_000
export const DEFAULT_SLOWLOG_DURATION_UNIT = DurationUnits.microSeconds

export default DURATION_UNITS
22 changes: 18 additions & 4 deletions redisinsight/ui/src/pages/slowLog/components/SlowLogConfig/SlowLogConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ const SlowLogConfig = ({ closePopover, onRefresh }: Props) => {
}

const calculateSlowlogLogSlowerThan = (initSlowerThan: string) => {
if (initSlowerThan === '') {
return DEFAULT_SLOWLOG_SLOWER_THAN
}
if (initSlowerThan === `${MINUS_ONE}`) {
return MINUS_ONE
}
if (initSlowerThan === `${MINUS_ONE}`) {
return MINUS_ONE
}
Expand All @@ -81,7 +87,7 @@ const SlowLogConfig = ({ closePopover, onRefresh }: Props) => {
dispatch(patchSlowLogConfigAction(
instanceId,
{
slowlogMaxLen: +maxLen,
slowlogMaxLen: maxLen ? toNumber(maxLen) : DEFAULT_SLOWLOG_MAX_LEN,
slowlogLogSlowerThan,
},
durationUnit,
Expand All @@ -96,7 +102,7 @@ const SlowLogConfig = ({ closePopover, onRefresh }: Props) => {
closePopover()
}

const disabledApplyBtn = () => errorValidateNegativeInteger(`${slowerThan}`) || loading
const disabledApplyBtn = () => (errorValidateNegativeInteger(`${slowerThan}`) && !!slowerThan) || loading

const clusterContent = () => (
<>
Expand Down Expand Up @@ -124,6 +130,14 @@ const SlowLogConfig = ({ closePopover, onRefresh }: Props) => {
)

const unitConverter = () => {
if (Number.isNaN(toNumber(slowerThan))) {
return `- ${DurationUnits.milliSeconds}`
}

if (slowerThan === `${MINUS_ONE}`) {
return `-1 ${DurationUnits.milliSeconds}`
}

if (durationUnit === DurationUnits.microSeconds) {
const value = numberWithSpaces(convertNumberByUnits(toNumber(slowerThan), DurationUnits.milliSeconds))
return `${value} ${DurationUnits.milliSeconds}`
Expand All @@ -150,11 +164,11 @@ const SlowLogConfig = ({ closePopover, onRefresh }: Props) => {
name="slowerThan"
id="slowerThan"
className={styles.input}
placeholder={`${slowlogLogSlowerThan}`}
value={slowerThan}
onChange={(e: ChangeEvent<HTMLInputElement>) => {
setSlowerThan(validateNumber(e.target.value.trim(), Infinity, -1))
}}
placeholder={`${convertNumberByUnits(DEFAULT_SLOWLOG_SLOWER_THAN, durationUnit)}`}
autoComplete="off"
data-testid="slower-than-input"
/>
Expand Down Expand Up @@ -184,7 +198,7 @@ const SlowLogConfig = ({ closePopover, onRefresh }: Props) => {
name="maxLen"
id="maxLen"
className={styles.input}
placeholder={`${slowlogMaxLen}`}
placeholder={`${DEFAULT_SLOWLOG_MAX_LEN}`}
value={maxLen}
onChange={(e: ChangeEvent<HTMLInputElement>) => { setMaxLen(validateNumber(e.target.value.trim())) }}
autoComplete="off"
Expand Down