From 6a4a58b93711ec55470cc5edf88bd4f8847332c1 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 8 Feb 2023 17:24:30 +0300 Subject: [PATCH] Linter fixes Signed-off-by: Alex Andreev --- .../+namespaces/namespace-tree-view.test.tsx | 92 +++++++++---------- .../+namespaces/namespace-tree-view.tsx | 6 +- .../renderer/components/+namespaces/store.ts | 12 +-- 3 files changed, 55 insertions(+), 55 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 2da4d88803..783466ffe3 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 @@ -127,8 +127,8 @@ describe("", () => { it("renders one namespace without children", () => { const tree: NamespaceTree = { id: "single-root", - namespace: singleRoot - } + namespace: singleRoot, + }; const result = render(); @@ -142,14 +142,14 @@ describe("", () => { children: [ { id: "team-a", - namespace: teamA + namespace: teamA, }, { id: "team-b", - namespace: teamB - } - ] - } + namespace: teamB, + }, + ], + }; const result = render(); @@ -163,14 +163,14 @@ describe("", () => { children: [ { id: "team-c", - namespace: teamC + namespace: teamC, }, { id: "service-1", - namespace: service1 - } - ] - } + namespace: service1, + }, + ], + }; const result = render(); expect(result.baseElement).toMatchSnapshot(); @@ -183,14 +183,14 @@ describe("", () => { children: [ { id: "team-c", - namespace: teamC + namespace: teamC, }, { id: "service-1", - namespace: service1 - } - ] - } + namespace: service1, + }, + ], + }; const result = render(); expect(result.getByTestId("namespace-details-badge-for-service-1")).toBeInTheDocument(); @@ -203,14 +203,14 @@ describe("", () => { children: [ { id: "team-c", - namespace: teamC + namespace: teamC, }, { id: "service-1", - namespace: service1 - } - ] - } + namespace: service1, + }, + ], + }; const result = render(); const trueNamespace = result.getByTestId("namespace-team-c"); @@ -224,18 +224,18 @@ describe("", () => { children: [ { id: "level-deep-child-a", - namespace: levelDeepChildA + namespace: levelDeepChildA, }, { id: "level-deep-child-b", namespace: levelDeepChildB, children: [{ id: "level-deep-subchild-a", - namespace: levelDeepSubChildA - }] - } - ] - } + namespace: levelDeepSubChildA, + }], + }, + ], + }; const result = render(); expect(result.baseElement).toMatchSnapshot(); @@ -248,18 +248,18 @@ describe("", () => { children: [ { id: "level-deep-child-a", - namespace: levelDeepChildA + namespace: levelDeepChildA, }, { id: "level-deep-child-b", namespace: levelDeepChildB, children: [{ id: "level-deep-subchild-a", - namespace: levelDeepSubChildA - }] - } - ] - } + namespace: levelDeepSubChildA, + }], + }, + ], + }; const result = render(); const deepest = result.getByTestId("namespace-level-deep-child-b"); @@ -273,18 +273,18 @@ describe("", () => { children: [ { id: "level-deep-child-a", - namespace: levelDeepChildA + namespace: levelDeepChildA, }, { id: "level-deep-child-b", namespace: levelDeepChildB, children: [{ id: "level-deep-subchild-a", - namespace: levelDeepSubChildA - }] - } - ] - } + namespace: levelDeepSubChildA, + }], + }, + ], + }; const result = render(); const levelB = result.getByTestId("namespace-level-deep-child-b"); const minusButton = levelB.querySelector("[data-testid='minus-square']"); @@ -303,18 +303,18 @@ describe("", () => { children: [ { id: "level-deep-child-a", - namespace: levelDeepChildA + namespace: levelDeepChildA, }, { id: "level-deep-child-b", namespace: levelDeepChildB, children: [{ id: "level-deep-subchild-a", - namespace: levelDeepSubChildA - }] - } - ] - } + namespace: levelDeepSubChildA, + }], + }, + ], + }; const result = render(); const levelB = result.getByTestId("namespace-level-deep-child-b"); const minusButton = levelB.querySelector("[data-testid='minus-square']"); 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 57f6589ba2..8d69e1aba7 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx @@ -51,10 +51,10 @@ function NonInjectableNamespaceTreeView({ tree, namespaces, getDetailsUrl }: Dep )} )} - > - {Array.isArray(nodes.children) ? nodes.children.map((node) => renderTree(node)) : null} + > + {Array.isArray(nodes.children) ? nodes.children.map((node) => renderTree(node)) : null} - ) + ); } function toggleNode(id: string) { diff --git a/packages/core/src/renderer/components/+namespaces/store.ts b/packages/core/src/renderer/components/+namespaces/store.ts index fee3e3fcd1..3e3608fb81 100644 --- a/packages/core/src/renderer/components/+namespaces/store.ts +++ b/packages/core/src/renderer/components/+namespaces/store.ts @@ -12,10 +12,10 @@ import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { NamespaceApi } from "../../../common/k8s-api/endpoints/namespace.api"; import { Namespace } from "../../../common/k8s-api/endpoints/namespace.api"; -export type NamespaceTree = { - id: string, - namespace: Namespace, - children?: NamespaceTree[] +export interface NamespaceTree { + id: string; + namespace: Namespace; + children?: NamespaceTree[]; } interface Dependencies extends KubeObjectStoreDependencies { @@ -214,8 +214,8 @@ export class NamespaceStore extends KubeObjectStore { return { id: root.getId(), namespace: root, - children: children.map(this.getNamespaceTree) - } + children: children.map(this.getNamespaceTree), + }; } @action