Linter fixes

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

packages/core/src/extensions/renderer-api/tokens.ts

@@ -1 +1,5 @@
-export * from "../../renderer/components/cluster-settings/cluster-settings-menu-injection-token";
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export * from "../../renderer/components/cluster-settings/cluster-settings-menu-injection-token";

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

@@ -1,6 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { ClusterPreferences } from "../../../common/cluster-types";
-import { ChangedClusterPreference, clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
+import type { ChangedClusterPreference } from "./cluster-settings-menu-injection-token";
+import { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
 
 const clusterIconSettingsMenuClearItem = getInjectable({
   id: "cluster-icon-settings-menu-clear-item",
@@ -9,18 +14,18 @@ const clusterIconSettingsMenuClearItem = getInjectable({
     id: "clear-icon-menu-item",
     title: "Clear",
     disabled: (preferences: ClusterPreferences) => !preferences.icon,
-    onClick: (preferences: ClusterPreferences) => {
+    onClick: () => {
       /**
        * NOTE: this needs to be `null` rather than `undefined` so that we can
        * tell the difference between it not being there and being cleared.
        */
-      const data: ChangedClusterPreference = ["icon", null]
+      const data: ChangedClusterPreference = ["icon", null];
 
       return data;
-    }
+    },
   }),
 
-  injectionToken: clusterIconSettingsMenuInjectionToken
+  injectionToken: clusterIconSettingsMenuInjectionToken,
-})
+});
 
-export default clusterIconSettingsMenuClearItem;
+export default clusterIconSettingsMenuClearItem;

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

@@ -1,15 +1,19 @@
+/**
+ * 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 type ChangedClusterPreference = [keyof ClusterPreferences, any];
 
-export type ClusterIconMenuItem = {
+export interface ClusterIconMenuItem {
-  id: string,
+  id: string;
-  title: string,
+  title: string;
-  disabled: (preferences: ClusterPreferences) => boolean,
+  disabled?: (preferences: ClusterPreferences) => boolean;
-  onClick: (preferences: ClusterPreferences) => ChangedClusterPreference,
+  onClick: (preferences: ClusterPreferences) => ChangedClusterPreference;
 }
 
 export const clusterIconSettingsMenuInjectionToken = getInjectionToken<ClusterIconMenuItem>({
   id: "cluster-icon-settings-menu-injection-token",
-});
+});

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

@@ -15,7 +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 { ChangedClusterPreference, ClusterIconMenuItem, clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
+import type { ChangedClusterPreference, ClusterIconMenuItem } from "./cluster-settings-menu-injection-token";
+import { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
 
 export interface ClusterIconSettingProps {
   cluster: Cluster;
@@ -23,7 +24,7 @@ export interface ClusterIconSettingProps {
 }
 
 interface Dependencies {
-  menuItems: IComputedValue<ClusterIconMenuItem[]>
+  menuItems: IComputedValue<ClusterIconMenuItem[]>;
   showErrorNotification: ShowNotification;
 }
 
@@ -31,6 +32,7 @@ interface Dependencies {
 const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps & Dependencies) => {
   const element = React.createRef<HTMLDivElement>();
   const { cluster, entity } = props;
+  const menuId = `menu-actions-for-cluster-icon-settings-for-${entity.getId()}`;
 
   const onIconPick = async ([file]: File[]) => {
     if (!file) {
@@ -42,20 +44,20 @@ const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps &
 
       cluster.preferences.icon = `data:${file.type};base64,${buf.toString("base64")}`;
     } catch (e) {
-      props.showErrorNotification(String(e))
+      props.showErrorNotification(String(e));
     }
-  }
+  };
 
   const onUploadClick = () => {
     element
       .current
       ?.querySelector<HTMLInputElement>("input[type=file]")
       ?.click();
-  }
+  };
 
   const save = ([kind, value]: ChangedClusterPreference) => {
-    cluster.preferences[kind] = value
+    cluster.preferences[kind] = value;
-  }
+  };
 
   return (
     <div ref={element}>
@@ -76,7 +78,8 @@ const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps &
           />
         </div>
         <MenuActions
-          id={`menu-actions-for-cluster-icon-settings-for-${entity.getId()}`}
+          id={menuId}
+          data-testid={menuId}
           toolbar={false}
           autoCloseOnSelect={true}
           triggerIcon={{ material: "more_horiz" }}
@@ -84,8 +87,14 @@ const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps &
           <MenuItem onClick={onUploadClick}>
             Upload Icon
           </MenuItem>
-          {props.menuItems.get().map(item =>
+          {props.menuItems.get().map(item => (
-            <MenuItem onClick={() => save(item.onClick(cluster.preferences))} key={item.id} disabled={item.disabled(cluster.preferences)}>{item.title}</MenuItem>
+            <MenuItem
+              onClick={() => save(item.onClick(cluster.preferences))}
+              key={item.id}
+              disabled={item.disabled?.(cluster.preferences)}>
+              {item.title}
+            </MenuItem>
+          ),
           )}
         </MenuActions>
       </div>
@@ -95,12 +104,12 @@ const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps &
 
 export const ClusterIconSetting = withInjectables<Dependencies, ClusterIconSettingProps>(NonInjectedClusterIconSetting, {
   getProps: (di, props) => {
-   const computedInjectMany = di.inject(computedInjectManyInjectable);
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
    
-   return {
+    return {
-    ...props,
+      ...props,
-    menuItems: computedInjectMany(clusterIconSettingsMenuInjectionToken),
+      menuItems: computedInjectMany(clusterIconSettingsMenuInjectionToken),
-    showErrorNotification: di.inject(showErrorNotificationInjectable),
+      showErrorNotification: di.inject(showErrorNotificationInjectable),
-   }
+    };
-  }
+  },
-});
+});