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

Update ogre-tools for improved types of withInjectables (#4587)

Browse Source
This commit is contained in:
Janne Savolainen authored and GitHub committed 2021-12-17 10:28:26 -05:00
1 parent 96309814dc
commit a711499bb6
4 files changed
+68 -80
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/renderer/components/kube-object-menu/kube-object-menu.tsx
+32 -38
View File
@@ -32,38 +32,28 @@ import hideDetailsInjectable from "./dependencies/hide-details.injectable";
import kubeObjectMenuItemsInjectable from "./dependencies/kube-object-menu-items/kube-object-menu-items.injectable";
import apiManagerInjectable from "./dependencies/api-manager.injectable";
// TODO: Replace with KubeObjectMenuProps2
export interface KubeObjectMenuProps<TKubeObject> extends MenuActionsProps {
export interface KubeObjectMenuProps<TKubeObject extends KubeObject> extends MenuActionsProps {
object: TKubeObject | null | undefined;
editable?: boolean;
removable?: boolean;
}
interface KubeObjectMenuProps2 extends MenuActionsProps {
object: KubeObject | null | undefined;
editable?: boolean;
removable?: boolean;
dependencies: {
apiManager: ApiManager;
kubeObjectMenuItems: React.ElementType[];
clusterName: string;
hideDetails: () => void;
editResourceTab: (kubeObject: KubeObject) => void;
};
interface Dependencies {
apiManager: ApiManager;
kubeObjectMenuItems: React.ElementType[];
clusterName: string;
hideDetails: () => void;
editResourceTab: (kubeObject: KubeObject) => void;
}
class NonInjectedKubeObjectMenu extends React.Component<KubeObjectMenuProps2> {
get dependencies() {
return this.props.dependencies;
}
class NonInjectedKubeObjectMenu<TKubeObject extends KubeObject> extends React.Component<KubeObjectMenuProps<TKubeObject> & Dependencies> {
get store() {
const { object } = this.props;
if (!object) return null;
return this.props.dependencies.apiManager.getStore(object.selfLink);
return this.props.apiManager.getStore(object.selfLink);
}
get isEditable() {
@@ -76,13 +66,13 @@ class NonInjectedKubeObjectMenu extends React.Component<KubeObjectMenuProps2> {
@boundMethod
async update() {
this.props.dependencies.hideDetails();
this.props.dependencies.editResourceTab(this.props.object);
this.props.hideDetails();
this.props.editResourceTab(this.props.object);
}
@boundMethod
async remove() {
this.props.dependencies.hideDetails();
this.props.hideDetails();
const { object, removeAction } = this.props;
if (removeAction) await removeAction();
@@ -103,7 +93,7 @@ class NonInjectedKubeObjectMenu extends React.Component<KubeObjectMenuProps2> {
return (
<p>
Remove {object.kind} <b>{breadcrumb}</b> from <b>{this.dependencies.clusterName}</b>?
Remove {object.kind} <b>{breadcrumb}</b> from <b>{this.props.clusterName}</b>?
</p>
);
}
@@ -111,7 +101,7 @@ class NonInjectedKubeObjectMenu extends React.Component<KubeObjectMenuProps2> {
getMenuItems(): React.ReactChild[] {
const { object, toolbar } = this.props;
return this.props.dependencies.kubeObjectMenuItems.map((MenuItem, index) => (
return this.props.kubeObjectMenuItems.map((MenuItem, index) => (
<MenuItem object={object} toolbar={toolbar} key={`menu-item-${index}`} />
));
}
@@ -134,19 +124,23 @@ class NonInjectedKubeObjectMenu extends React.Component<KubeObjectMenuProps2> {
}
}
export const KubeObjectMenu = withInjectables(NonInjectedKubeObjectMenu, {
getProps: (di, props) => ({
dependencies: {
clusterName: di.inject(clusterNameInjectable),
apiManager: di.inject(apiManagerInjectable),
editResourceTab: di.inject(editResourceTabInjectable),
hideDetails: di.inject(hideDetailsInjectable),
export function KubeObjectMenu<T extends KubeObject>(
props: KubeObjectMenuProps<T>,
) {
return withInjectables<Dependencies, KubeObjectMenuProps<T>>(
NonInjectedKubeObjectMenu,
{
getProps: (di, props) => ({
clusterName: di.inject(clusterNameInjectable),
apiManager: di.inject(apiManagerInjectable),
editResourceTab: di.inject(editResourceTabInjectable),
hideDetails: di.inject(hideDetailsInjectable),
kubeObjectMenuItems: di.inject(kubeObjectMenuItemsInjectable, {
kubeObject: props.object,
kubeObjectMenuItems: di.inject(kubeObjectMenuItemsInjectable, {
kubeObject: props.object,
}),
...props,
}),
},
...props,
}),
});
)(props);
}