Skip to content

#RI-2956,2954,2955 fix #675

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 3 commits into from
May 21, 2022
Merged

#RI-2956,2954,2955 fix #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04feceb
#RI-2956,2954,2955 fix
AmirAllayarovSofteq May 21, 2022
394c15c
resolve comments
AmirAllayarovSofteq May 21, 2022
cf68cf3
fix test
AmirAllayarovSofteq May 21, 2022
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
20 changes: 18 additions & 2 deletions redisinsight/ui/src/components/range-filter/RangeFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,24 @@ const RangeFilter = (props: Props) => {
<div className={styles.slider}>
<div className={styles.sliderTrack} />
<div ref={range} className={styles.sliderRange}>
<div className={styles.sliderLeftValue}>{getFormatTime(start?.toString())}</div>
<div className={styles.sliderRightValue}>{getFormatTime(end?.toString())}</div>
<div className={
cx(styles.sliderLeftValue,
{
[styles.leftPosition]: max - startVal < (max - min) / 2
})
}
>
{getFormatTime(startVal?.toString())}
</div>
<div className={
cx(styles.sliderRightValue,
{
[styles.rightPosition]: max - endVal > (max - min) / 2
})
}
>
{getFormatTime(endVal?.toString())}
</div>
</div>
</div>
</div>
Expand Down
8 changes: 8 additions & 0 deletions redisinsight/ui/src/components/range-filter/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@
margin-top: -30px;
}

.sliderLeftValue.leftPosition {
transform: translateX(-100%);
}

.sliderRightValue.rightPosition {
transform: translateX(100%);
}

.sliderRightValue {
right: -4px;
}
Expand Down
6 changes: 6 additions & 0 deletions redisinsight/ui/src/pages/browser/components/stream-details/StreamDetails/StreamDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,18 @@ const StreamDetails = (props: Props) => {
)

useEffect(() => {
if (isNull(firstEntry)) {
dispatch(updateStart(''))
}
if (start === '' && firstEntry?.id !== '') {
dispatch(updateStart(firstEntryTimeStamp.toString()))
}
}, [firstEntryTimeStamp])

useEffect(() => {
if (isNull(lastEntry)) {
dispatch(updateEnd(''))
}
if (end === '' && lastEntry?.id !== '') {
dispatch(updateEnd(lastEntryTimeStamp.toString()))
}
Expand Down
31 changes: 0 additions & 31 deletions redisinsight/ui/src/slices/tests/browser/stream.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,37 +318,6 @@ describe('stream slice', () => {
})
})

describe('removeEntriesFromList', () => {
it('should properly remove entries from list', () => {
// Arrange
const startState = {
...initialState,
data: {
...mockedData
}
}

const endState = {
...initialState,
loading: false,
data: {
...mockedData,
entries: [],
total: 0
}
}

// Act
const nextState = reducer(startState, removeEntriesFromList([mockedData.entries[0].id]))

// Assert
const rootState = Object.assign(initialStateDefault, {
browser: { stream: nextState },
})
expect(streamSelector(rootState)).toEqual(endState)
})
})

describe('updateStart', () => {
it('should properly set the state', () => {
// Arrange
Expand Down
4 changes: 2 additions & 2 deletions redisinsight/ui/src/utils/streamUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ export const getTimestampFromId = (id: string = ''): number =>
parseInt(id.split('-')[0], 10)

export const getStreamRangeStart = (start: string, firstEntryId: string) => {
if (start === '' || firstEntryId === '' || start === getTimestampFromId(firstEntryId).toString()) {
if (start === '' || !firstEntryId || start === getTimestampFromId(firstEntryId).toString()) {
return SCAN_STREAM_START_DEFAULT
}
return start
}

export const getStreamRangeEnd = (end: string, endEtryId: string) => {
if (end === '' || endEtryId === '' || end === getTimestampFromId(endEtryId).toString()) {
if (end === '' || !endEtryId || end === getTimestampFromId(endEtryId).toString()) {
return SCAN_STREAM_END_DEFAULT
}
return end
Expand Down