mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Remove BaseStore<T> and replace with composition of dependencies (#7002)
* Rename ExtensionStore -> BaseExtensionStore - The name was too close to ExtensionsStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move ExtensionsStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move ClusterStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move UserStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Cleanup types to remove multiple cast locations Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move HotbarStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move WeblinkStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move FileSystemProvisionerStore to new format Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Clean up impl and rename to better describe intent Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix remaining type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the enabled extensions storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the clusters storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the hotbar storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the weblinks storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fully split apart the user preferences storage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix crashing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests and snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix integration test failures Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve typing to prevent errors in the future. Signed-off-by: Sebastian Malton <sebastian@malton.name> * Cleanup @k8slens/messaging and friends - To fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint issue Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix global override not being complete enough causing tests to fail Signed-off-by: Sebastian Malton <sebastian@malton.name> * Bump memory for unit tests on CI Signed-off-by: Sebastian Malton <sebastian@malton.name> * Attempt to fix memory issue on CI again Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixup test because of new injectables Signed-off-by: Sebastian Malton <sebastian@malton.name> * Upgrade Jest Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix unit tests falling over Signed-off-by: Sebastian Malton <sebastian@malton.name> * Back out jest config change Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove console log Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshot Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests by matching equality instead of snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests by forcing specific snapshot style - Ubuntu CI seems to format arrays in snapshots differently than macOS locally Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
1 parent
ba4a283af9
commit
49f0a1af9c
365 files changed
+6733
-3972
No files matched your search
+36
@@ -0,0 +1,36 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`<SidebarCluster/> renders w/o errors 1`] = `
|
||||
<div>
|
||||
<div
|
||||
class="SidebarCluster"
|
||||
data-testid="sidebar-cluster-dropdown"
|
||||
id="cluster-test-uid"
|
||||
role="menubar"
|
||||
tabindex="0"
|
||||
>
|
||||
<div
|
||||
class="Avatar rounded avatar"
|
||||
style="width: 40px; height: 40px; background: rgb(96, 130, 10);"
|
||||
>
|
||||
tc
|
||||
</div>
|
||||
<div
|
||||
class="clusterName"
|
||||
id="tooltip-cluster-test-uid"
|
||||
>
|
||||
test-cluster
|
||||
</div>
|
||||
<i
|
||||
class="Icon dropdown material focusable"
|
||||
>
|
||||
<span
|
||||
class="icon"
|
||||
data-icon-name="arrow_drop_down"
|
||||
>
|
||||
arrow_drop_down
|
||||
</span>
|
||||
</i>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
@@ -5,56 +5,47 @@
|
||||
|
||||
import React from "react";
|
||||
import "@testing-library/jest-dom/extend-expect";
|
||||
import type { RenderResult } from "@testing-library/react";
|
||||
import { fireEvent } from "@testing-library/react";
|
||||
import { SidebarCluster } from "../sidebar-cluster";
|
||||
import { KubernetesCluster } from "../../../../common/catalog-entities";
|
||||
import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
|
||||
import type { DiRender } from "../../test-utils/renderFor";
|
||||
import { renderFor } from "../../test-utils/renderFor";
|
||||
import hotbarStoreInjectable from "../../../../common/hotbars/store.injectable";
|
||||
import type { HotbarStore } from "../../../../common/hotbars/store";
|
||||
|
||||
const clusterEntity = new KubernetesCluster({
|
||||
metadata: {
|
||||
uid: "test-uid",
|
||||
name: "test-cluster",
|
||||
source: "local",
|
||||
labels: {},
|
||||
},
|
||||
spec: {
|
||||
kubeconfigPath: "",
|
||||
kubeconfigContext: "",
|
||||
},
|
||||
status: {
|
||||
phase: "connected",
|
||||
},
|
||||
});
|
||||
|
||||
describe("<SidebarCluster/>", () => {
|
||||
let render: DiRender;
|
||||
let result: RenderResult;
|
||||
|
||||
beforeEach(() => {
|
||||
const di = getDiForUnitTesting();
|
||||
const render = renderFor(di);
|
||||
|
||||
di.override(hotbarStoreInjectable, () => ({
|
||||
isAddedToActive: () => {},
|
||||
}) as unknown as HotbarStore);
|
||||
const clusterEntity = new KubernetesCluster({
|
||||
metadata: {
|
||||
uid: "test-uid",
|
||||
name: "test-cluster",
|
||||
source: "local",
|
||||
labels: {},
|
||||
},
|
||||
spec: {
|
||||
kubeconfigPath: "",
|
||||
kubeconfigContext: "",
|
||||
},
|
||||
status: {
|
||||
phase: "connected",
|
||||
},
|
||||
});
|
||||
|
||||
render = renderFor(di);
|
||||
result = render(<SidebarCluster clusterEntity={clusterEntity}/>);
|
||||
});
|
||||
|
||||
it("renders w/o errors", () => {
|
||||
const { container } = render(<SidebarCluster clusterEntity={clusterEntity}/>);
|
||||
|
||||
expect(container).toBeInstanceOf(HTMLElement);
|
||||
expect(result.container).toMatchSnapshot();
|
||||
});
|
||||
|
||||
it("renders cluster avatar and name", () => {
|
||||
const { getByText, getAllByText } = render(<SidebarCluster clusterEntity={clusterEntity}/>);
|
||||
expect(result.getByText("tc")).toBeInTheDocument();
|
||||
|
||||
expect(getByText("tc")).toBeInTheDocument();
|
||||
|
||||
const v = getAllByText("test-cluster");
|
||||
const v = result.getAllByText("test-cluster");
|
||||
|
||||
expect(v.length).toBeGreaterThan(0);
|
||||
|
||||
@@ -64,11 +55,8 @@ describe("<SidebarCluster/>", () => {
|
||||
});
|
||||
|
||||
it("renders cluster menu", () => {
|
||||
const { getByTestId, getByText } = render(<SidebarCluster clusterEntity={clusterEntity}/>);
|
||||
const link = getByTestId("sidebar-cluster-dropdown");
|
||||
|
||||
fireEvent.click(link);
|
||||
expect(getByText("Add to Hotbar")).toBeInTheDocument();
|
||||
fireEvent.click(result.getByTestId("sidebar-cluster-dropdown"));
|
||||
expect(result.getByText("Add to Hotbar")).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -14,8 +14,6 @@ import { Icon } from "../icon";
|
||||
import { Menu, MenuItem } from "../menu";
|
||||
import { Tooltip } from "../tooltip";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import hotbarStoreInjectable from "../../../common/hotbars/store.injectable";
|
||||
import type { HotbarStore } from "../../../common/hotbars/store";
|
||||
import { observer } from "mobx-react";
|
||||
import type { VisitEntityContextMenu } from "../../../common/catalog/visit-entity-context-menu.injectable";
|
||||
import visitEntityContextMenuInjectable from "../../../common/catalog/visit-entity-context-menu.injectable";
|
||||
@@ -23,6 +21,8 @@ import type { Navigate } from "../../navigation/navigate.injectable";
|
||||
import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable";
|
||||
import navigateInjectable from "../../navigation/navigate.injectable";
|
||||
import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";
|
||||
import type { ActiveHotbarModel } from "../../../features/hotbar/storage/common/toggling.injectable";
|
||||
import activeHotbarInjectable from "../../../features/hotbar/storage/common/toggling.injectable";
|
||||
|
||||
export interface SidebarClusterProps {
|
||||
clusterEntity: CatalogEntity | null | undefined;
|
||||
@@ -31,16 +31,16 @@ export interface SidebarClusterProps {
|
||||
interface Dependencies {
|
||||
navigate: Navigate;
|
||||
normalizeMenuItem: NormalizeCatalogEntityContextMenu;
|
||||
hotbarStore: HotbarStore;
|
||||
visitEntityContextMenu: VisitEntityContextMenu;
|
||||
entityInActiveHotbar: ActiveHotbarModel;
|
||||
}
|
||||
|
||||
const NonInjectedSidebarCluster = observer(({
|
||||
clusterEntity,
|
||||
hotbarStore,
|
||||
visitEntityContextMenu: onContextMenuOpen,
|
||||
navigate,
|
||||
normalizeMenuItem,
|
||||
entityInActiveHotbar,
|
||||
}: Dependencies & SidebarClusterProps) => {
|
||||
const [menuItems] = useState(observable.array<CatalogEntityContextMenu>());
|
||||
const [opened, setOpened] = useState(false );
|
||||
@@ -61,13 +61,10 @@ const NonInjectedSidebarCluster = observer(({
|
||||
}
|
||||
|
||||
const onMenuOpen = () => {
|
||||
const isAddedToActive = hotbarStore.isAddedToActive(clusterEntity);
|
||||
const title = isAddedToActive
|
||||
const title = entityInActiveHotbar.hasEntity(clusterEntity.getId())
|
||||
? "Remove from Hotbar"
|
||||
: "Add to Hotbar";
|
||||
const onClick = isAddedToActive
|
||||
? () => hotbarStore.removeFromHotbar(clusterEntity.getId())
|
||||
: () => hotbarStore.addToHotbar(clusterEntity);
|
||||
const onClick = () => entityInActiveHotbar.toggleEntity(clusterEntity);
|
||||
|
||||
menuItems.replace([{ title, onClick }]);
|
||||
onContextMenuOpen(clusterEntity, {
|
||||
@@ -148,9 +145,9 @@ const NonInjectedSidebarCluster = observer(({
|
||||
export const SidebarCluster = withInjectables<Dependencies, SidebarClusterProps>(NonInjectedSidebarCluster, {
|
||||
getProps: (di, props) => ({
|
||||
...props,
|
||||
hotbarStore: di.inject(hotbarStoreInjectable),
|
||||
visitEntityContextMenu: di.inject(visitEntityContextMenuInjectable),
|
||||
navigate: di.inject(navigateInjectable),
|
||||
normalizeMenuItem: di.inject(normalizeCatalogEntityContextMenuInjectable),
|
||||
entityInActiveHotbar: di.inject(activeHotbarInjectable),
|
||||
}),
|
||||
});
|
||||
Reference in new issue
Block a user