mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
chore: Convert sidebarItemInjectionToken to use InjectWithMetadata instead of duplicating the IDs
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
1 parent
72a1e2aaa0
commit
81293304a7
62 files changed
+145
-212
No files matched your search
+1
-2
@@ -54,9 +54,8 @@ const extensionSidebarItemRegistratorInjectable = getInjectable({
|
||||
: extension.sanitizedExtensionId;
|
||||
|
||||
return getInjectable({
|
||||
id: `${id}-sidebar-item`,
|
||||
id: `sidebar-item-${id}`,
|
||||
instantiate: () => ({
|
||||
id,
|
||||
orderNumber: registration.orderNumber ?? 9999,
|
||||
|
||||
parentId: registration.parentId
|
||||
|
||||
@@ -8,7 +8,7 @@ import { observer } from "mobx-react";
|
||||
import React from "react";
|
||||
import siblingTabsInjectable from "../../routes/sibling-tabs.injectable";
|
||||
import { TabLayout } from "./tab-layout-2";
|
||||
import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
|
||||
import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
|
||||
import type { StrictReactNode } from "@k8slens/utilities";
|
||||
|
||||
interface SiblingTabLayoutProps {
|
||||
@@ -17,7 +17,7 @@ interface SiblingTabLayoutProps {
|
||||
}
|
||||
|
||||
interface Dependencies {
|
||||
tabs: IComputedValue<HierarchicalSidebarItem[]>;
|
||||
tabs: IComputedValue<SidebarItemDeclaration[]>;
|
||||
}
|
||||
|
||||
const NonInjectedSiblingsInTabLayout = observer(
|
||||
|
||||
@@ -12,7 +12,7 @@ import { Icon } from "../icon";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import type { SidebarStorageState } from "./sidebar-storage/sidebar-storage.injectable";
|
||||
import sidebarStorageInjectable from "./sidebar-storage/sidebar-storage.injectable";
|
||||
import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
|
||||
import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
|
||||
import type { StorageLayer } from "../../utils/storage-helper";
|
||||
|
||||
interface Dependencies {
|
||||
@@ -20,7 +20,7 @@ interface Dependencies {
|
||||
}
|
||||
|
||||
export interface SidebarItemProps {
|
||||
item: HierarchicalSidebarItem;
|
||||
item: SidebarItemDeclaration;
|
||||
}
|
||||
|
||||
const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies) => {
|
||||
@@ -56,7 +56,7 @@ const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies)
|
||||
return (
|
||||
<div
|
||||
className={styles.SidebarItem}
|
||||
data-testid={`sidebar-item-${id}`}
|
||||
data-testid={id}
|
||||
data-is-active-test={isActive}
|
||||
data-parent-id-test={item.parentId}
|
||||
>
|
||||
@@ -74,7 +74,7 @@ const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies)
|
||||
item.onClick();
|
||||
}
|
||||
}}
|
||||
data-testid={`sidebar-item-link-for-${id}`}
|
||||
data-testid={`link-for-${id}`}
|
||||
>
|
||||
{item.getIcon?.()}
|
||||
<span>{item.title}</span>
|
||||
@@ -82,7 +82,7 @@ const NonInjectedSidebarItem = observer((props: SidebarItemProps & Dependencies)
|
||||
<Icon
|
||||
className={styles.expandIcon}
|
||||
material={expanded ? "keyboard_arrow_up" : "keyboard_arrow_down"}
|
||||
data-testid={`sidebar-item-expand-icon-for-${id}`}
|
||||
data-testid={`expand-icon-for-${id}`}
|
||||
/>
|
||||
)}
|
||||
</NavLink>
|
||||
|
||||
@@ -12,13 +12,13 @@ import { SidebarItem } from "./sidebar-item";
|
||||
import type { CatalogEntityRegistry } from "../../api/catalog/entity/registry";
|
||||
import { SidebarCluster } from "./sidebar-cluster";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
|
||||
import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
|
||||
import { sidebarItemsInjectable } from "@k8slens/cluster-sidebar";
|
||||
import type { IComputedValue } from "mobx";
|
||||
import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable";
|
||||
|
||||
interface Dependencies {
|
||||
sidebarItems: IComputedValue<HierarchicalSidebarItem[]>;
|
||||
sidebarItems: IComputedValue<SidebarItemDeclaration[]>;
|
||||
entityRegistry: CatalogEntityRegistry;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,10 +11,10 @@ import type { StrictReactNode } from "@k8slens/utilities";
|
||||
import { cssNames } from "@k8slens/utilities";
|
||||
import { Tab, Tabs } from "../tabs";
|
||||
import { ErrorBoundary } from "@k8slens/error-boundary";
|
||||
import type { HierarchicalSidebarItem } from "@k8slens/cluster-sidebar";
|
||||
import type { SidebarItemDeclaration } from "@k8slens/cluster-sidebar";
|
||||
|
||||
export interface TabLayoutProps {
|
||||
tabs?: HierarchicalSidebarItem[];
|
||||
tabs?: SidebarItemDeclaration[];
|
||||
children?: StrictReactNode;
|
||||
scrollable?: boolean;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user