From 5b8de287d8c44a1392fffc53e00ea16ae6f901e7 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Wed, 8 Feb 2023 14:54:47 +0300
Subject: [PATCH] Move subnamespace badge show check to parent

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../__snapshots__/namespace-tree-view.test.tsx.snap    |  2 +-
 .../+namespaces/namespace-tree-view.test.tsx           |  4 ++--
 .../components/+namespaces/namespace-tree-view.tsx     |  7 +++----
 .../components/+namespaces/subnamespace-badge.tsx      | 10 ++--------
 4 files changed, 8 insertions(+), 15 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 7a35090817..e5d026b5b3 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
@@ -970,7 +970,7 @@ exports[`<NamespaceTreeView /> renders namespace with children namespaces and a
                        
                       <span
                         class="subnamespaceBadge"
-                        data-testid="subnamespace-badge-for-service-1-1"
+                        data-testid="namespace-details-badge-for-service-1-1"
                         id="namespace-details-badge-for-service-1-1"
                       >
                         S
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 3d154d6e2a..16ae8fd9e1 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
@@ -150,14 +150,14 @@ describe("<NamespaceTreeView />", () => {
   it("renders an indicator badge for the subnamespace", () => {
     const result = render(<NamespaceTreeView root={orgA} />);
 
-    expect(result.getByTestId("subnamespace-badge-for-service-1-1")).toBeInTheDocument();
+    expect(result.getByTestId("namespace-details-badge-for-service-1-1")).toBeInTheDocument();
   });
 
   it("does not render an indicator badge for the true namespace", () => {
     const result = render(<NamespaceTreeView root={orgA} />);
     const trueNamespace = result.getByTestId("namespace-team-c-1");
 
-    expect(trueNamespace.querySelector("[data-testid='subnamespace-badge-for-team-c-1']")).toBeNull();
+    expect(trueNamespace.querySelector("[data-testid='namespace-details-badge-for-team-c-1']")).toBeNull();
   });
 
   it("renders 2 levels deep", () => {
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 81a0c6cec0..eddb8b6d9b 100644
--- a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx
+++ b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.tsx
@@ -61,10 +61,9 @@ function NonInjectableNamespaceTreeView({ root, namespaces, getDetailsUrl }: Dep
                 {child.getName()}
               </Link>
               {" "}
-              <SubnamespaceBadge
-                id={`namespace-details-badge-for-${child.getId()}`}
-                namespace={child}
-              />
+              {child.isSubnamespace() && (
+                <SubnamespaceBadge id={`namespace-details-badge-for-${child.getId()}`} />
+              )}
             </>
           )}
         >
diff --git a/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx b/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx
index a56f737b93..37214b0b7f 100644
--- a/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx
+++ b/packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx
@@ -5,24 +5,18 @@
 import styles from "./subnamespace-badge.module.scss";
 
 import React from "react";
-import type { Namespace } from "../../../common/k8s-api/endpoints";
 import { Tooltip } from "../tooltip";
 
 interface SubnamespaceBadgeProps extends React.HTMLAttributes<HTMLSpanElement> {
-  namespace: Namespace;
   id: string;
 }
 
-export function SubnamespaceBadge({ namespace, id, ...other }: SubnamespaceBadgeProps) {
-  if (!namespace.isSubnamespace()) {
-    return null;
-  }
-
+export function SubnamespaceBadge({ id, ...other }: SubnamespaceBadgeProps) {
   return (
     <>
       <span
         className={styles.subnamespaceBadge}
-        data-testid={`subnamespace-badge-for-${namespace.getId()}`}
+        data-testid={id}
         id={id}
         {...other}
       >