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

Fixing changed cluster preference typing: using tuple array

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2023-03-13 10:30:40 +03:00
parent 2c3a8e0d74
commit c1238e1422
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts
View File

@ -1,6 +1,6 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import type { ClusterPreferences } from "../../../common/cluster-types"; import type { ClusterPreferences } from "../../../common/cluster-types";
import { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token"; import { ChangedClusterPreference, clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
const clusterIconSettingsMenuClearItem = getInjectable({ const clusterIconSettingsMenuClearItem = getInjectable({
id: "cluster-icon-settings-menu-clear-item", id: "cluster-icon-settings-menu-clear-item",
@ -9,11 +9,15 @@ const clusterIconSettingsMenuClearItem = getInjectable({
id: "clear-icon-menu-item", id: "clear-icon-menu-item",
title: "Clear", title: "Clear",
disabled: (preferences: ClusterPreferences) => !preferences.icon, disabled: (preferences: ClusterPreferences) => !preferences.icon,
/** onClick: (preferences: ClusterPreferences) => {
* NOTE: this needs to be `null` rather than `undefined` so that we can /**
* tell the difference between it not being there and being cleared. * NOTE: this needs to be `null` rather than `undefined` so that we can
*/ * tell the difference between it not being there and being cleared.
onClick: (preferences: ClusterPreferences) => ({ icon: null }) */
const data: ChangedClusterPreference = ["icon", null]
return data;
}
}), }),
injectionToken: clusterIconSettingsMenuInjectionToken injectionToken: clusterIconSettingsMenuInjectionToken

4
packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts
View File

@ -1,11 +1,13 @@
import { getInjectionToken } from "@ogre-tools/injectable"; import { getInjectionToken } from "@ogre-tools/injectable";
import type { ClusterPreferences } from "../../../common/cluster-types"; import type { ClusterPreferences } from "../../../common/cluster-types";
export type ChangedClusterPreference = [keyof ClusterPreferences, any];
export type ClusterIconMenuItem = { export type ClusterIconMenuItem = {
id: string, id: string,
title: string, title: string,
disabled: (preferences: ClusterPreferences) => boolean, disabled: (preferences: ClusterPreferences) => boolean,
onClick: (preferences: ClusterPreferences) => Partial<ClusterPreferences>, onClick: (preferences: ClusterPreferences) => ChangedClusterPreference,
} }
export const clusterIconSettingsMenuInjectionToken = getInjectionToken<ClusterIconMenuItem>({ export const clusterIconSettingsMenuInjectionToken = getInjectionToken<ClusterIconMenuItem>({

5
packages/core/src/renderer/components/cluster-settings/icon-settings.tsx
View File

@ -9,14 +9,13 @@ import type { IComputedValue } from "mobx";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import React from "react"; import React from "react";
import type { KubernetesCluster } from "../../../common/catalog-entities"; import type { KubernetesCluster } from "../../../common/catalog-entities";
import type { ClusterPreferences } from "../../../common/cluster-types";
import type { Cluster } from "../../../common/cluster/cluster"; import type { Cluster } from "../../../common/cluster/cluster";
import { Avatar } from "../avatar"; import { Avatar } from "../avatar";
import { FilePicker, OverSizeLimitStyle } from "../file-picker"; import { FilePicker, OverSizeLimitStyle } from "../file-picker";
import { MenuActions, MenuItem } from "../menu"; import { MenuActions, MenuItem } from "../menu";
import type { ShowNotification } from "../notifications"; import type { ShowNotification } from "../notifications";
import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
import { ClusterIconMenuItem, clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token"; import { ChangedClusterPreference, ClusterIconMenuItem, clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
export interface ClusterIconSettingProps { export interface ClusterIconSettingProps {
cluster: Cluster; cluster: Cluster;
@ -54,7 +53,7 @@ const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps &
?.click(); ?.click();
} }
const save = ([kind, value]: [kind: keyof ClusterPreferences, value: any]) => { const save = ([kind, value]: ChangedClusterPreference) => {
cluster.preferences[kind] = value cluster.preferences[kind] = value
} }