From 8c8701f8a63452942372fb61f864897af7599e7a Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 1 Feb 2023 13:54:13 +0300 Subject: [PATCH] Linter fixes Signed-off-by: Alex Andreev --- .../+namespaces/namespace-tree-view.test.tsx | 24 +++++++++++++------ .../+namespaces/namespace-tree-view.tsx | 15 ++++++++---- .../+namespaces/subnamespace-badge.tsx | 6 ++++- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx index f767cdf799..461eeee02e 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx @@ -1,3 +1,7 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import type { DiContainer } from "@ogre-tools/injectable"; @@ -35,11 +39,11 @@ function createNamespace(name: string, labels?: Record, annotati selfLink: `/api/v1/namespaces/${name}`, uid: `${name}-1`, labels: { - ...labels + ...labels, }, annotations: { - ...annotations - } + ...annotations, + }, }, }); } @@ -232,7 +236,9 @@ describe("", () => { const levelB = result.getByTestId("namespace-level-deep-child-b-1"); const minusButton = levelB.querySelector("[data-testid='minus-square']"); - fireEvent.click(minusButton!); + if (minusButton) { + fireEvent.click(minusButton); + } expect(result.baseElement).toMatchSnapshot(); }); @@ -242,13 +248,17 @@ describe("", () => { const levelB = result.getByTestId("namespace-level-deep-child-b-1"); const minusButton = levelB.querySelector("[data-testid='minus-square']"); - fireEvent.click(minusButton!); + if (minusButton) { + fireEvent.click(minusButton); + } const plusButton = levelB.querySelector("[data-testid='plus-square']"); - fireEvent.click(plusButton!); + if (plusButton) { + fireEvent.click(plusButton); + } expect(result.baseElement).toMatchSnapshot(); }); }); -}); \ No newline at end of file +}); diff --git a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx index 5124424055..8dbc808b19 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx @@ -1,5 +1,10 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ import { SvgIcon, withStyles } from "@material-ui/core"; -import { TreeItem, TreeItemProps, TreeView } from "@material-ui/lab"; +import type { TreeItemProps } from "@material-ui/lab"; +import { TreeItem, TreeView } from "@material-ui/lab"; import { withInjectables } from "@ogre-tools/injectable-react"; import React from "react"; import { Link } from "react-router-dom"; @@ -32,7 +37,7 @@ function NonInjectableNamespaceTreeView({ root, namespaceStore, getDetailsUrl }: function renderChildren(parent: Namespace) { const children = hierarchicalNamespaces.filter(ns => - ns.getLabels().find(label => label === `${parent.getName()}.tree.hnc.x-k8s.io/depth=1`) + ns.getLabels().find(label => label === `${parent.getName()}.tree.hnc.x-k8s.io/depth=1`), ); return children.map(child => ( @@ -41,7 +46,7 @@ function NonInjectableNamespaceTreeView({ root, namespaceStore, getDetailsUrl }: nodeId={`namespace-${child.getId()}`} data-testid={`namespace-${child.getId()}`} onIconClick={(evt) =>{ - toggleNode(`namespace-${child.getId()}`) + toggleNode(`namespace-${child.getId()}`); evt.stopPropagation(); }} label={( @@ -97,7 +102,7 @@ function NonInjectableNamespaceTreeView({ root, namespaceStore, getDetailsUrl }: - ) + ); } function MinusSquare() { @@ -126,7 +131,7 @@ function CloseSquare() { const StyledTreeItem = withStyles((theme) => ({ iconContainer: { - '& .close': { + "& .close": { opacity: 0.3, }, }, diff --git a/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx b/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx index 94ba56d532..d7865468b4 100644 --- a/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx +++ b/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx @@ -1,3 +1,7 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ import styles from "./subnamespace-badge.module.scss"; import React from "react"; @@ -29,4 +33,4 @@ export function SubnamespaceBadge({ namespace, id, ...other }: SubnamespaceBadge ); -} \ No newline at end of file +}