Skip to content

FE: UX: Fix multiple cluster menu selected #1120

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

FE: UX: Fix multiple cluster menu selected #1120

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
a5ba7aa
multiple cluster menu selected item fix
May 30, 2025
659c489
Merge branch 'main' of github.com:kafbat/kafka-ui into fix-cluster-menu
Jun 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
22 changes: 8 additions & 14 deletions frontend/src/components/Nav/ClusterMenu/ClusterMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@ import MenuTab from 'components/Nav/Menu/MenuTab';
import MenuItem from 'components/Nav/Menu/MenuItem';
import {
clusterACLPath,
clusterAclRelativePath,
clusterBrokerRelativePath,
clusterBrokerPath,
clusterBrokersPath,
clusterConnectorsPath,
clusterConnectorsRelativePath,
clusterConsumerGroupsPath,
clusterConsumerGroupsRelativePath,
clusterKsqlDbPath,
clusterKsqlDbRelativePath,
clusterSchemasPath,
clusterSchemasRelativePath,
clusterTopicsPath,
clusterTopicsRelativePath,
} from 'lib/paths';
import { useLocation } from 'react-router-dom';
import { useLocalStorage } from 'lib/hooks/useLocalStorage';
Expand Down Expand Up @@ -60,45 +54,45 @@ const ClusterMenu: FC<ClusterMenuProps> = ({
{isOpen && (
<S.List>
<MenuItem
isActive={getIsMenuItemActive(clusterBrokerRelativePath)}
isActive={getIsMenuItemActive(clusterBrokerPath(name))}
to={clusterBrokersPath(name)}
title="Brokers"
/>
<MenuItem
isActive={getIsMenuItemActive(clusterTopicsRelativePath)}
isActive={getIsMenuItemActive(clusterTopicsPath(name))}
to={clusterTopicsPath(name)}
title="Topics"
/>
<MenuItem
isActive={getIsMenuItemActive(clusterConsumerGroupsRelativePath)}
isActive={getIsMenuItemActive(clusterConsumerGroupsPath(name))}
to={clusterConsumerGroupsPath(name)}
title="Consumers"
/>
{hasFeatureConfigured(ClusterFeaturesEnum.SCHEMA_REGISTRY) && (
<MenuItem
isActive={getIsMenuItemActive(clusterSchemasRelativePath)}
isActive={getIsMenuItemActive(clusterSchemasPath(name))}
to={clusterSchemasPath(name)}
title="Schema Registry"
/>
)}
{hasFeatureConfigured(ClusterFeaturesEnum.KAFKA_CONNECT) && (
<MenuItem
isActive={getIsMenuItemActive(clusterConnectorsRelativePath)}
isActive={getIsMenuItemActive(clusterConnectorsPath(name))}
to={clusterConnectorsPath(name)}
title="Kafka Connect"
/>
)}
{hasFeatureConfigured(ClusterFeaturesEnum.KSQL_DB) && (
<MenuItem
isActive={getIsMenuItemActive(clusterKsqlDbRelativePath)}
isActive={getIsMenuItemActive(clusterKsqlDbPath(name))}
to={clusterKsqlDbPath(name)}
title="KSQL DB"
/>
)}
{(hasFeatureConfigured(ClusterFeaturesEnum.KAFKA_ACL_VIEW) ||
hasFeatureConfigured(ClusterFeaturesEnum.KAFKA_ACL_EDIT)) && (
<MenuItem
isActive={getIsMenuItemActive(clusterAclRelativePath)}
isActive={getIsMenuItemActive(clusterACLPath(name))}
to={clusterACLPath(name)}
title="ACL"
/>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Nav/Nav.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export const ClusterList = styled.ul.attrs<{ $colorKey: ClusterColorKey }>({
role: 'menu',
})`
border-radius: 8px;
padding: 4px 4px 4px 4px;
margin-bottom: -8px;
padding: 2px 4px;
margin-bottom: 2px;
background-color: ${({ theme, $colorKey }) =>
theme.clusterMenu.backgroundColor[$colorKey]};
`;
Loading