From 803348dad124a0e7cb792b52b5e08f6133479cdc Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Tue, 31 Jan 2023 14:52:29 +0300 Subject: [PATCH] Expand all nodes by default Signed-off-by: Alex Andreev --- .../namespace-tree-view.test.tsx.snap | 176 +++++++++++++----- .../+namespaces/namespace-tree-view.test.tsx | 12 +- .../+namespaces/namespace-tree-view.tsx | 2 + 3 files changed, 140 insertions(+), 50 deletions(-) diff --git a/packages/core/src/renderer/components/+namespaces/__snapshots__/namespace-tree-view.test.tsx.snap b/packages/core/src/renderer/components/+namespaces/__snapshots__/namespace-tree-view.test.tsx.snap index eecd6f277f..32ee8748e3 100644 --- a/packages/core/src/renderer/components/+namespaces/__snapshots__/namespace-tree-view.test.tsx.snap +++ b/packages/core/src/renderer/components/+namespaces/__snapshots__/namespace-tree-view.test.tsx.snap @@ -59,7 +59,7 @@ exports[` once the subscribe resolves renders 2 levels deep class="MuiCollapse-wrapperInner" >
  • once the subscribe resolves renders 2 levels deep level-deep-child-a +
      +
      +
      +
      +
  • once the subscribe resolves renders 2 levels deep > @@ -119,37 +133,64 @@ exports[` once the subscribe resolves renders 2 levels deep level-deep-child-b -
    • -
  • -
    - +
  • +
    +
    + +
    +
    + level-deep-subchild-a +
    +
    +
      +
      +
      +
      +
    +
    • + -
    - level-deep-subchild-a -
    - + @@ -220,7 +261,7 @@ exports[` once the subscribe resolves renders namespace wit class="MuiCollapse-wrapperInner" >
  • once the subscribe resolves renders namespace wit team-a +
      +
      +
      +
      +
  • once the subscribe resolves renders namespace wit team-b +
      +
      +
      +
      +
    • @@ -350,7 +417,7 @@ exports[` once the subscribe resolves renders namespace wit class="MuiCollapse-wrapperInner" >
  • once the subscribe resolves renders namespace wit +
      +
      +
      +
      +
  • once the subscribe resolves renders namespace wit team-c +
      +
      +
      +
      +
    • @@ -449,7 +542,7 @@ exports[` once the subscribe resolves renders one namespace role="tree" >
  • once the subscribe resolves renders one namespace single-root -
      -
      -
      -
      -
    • 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 f62a34329d..ba53c3e494 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 @@ -99,8 +99,9 @@ const levelDeepChildB = createNamespace("level-deep-child-b", { const levelDeepSubChildA = createNamespace("level-deep-subchild-a", { "hnc.x-k8s.io/included-namespace": "true", - "levels-deep.tree.hnc.x-k8s.io/depth": "1", - "level-deep-child-b.tree.hnc.x-k8s.io/depth": "0", + "levels-deep.tree.hnc.x-k8s.io/depth": "2", + "level-deep-child-b.tree.hnc.x-k8s.io/depth": "1", + "level-deep-subchild-a.tree.hnc.x-k8s.io/depth": "0", }); describe("", () => { @@ -213,5 +214,12 @@ describe("", () => { expect(result.baseElement).toMatchSnapshot(); }); + + it("expands children items", () => { + const result = render(); + const deepest = result.getByTestId("namespace-level-deep-child-b-1"); + + expect(deepest).toHaveAttribute("aria-expanded", "true"); + }); }); }); \ 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 f95a5805dd..4e8ea6c53e 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx @@ -17,6 +17,7 @@ interface Dependencies { function NonInjectableNamespaceTreeView({ root, namespaceStore }: Dependencies & NamespaceTreeViewProps) { const hierarchicalNamespaces = namespaceStore.getByLabel(["hnc.x-k8s.io/included-namespace=true"]); + const expandedItems = hierarchicalNamespaces.map(ns => `namespace-${ns.getId()}`); function renderBadge(namespace: Namespace) { if (!namespace.getAnnotations().find(annotation => annotation.includes("hnc.x-k8s.io/subnamespace-of"))) { @@ -60,6 +61,7 @@ function NonInjectableNamespaceTreeView({ root, namespaceStore }: Dependencies & defaultCollapseIcon={} defaultExpandIcon={} defaultEndIcon={} + expanded={expandedItems} >