From 66c4930ac59f008deb13994eb634ca2fb473b5e0 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 22 Mar 2023 11:08:21 +0300 Subject: [PATCH] Use tolens from @k8slens/cluster-settings Signed-off-by: Alex Andreev --- packages/core/package.json | 1 + .../__tests__/icon-settings.test.tsx | 3 +-- ...luster-settings-component-injection-token.ts | 15 --------------- ...uster-settings-menu-clear-item.injectable.ts | 2 +- .../cluster-settings-menu-injection-token.ts | 17 ----------------- .../cluster-settings/icon-settings.tsx | 5 ++--- 6 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 packages/core/src/renderer/components/cluster-settings/cluster-settings-component-injection-token.ts delete mode 100644 packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts diff --git a/packages/core/package.json b/packages/core/package.json index 15c79d774d..d1b8e862e4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -120,6 +120,7 @@ "@astronautlabs/jsonpath": "^1.1.0", "@hapi/call": "^9.0.1", "@hapi/subtext": "^7.1.0", + "@k8slens/cluster-settings": "^6.5.0-alpha.1", "@k8slens/node-fetch": "^6.5.0-alpha.1", "@kubernetes/client-node": "^0.18.1", "@material-ui/styles": "^4.11.5", diff --git a/packages/core/src/renderer/components/cluster-settings/__tests__/icon-settings.test.tsx b/packages/core/src/renderer/components/cluster-settings/__tests__/icon-settings.test.tsx index 9877882973..1fb6c74de1 100644 --- a/packages/core/src/renderer/components/cluster-settings/__tests__/icon-settings.test.tsx +++ b/packages/core/src/renderer/components/cluster-settings/__tests__/icon-settings.test.tsx @@ -12,10 +12,9 @@ import { renderFor } from "../../test-utils/renderFor"; import { ClusterIconSetting } from "../icon-settings"; import { screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { clusterIconSettingsMenuInjectionToken } from "../cluster-settings-menu-injection-token"; +import { ClusterIconSettingComponentProps, clusterIconSettingsComponentInjectionToken, clusterIconSettingsMenuInjectionToken } from "@k8slens/cluster-settings"; import { runInAction } from "mobx"; import { getInjectable, type DiContainer } from "@ogre-tools/injectable"; -import { ClusterIconSettingComponentProps, clusterIconSettingsComponentInjectionToken } from "../cluster-settings-component-injection-token"; const cluster = new Cluster({ contextName: "some-context", diff --git a/packages/core/src/renderer/components/cluster-settings/cluster-settings-component-injection-token.ts b/packages/core/src/renderer/components/cluster-settings/cluster-settings-component-injection-token.ts deleted file mode 100644 index 91be769620..0000000000 --- a/packages/core/src/renderer/components/cluster-settings/cluster-settings-component-injection-token.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type { ClusterPreferences } from "../../../common/cluster-types"; - -export interface ClusterIconSettingComponentProps { - preferences: ClusterPreferences; -} - -export interface ClusterIconSettingsComponent { - id: string; - Component: React.ComponentType; -} - -export const clusterIconSettingsComponentInjectionToken = getInjectionToken({ - id: "cluster-icon-settings-component-injection-token", -}); \ No newline at end of file diff --git a/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts b/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts index 697c68bb40..87f8c87940 100644 --- a/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts +++ b/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token"; +import { clusterIconSettingsMenuInjectionToken } from "@k8slens/cluster-settings"; const clusterIconSettingsMenuClearItem = getInjectable({ id: "cluster-icon-settings-menu-clear-item", diff --git a/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts b/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts deleted file mode 100644 index 15dbba2754..0000000000 --- a/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type { ClusterPreferences } from "../../../common/cluster-types"; - -export interface ClusterIconMenuItem { - id: string; - title: string; - disabled?: (preferences: ClusterPreferences) => boolean; - onClick: (preferences: ClusterPreferences) => void; -} - -export const clusterIconSettingsMenuInjectionToken = getInjectionToken({ - id: "cluster-icon-settings-menu-injection-token", -}); diff --git a/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx b/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx index cf69081b55..d6ed6d912b 100644 --- a/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx +++ b/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx @@ -15,9 +15,8 @@ import { FilePicker, OverSizeLimitStyle } from "../file-picker"; import { MenuActions, MenuItem } from "../menu"; import type { ShowNotification } from "../notifications"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; -import { ClusterIconSettingsComponent, clusterIconSettingsComponentInjectionToken } from "./cluster-settings-component-injection-token"; -import type { ClusterIconMenuItem } from "./cluster-settings-menu-injection-token"; -import { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token"; +import { ClusterIconSettingsComponent, clusterIconSettingsComponentInjectionToken, clusterIconSettingsMenuInjectionToken } from "@k8slens/cluster-settings"; +import type { ClusterIconMenuItem } from "@k8slens/cluster-settings"; export interface ClusterIconSettingProps { cluster: Cluster;