Skip to content

Commit 9e244df

Browse files
committed
#RI-3366 - fix tests
1 parent fce6c5c commit 9e244df

File tree

5 files changed

+25
-18
lines changed

5 files changed

+25
-18
lines changed

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/main-router/constants/defaultRoutes.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,12 @@ import {
1010
RedisClusterDatabasesPage,
1111
} from 'uiSrc/pages'
1212
import WorkbenchPage from 'uiSrc/pages/workbench'
13-
import SlowLogPage from 'uiSrc/pages/slowLog'
1413
import PubSubPage from 'uiSrc/pages/pubSub'
15-
import ClusterDetailsPage from 'uiSrc/pages/clusterDetails'
1614
import AnalyticsPage from 'uiSrc/pages/analytics'
15+
import { ANALYTICS_ROUTES } from './sub-routes'
1716

1817
import COMMON_ROUTES from './commonRoutes'
1918

20-
export const ANALYTICS_ROUTES: IRoute[] = [
21-
{
22-
pageName: PageNames.slowLog,
23-
path: Pages.slowLog(':instanceId'),
24-
component: SlowLogPage,
25-
},
26-
{
27-
pageName: PageNames.clusterDetails,
28-
path: Pages.clusterDetails(':instanceId'),
29-
component: ClusterDetailsPage,
30-
},
31-
]
32-
3319
const INSTANCE_ROUTES: IRoute[] = [
3420
{
3521
pageName: PageNames.browser,
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { IRoute, PageNames, Pages } from 'uiSrc/constants'
2+
import ClusterDetailsPage from 'uiSrc/pages/clusterDetails'
3+
import SlowLogPage from 'uiSrc/pages/slowLog'
4+
5+
export const ANALYTICS_ROUTES: IRoute[] = [
6+
{
7+
pageName: PageNames.slowLog,
8+
path: Pages.slowLog(':instanceId'),
9+
component: SlowLogPage,
10+
},
11+
{
12+
pageName: PageNames.clusterDetails,
13+
path: Pages.clusterDetails(':instanceId'),
14+
component: ClusterDetailsPage,
15+
},
16+
]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { ANALYTICS_ROUTES } from './analyticsRoutes'
2+
3+
export {
4+
ANALYTICS_ROUTES
5+
}

redisinsight/ui/src/components/navigation-menu/NavigationMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
EuiTitle,
1818
EuiToolTip
1919
} from '@elastic/eui'
20+
import { ANALYTICS_ROUTES } from 'uiSrc/components/main-router/constants/sub-routes'
2021

2122
import { PageNames, Pages } from 'uiSrc/constants'
2223
import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
@@ -46,7 +47,6 @@ import { ConnectionType } from 'uiSrc/slices/interfaces'
4647

4748
import NotificationMenu from './components/notifications-center'
4849

49-
import { ANALYTICS_ROUTES } from '../main-router/constants/defaultRoutes'
5050
import styles from './styles.module.scss'
5151

5252
const workbenchPath = `/${PageNames.workbench}`

0 commit comments

Comments
 (0)