Skip to content
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

frontend: Refactor prepareSidebarItems into a hook #2717

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+465 −365
Open

frontend: Refactor prepareSidebarItems into a hook #2717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions frontend/src/components/Sidebar/NavigationTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getCluster, getClusterPrefixedPath } from '../../lib/util';
import { useTypedSelector } from '../../redux/reducers/reducers';
import Tabs from '../common/Tabs';
import { SidebarItemProps } from '../Sidebar';
import prepareRoutes from './prepareRoutes';
import { useSidebarItems } from './useSidebarItems';

function searchNameInSubList(sublist: SidebarItemProps['subList'], name: string): boolean {
if (!sublist) {
Expand Down Expand Up @@ -54,7 +54,7 @@ export default function NavigationTabs() {
}

let defaultIndex = null;
const listItems = prepareRoutes(t, sidebar.selected.sidebar || '');
const listItems = useSidebarItems(sidebar.selected.sidebar ?? undefined);
let navigationItem = listItems.find(item => item.name === sidebar.selected.item);
if (!navigationItem) {
const parent = findParentOfSubList(listItems, sidebar.selected.item);
Expand Down
23 changes: 3 additions & 20 deletions frontend/src/components/Sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';
import { useHistory } from 'react-router-dom';
import helpers from '../../helpers';
import { useCluster } from '../../lib/k8s';
import { createRouteURL } from '../../lib/router';
import { useTypedSelector } from '../../redux/reducers/reducers';
import { ActionButton } from '../common';
import CreateButton from '../common/Resource/CreateButton';
import NavigationTabs from './NavigationTabs';
import prepareRoutes from './prepareRoutes';
import SidebarItem, { SidebarItemProps } from './SidebarItem';
import { DefaultSidebars, setSidebarSelected, setWhetherSidebarOpen } from './sidebarSlice';
import { useSidebarItems } from './useSidebarItems';
import VersionButton from './VersionButton';

export const drawerWidth = 240;
Expand Down Expand Up @@ -177,8 +176,6 @@ function updateItemSelected(
}

export default function Sidebar() {
const { t, i18n } = useTranslation(['glossary', 'translation']);

const sidebar = useTypedSelector(state => state.sidebar);
const {
isOpen,
Expand All @@ -188,24 +185,10 @@ export default function Sidebar() {
isTemporary: isTemporaryDrawer,
} = useSidebarInfo();
const isNarrowOnly = isNarrow && !canExpand;
const arePluginsLoaded = useTypedSelector(state => state.plugins.loaded);
const namespaces = useTypedSelector(state => state.filter.namespaces);
const dispatch = useDispatch();
const cluster = useCluster();
const items = React.useMemo(() => {
// If the sidebar is null, then it means it should not be visible.
if (sidebar.selected.sidebar === null) {
return [];
}
return prepareRoutes(t, sidebar.selected.sidebar || '');
}, [
cluster,
sidebar.selected.sidebar,
sidebar.entries,
sidebar.filters,
i18n.language,
arePluginsLoaded,
]);

const items = useSidebarItems(sidebar?.selected?.sidebar ?? undefined);

const search = namespaces.size !== 0 ? `?namespace=${[...namespaces].join('+')}` : '';

Expand Down
Loading
Loading