hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix injection cycle (somehow)

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-12-13 15:45:52 -05:00
parent 4a0b04df61
commit 48abea03d8
1 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx
View File

@ -9,30 +9,25 @@ import { MainLayout } from "../../components/layout/main-layout";
import { Sidebar } from "../../components/layout/sidebar"; import { Sidebar } from "../../components/layout/sidebar";
import { Dock } from "../../components/dock"; import { Dock } from "../../components/dock";
import styles from "./cluster-frame.module.css"; import styles from "./cluster-frame.module.css";
import type { IComputedValue } from "mobx";
import { computed } from "mobx"; import { computed } from "mobx";
import currentRouteComponentInjectable from "../../routes/current-route-component.injectable"; import currentRouteComponentInjectable from "../../routes/current-route-component.injectable";
import { Redirect } from "react-router"; import { Redirect } from "react-router";
import startUrlInjectable from "./start-url.injectable"; import startUrlInjectable from "./start-url.injectable";
import currentPathInjectable from "../../routes/current-path.injectable"; import currentPathInjectable from "../../routes/current-path.injectable";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { withInjectables } from "@ogre-tools/injectable-react";
const clusterFrameLayoutChildComponentInjectable = getInjectable({ interface Dependencies {
id: "cluster-frame-layout-child-component", currentRouteComponent: IComputedValue<React.ElementType<any> | undefined>;
startUrl: IComputedValue<string>;
currentPath: IComputedValue<string>;
}
instantiate: (di) => { const NonInjectedClusterFrameLayout = observer((props: Dependencies) => {
const currentRouteComponent = di.inject(currentRouteComponentInjectable); const Component = props.currentRouteComponent.get();
const startUrl = di.inject(startUrlInjectable); const starting = props.startUrl.get();
const currentPath = di.inject(currentPathInjectable); const current = props.currentPath.get();
return {
id: "cluster-frame-layout",
shouldRender: computed(() => true),
Component: observer(() => {
const Component = currentRouteComponent.get();
const starting = startUrl.get();
const current = currentPath.get();
return ( return (
<MainLayout sidebar={<Sidebar />} footer={<Dock />}> <MainLayout sidebar={<Sidebar />} footer={<Dock />}>
@ -40,7 +35,7 @@ const clusterFrameLayoutChildComponentInjectable = getInjectable({
<Component /> <Component />
) : // NOTE: this check is to prevent an infinite loop ) : // NOTE: this check is to prevent an infinite loop
starting !== current ? ( starting !== current ? (
<Redirect to={startUrl.get()} /> <Redirect to={starting} />
) : ( ) : (
<div className={styles.centering}> <div className={styles.centering}>
<div className="error"> <div className="error">
@ -51,9 +46,25 @@ const clusterFrameLayoutChildComponentInjectable = getInjectable({
)} )}
</MainLayout> </MainLayout>
); );
});
const ClusterFrameLayout = withInjectables<Dependencies>(NonInjectedClusterFrameLayout, {
getProps: (di, props) => ({
...props,
currentRouteComponent: di.inject(currentRouteComponentInjectable),
startUrl: di.inject(startUrlInjectable),
currentPath: di.inject(currentPathInjectable),
}),
});
const clusterFrameLayoutChildComponentInjectable = getInjectable({
id: "cluster-frame-layout-child-component",
instantiate: () => ({
id: "cluster-frame-layout",
shouldRender: computed(() => true),
Component: ClusterFrameLayout,
}), }),
};
},
injectionToken: clusterFrameChildComponentInjectionToken, injectionToken: clusterFrameChildComponentInjectionToken,
}); });