Skip to content

Fix/ Consents Settings popup #325

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 2 commits into from
Feb 24, 2022
Merged

Fix/ Consents Settings popup #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc69041
move ConsentsSettingsPopup to MainRoute
Feb 24, 2022
21198cb
move ConsentsSettingsPopup outside off Switch component
Feb 24, 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
10 changes: 2 additions & 8 deletions redisinsight/ui/src/components/config/Config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect } from 'react'
import { useEffect } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import { useLocation } from 'react-router-dom'

Expand All @@ -21,14 +21,12 @@ import { fetchUnsupportedCliCommandsAction } from 'uiSrc/slices/cli/cli-settings
import { fetchRedisCommandsInfo } from 'uiSrc/slices/app/redis-commands'
import { fetchContentAction as fetchCreateRedisButtonsAction } from 'uiSrc/slices/content/create-redis-buttons'
import favicon from 'uiSrc/assets/favicon.ico'
import { ConsentsSettingsPopup } from 'uiSrc/components'

const SETTINGS_PAGE_PATH = '/settings'
const Config = () => {
const serverInfo = useSelector(appServerInfoSelector)
const { config, spec } = useSelector(userSettingsSelector)
const { segmentWriteKey } = useSelector(appAnalyticsInfoSelector)
const { isShowConceptsPopup: isShowConsents } = useSelector(userSettingsSelector)

const { pathname } = useLocation()

Expand Down Expand Up @@ -73,11 +71,7 @@ const Config = () => {
}
}

return (
<>
{isShowConsents && <ConsentsSettingsPopup />}
</>
)
return null
}

export default Config
44 changes: 25 additions & 19 deletions redisinsight/ui/src/components/main-router/MainRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,39 @@ import { registerRouter } from 'uiSrc/services/routing'
import RouteWithSubRoutes from 'uiSrc/utils/routerWithSubRoutes'
import { appInfoSelector } from 'uiSrc/slices/app/info'
import { BuildType } from 'uiSrc/constants/env'
import { ConsentsSettingsPopup } from 'uiSrc/components'
import { userSettingsSelector } from 'uiSrc/slices/user/user-settings'

import RedisStackRoutes from './components/RedisStackRoutes'
import COMMON_ROUTES from './constants/commonRoutes'
import DEFAULT_ROUTES from './constants/defaultRoutes'

const MainRouter = () => {
const { server } = useSelector(appInfoSelector)
const { isShowConceptsPopup: isShowConsents } = useSelector(userSettingsSelector)
return (
<Switch>
{COMMON_ROUTES.map((route, i) => (
// eslint-disable-next-line react/no-array-index-key
<RouteWithSubRoutes key={i} {...route} />
))}
{
server?.buildType === BuildType.RedisStack
? <RedisStackRoutes databaseId={server?.fixedDatabaseId} />
: (
<>
{DEFAULT_ROUTES.map((route, i) => (
// eslint-disable-next-line react/no-array-index-key
<RouteWithSubRoutes key={i} {...route} />
))}
<Redirect to="/" />
</>
)
}
</Switch>
<>
{isShowConsents && (<ConsentsSettingsPopup />)}
<Switch>
{COMMON_ROUTES.map((route, i) => (
// eslint-disable-next-line react/no-array-index-key
<RouteWithSubRoutes key={i} {...route} />
))}
{
server?.buildType === BuildType.RedisStack
? <RedisStackRoutes databaseId={server?.fixedDatabaseId} />
: (
<>
{DEFAULT_ROUTES.map((route, i) => (
// eslint-disable-next-line react/no-array-index-key
<RouteWithSubRoutes key={i} {...route} />
))}
<Redirect to="/" />
</>
)
}
</Switch>
</>
)
}

Expand Down