Skip to content

Commit d4768b9

Browse files
authored
Merge pull request #760 from RedisInsight/feature/RI-3031_sub/unsub
#RI-3031 - subscribe/unsubscribe for Pub/Sub
2 parents 81ac816 + 2f23f93 commit d4768b9

File tree

24 files changed

+581
-26
lines changed

24 files changed

+581
-26
lines changed

redisinsight/ui/src/App.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import { Provider, useSelector } from 'react-redux'
44
import { EuiPage, EuiPageBody } from '@elastic/eui'
55

66
import { appInfoSelector } from 'uiSrc/slices/app/info'
7-
import { BuildType } from 'uiSrc/constants/env'
87
import { PagePlaceholder } from 'uiSrc/components'
98
import Router from './Router'
109
import store from './slices/store'
1110
import { Theme } from './constants'
1211
import { themeService } from './services'
13-
import { Config, MonitorConfig, NavigationMenu, Notifications, ShortcutsFlyout } from './components'
12+
import { Config, GlobalSubscriptions, NavigationMenu, Notifications, ShortcutsFlyout } from './components'
1413
import { ThemeProvider } from './contexts/themeContext'
1514
import MainComponent from './components/main/MainComponent'
1615

@@ -33,15 +32,15 @@ const AppWrapper = ({ children }: { children?: ReactElement }) => (
3332
</Provider>
3433
)
3534
const App = () => {
36-
const { loading: serverLoading, server } = useSelector(appInfoSelector)
35+
const { loading: serverLoading } = useSelector(appInfoSelector)
3736
return (
3837
<div className="main-container">
3938
{ serverLoading
4039
? <PagePlaceholder />
4140
: (
4241
<EuiPage className="main">
43-
<MonitorConfig />
44-
<NavigationMenu buildType={server?.buildType as BuildType} />
42+
<GlobalSubscriptions />
43+
<NavigationMenu />
4544
<EuiPageBody component="main">
4645
<MainComponent />
4746
</EuiPageBody>
Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 9 additions & 0 deletions
Loading
Lines changed: 9 additions & 0 deletions
Loading
Lines changed: 11 additions & 0 deletions
Loading
Lines changed: 11 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import React from 'react'
2+
import { MonitorConfig, PubSubConfig } from 'uiSrc/components'
3+
4+
const GlobalSubscriptions = () => (
5+
<>
6+
<MonitorConfig />
7+
<PubSubConfig />
8+
</>
9+
)
10+
11+
export default GlobalSubscriptions
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import GlobalSubscriptions from './GlobalSubscriptions'
2+
3+
export default GlobalSubscriptions

0 commit comments

Comments
 (0)