diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx b/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx index b37f8a5be9..36d0cce310 100644 --- a/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx +++ b/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx @@ -16,9 +16,15 @@ import directoryForUserDataInjectable from "../../../../../common/app-paths/dire import directoryForKubeConfigsInjectable from "../../../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import hostedClusterInjectable from "../../../../cluster-frame-context/hosted-cluster.injectable"; import createClusterInjectable from "../../../../cluster/create-cluster.injectable"; +import type { CloseClusterRoleBindingDialog } from "../dialog/close.injectable"; +import closeClusterRoleBindingDialogInjectable from "../dialog/close.injectable"; +import type { OpenClusterRoleBindingDialog } from "../dialog/open.injectable"; +import openClusterRoleBindingDialogInjectable from "../dialog/open.injectable"; describe("ClusterRoleBindingDialog tests", () => { let render: DiRender; + let closeClusterRoleBindingDialog: CloseClusterRoleBindingDialog; + let openClusterRoleBindingDialog: OpenClusterRoleBindingDialog; beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); @@ -27,6 +33,9 @@ describe("ClusterRoleBindingDialog tests", () => { di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); di.override(storesAndApisCanBeCreatedInjectable, () => true); + closeClusterRoleBindingDialog = di.inject(closeClusterRoleBindingDialogInjectable); + openClusterRoleBindingDialog = di.inject(openClusterRoleBindingDialogInjectable); + const createCluster = di.inject(createClusterInjectable); di.override(hostedClusterInjectable, () => createCluster({ @@ -56,7 +65,7 @@ describe("ClusterRoleBindingDialog tests", () => { }); afterEach(() => { - ClusterRoleBindingDialog.close(); + closeClusterRoleBindingDialog(); jest.resetAllMocks(); }); @@ -67,7 +76,7 @@ describe("ClusterRoleBindingDialog tests", () => { }); it("clusterrole select should be searchable", async () => { - ClusterRoleBindingDialog.open(); + openClusterRoleBindingDialog(); const res = render(); userEvent.keyboard("a"); diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/view.tsx b/src/renderer/components/+user-management/+cluster-role-bindings/view.tsx index 7803227dd7..ced8c892e7 100644 --- a/src/renderer/components/+user-management/+cluster-role-bindings/view.tsx +++ b/src/renderer/components/+user-management/+cluster-role-bindings/view.tsx @@ -19,6 +19,8 @@ import type { ClusterRoleStore } from "../+cluster-roles/store"; import type { ServiceAccountStore } from "../+service-accounts/store"; import clusterRoleStoreInjectable from "../+cluster-roles/store.injectable"; import serviceAccountStoreInjectable from "../+service-accounts/store.injectable"; +import type { OpenClusterRoleBindingDialog } from "./dialog/open.injectable"; +import openClusterRoleBindingDialogInjectable from "./dialog/open.injectable"; enum columnId { name = "name", @@ -31,6 +33,7 @@ interface Dependencies { clusterRoleBindingStore: ClusterRoleBindingStore; clusterRoleStore: ClusterRoleStore; serviceAccountStore: ServiceAccountStore; + openClusterRoleBindingDialog: OpenClusterRoleBindingDialog; } @observer @@ -40,6 +43,7 @@ class NonInjectedClusterRoleBindings extends React.Component { clusterRoleBindingStore, clusterRoleStore, serviceAccountStore, + openClusterRoleBindingDialog, } = this.props; return ( @@ -73,7 +77,7 @@ class NonInjectedClusterRoleBindings extends React.Component { , ]} addRemoveButtons={{ - onAdd: () => ClusterRoleBindingDialog.open(), + onAdd: () => openClusterRoleBindingDialog(), addTooltip: "Create new ClusterRoleBinding", }} /> @@ -89,5 +93,6 @@ export const ClusterRoleBindings = withInjectables(NonInjectedClus clusterRoleBindingStore: di.inject(clusterRoleBindingStoreInjectable), clusterRoleStore: di.inject(clusterRoleStoreInjectable), serviceAccountStore: di.inject(serviceAccountStoreInjectable), + openClusterRoleBindingDialog: di.inject(openClusterRoleBindingDialogInjectable), }), });