Skip to content

Fe/feature/ri 7278 and ri 7279 #4802

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
Aug 5, 2025
Merged

Fe/feature/ri 7278 and ri 7279 #4802

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
fea234c
RI-7279 - "test" element is visible on top of the db keys list
KIvanow Aug 5, 2025
f1958ac
RI-7278 - Remove the old navigation for DBs
KIvanow Aug 5, 2025
6fea960
RI-7278 - Remove the old navigation for DBs - removed unused variable…
KIvanow Aug 5, 2025
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
8 changes: 4 additions & 4 deletions redisinsight/ui/src/components/navigation-menu/NavigationMenu.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ describe('NavigationMenu', () => {
}))
render(<NavigationMenu />)

expect(screen.queryByTestId('browser-page-btn"')).not.toBeInTheDocument()
expect(screen.queryByTestId('browser-page-btn')).not.toBeInTheDocument()
})

it('should render help menu', () => {
Expand Down Expand Up @@ -137,7 +137,7 @@ describe('NavigationMenu', () => {
expect(render(<NavigationMenu />)).toBeTruthy()
})

it('should render private routes with instanceId', () => {
it('should not render private routes with instanceId', () => {
;(appInfoSelector as jest.Mock).mockImplementation(() => ({
...mockAppInfoSelector,
server: {
Expand All @@ -146,8 +146,8 @@ describe('NavigationMenu', () => {
}))
render(<NavigationMenu />)

expect(screen.getByTestId('browser-page-btn')).toBeTruthy()
expect(screen.getByTestId('workbench-page-btn')).toBeTruthy()
expect(screen.queryByTestId('browser-page-btn')).not.toBeInTheDocument()
expect(screen.queryByTestId('workbench-page-btn')).not.toBeInTheDocument()
})

it('should render public routes', () => {
Expand Down
5 changes: 0 additions & 5 deletions redisinsight/ui/src/components/navigation-menu/NavigationMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@ import styles from './styles.module.scss'

const NavigationMenu = () => {
const {
privateRoutes,
privateRdiRoutes,
isRdiWorkspace,
publicRoutes,
getAdditionPropsForHighlighting,
highlightedPages,
connectedInstanceId,
connectedRdiInstanceId,
} = useNavigation()

Expand Down Expand Up @@ -133,9 +131,6 @@ const NavigationMenu = () => {
>
<SideBarContainer>
<RedisLogo isRdiWorkspace={isRdiWorkspace} />
{connectedInstanceId &&
!isRdiWorkspace &&
privateRoutes.map(renderNavItem)}
Comment on lines -136 to -138
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this rendered elsewhere?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, I saw RI-7278, in https://www.figma.com/design/AAG5lMHFklYJcZy7kZGYTg/DS-Alignment?node-id=111-8322&t=WL4d0cKevWIMYD5M-0 however sidebar nav still exists

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That preview is wrong on many levels. It shows the RDI (for which we still have the navigation in the sidebar even in this PR), but the top left nav states Databases
image

{connectedRdiInstanceId &&
isRdiWorkspace &&
privateRdiRoutes.map(renderNavItem)}
Expand Down
2 changes: 0 additions & 2 deletions redisinsight/ui/src/pages/browser/BrowserPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import BrowserLeftPanel from './components/browser-left-panel'
import BrowserRightPanel from './components/browser-right-panel'

import styles from './styles.module.scss'
import UploadModal from '../rdi/pipeline-management/components/upload-modal/UploadModal'

const widthResponsiveSize = 1280
const widthExplorePanel = 460
Expand Down Expand Up @@ -336,7 +335,6 @@ const BrowserPage = () => {
borderRadius: `8px`,
}}
>
<UploadModal >{<div>test</div>}</UploadModal>
<BrowserLeftPanel
selectedKey={selectedKey}
selectKey={selectKey}
Expand Down
Loading