Skip to content

Commit d919851

Browse files
authored
Merge pull request #1108 from RedisInsight/fe/feature/RI-3366_cluster-nodes-table
#RI-3366 - add primary node statistics table
2 parents dc271a3 + 9e244df commit d919851

File tree

25 files changed

+759
-42
lines changed

25 files changed

+759
-42
lines changed
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 20 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading

redisinsight/ui/src/components/action-bar/styles.module.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
.euiPopoverTitle {
33
text-transform: none !important;
44
}
5-
6-
.euiButton {
7-
min-width: 93px !important;
8-
9-
&:focus {
10-
text-decoration: none !important;
11-
}
12-
}
135
}
146

157
.container {

redisinsight/ui/src/components/analytics-tabs/AnalyticsTabs.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('StreamTabs', () => {
2727
})
2828

2929
expect(pushMock).toHaveBeenCalledTimes(1)
30-
expect(pushMock).toHaveBeenCalledWith('/instanceId/cluster-details')
30+
expect(pushMock).toHaveBeenCalledWith('/instanceId/analytics/cluster-details')
3131
})
3232
it('click on SlowLog tab should call History push with /slowlog path ', async () => {
3333
const pushMock = jest.fn()
@@ -40,6 +40,6 @@ describe('StreamTabs', () => {
4040
})
4141

4242
expect(pushMock).toHaveBeenCalledTimes(1)
43-
expect(pushMock).toHaveBeenCalledWith('/instanceId/slowlog')
43+
expect(pushMock).toHaveBeenCalledWith('/instanceId/analytics/slowlog')
4444
})
4545
})

redisinsight/ui/src/components/database-overview/components/icons.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,37 @@
11
import KeyDarkIcon from 'uiSrc/assets/img/overview/key_dark.svg'
22
import KeyTipIcon from 'uiSrc/assets/img/overview/key_tip.svg'
33
import KeyLightIcon from 'uiSrc/assets/img/overview/key_light.svg'
4+
import { ReactComponent as KeyIconSvg } from 'uiSrc/assets/img/overview/key.svg'
5+
46
import MemoryDarkIcon from 'uiSrc/assets/img/overview/memory_dark.svg'
57
import MemoryLightIcon from 'uiSrc/assets/img/overview/memory_light.svg'
68
import MemoryTipIcon from 'uiSrc/assets/img/overview/memory_tip.svg'
9+
import { ReactComponent as MemoryIconSvg } from 'uiSrc/assets/img/overview/memory.svg'
10+
711
import MeasureLightIcon from 'uiSrc/assets/img/overview/measure_light.svg'
812
import MeasureDarkIcon from 'uiSrc/assets/img/overview/measure_dark.svg'
913
import MeasureTipIcon from 'uiSrc/assets/img/overview/measure_tip.svg'
14+
import { ReactComponent as MeasureIconSvg } from 'uiSrc/assets/img/overview/measure.svg'
15+
1016
import TimeLightIcon from 'uiSrc/assets/img/overview/time_light.svg'
1117
import TimeDarkIcon from 'uiSrc/assets/img/overview/time_dark.svg'
1218
import TimeTipIcon from 'uiSrc/assets/img/overview/time_tip.svg'
19+
import { ReactComponent as TimeIconSvg } from 'uiSrc/assets/img/overview/time.svg'
20+
1321
import UserDarkIcon from 'uiSrc/assets/img/overview/user_dark.svg'
1422
import UserLightIcon from 'uiSrc/assets/img/overview/user_light.svg'
1523
import UserTipIcon from 'uiSrc/assets/img/overview/user_tip.svg'
24+
import { ReactComponent as UserIconSvg } from 'uiSrc/assets/img/overview/user.svg'
25+
1626
import InputTipIcon from 'uiSrc/assets/img/overview/input_tip.svg'
1727
import InputLightIcon from 'uiSrc/assets/img/overview/input_light.svg'
1828
import InputDarkIcon from 'uiSrc/assets/img/overview/input_dark.svg'
29+
import { ReactComponent as InputIconSvg } from 'uiSrc/assets/img/overview/input.svg'
30+
1931
import OutputTipIcon from 'uiSrc/assets/img/overview/output_tip.svg'
2032
import OutputLightIcon from 'uiSrc/assets/img/overview/output_light.svg'
2133
import OutputDarkIcon from 'uiSrc/assets/img/overview/output_dark.svg'
34+
import { ReactComponent as OutputIconSvg } from 'uiSrc/assets/img/overview/output.svg'
2235

2336
export {
2437
KeyDarkIcon,
@@ -42,4 +55,11 @@ export {
4255
OutputTipIcon,
4356
OutputLightIcon,
4457
OutputDarkIcon,
58+
KeyIconSvg,
59+
MemoryIconSvg,
60+
MeasureIconSvg,
61+
TimeIconSvg,
62+
UserIconSvg,
63+
InputIconSvg,
64+
OutputIconSvg,
4565
}

0 commit comments

Comments
 (0)