From 62abe4f4effe1a731181bcb2d1cf411bdb78f042 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 22 Mar 2023 11:28:59 +0300 Subject: [PATCH] Linter fixes Signed-off-by: Alex Andreev --- packages/cluster-settings/src/index.ts | 8 ++++---- .../cluster-settings/__tests__/icon-settings.test.tsx | 8 ++++++-- .../components/cluster-settings/icon-settings.tsx | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/cluster-settings/src/index.ts b/packages/cluster-settings/src/index.ts index f3e7cb1db8..181c69d46a 100644 --- a/packages/cluster-settings/src/index.ts +++ b/packages/cluster-settings/src/index.ts @@ -12,10 +12,6 @@ export interface ClusterIconMenuItem { onClick: (preferences: ClusterPreferences) => void; } -export const clusterIconSettingsMenuInjectionToken = getInjectionToken({ - id: "cluster-icon-settings-menu-injection-token", -}); - export interface ClusterIconSettingComponentProps { preferences: ClusterPreferences; } @@ -25,6 +21,10 @@ export interface ClusterIconSettingsComponent { Component: React.ComponentType; } +export const clusterIconSettingsMenuInjectionToken = getInjectionToken({ + id: "cluster-icon-settings-menu-injection-token", +}); + 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/__tests__/icon-settings.test.tsx b/packages/core/src/renderer/components/cluster-settings/__tests__/icon-settings.test.tsx index 1fb6c74de1..41db31b04b 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,7 +12,8 @@ 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 { ClusterIconSettingComponentProps, clusterIconSettingsComponentInjectionToken, clusterIconSettingsMenuInjectionToken } from "@k8slens/cluster-settings"; +import type { ClusterIconSettingComponentProps } from "@k8slens/cluster-settings"; +import { clusterIconSettingsComponentInjectionToken, clusterIconSettingsMenuInjectionToken } from "@k8slens/cluster-settings"; import { runInAction } from "mobx"; import { getInjectable, type DiContainer } from "@ogre-tools/injectable"; @@ -59,7 +60,10 @@ function customSettingsComponent(props: ClusterIconSettingComponentProps) { return (
Test React Component - Cluster {props.preferences.clusterName} + + Cluster + {props.preferences.clusterName} +
); } 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 d6ed6d912b..a802807c17 100644 --- a/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx +++ b/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx @@ -15,8 +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, clusterIconSettingsMenuInjectionToken } from "@k8slens/cluster-settings"; -import type { ClusterIconMenuItem } from "@k8slens/cluster-settings"; +import { clusterIconSettingsComponentInjectionToken, clusterIconSettingsMenuInjectionToken } from "@k8slens/cluster-settings"; +import type { ClusterIconMenuItem, ClusterIconSettingsComponent } from "@k8slens/cluster-settings"; export interface ClusterIconSettingProps { cluster: Cluster;