hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Move isSubnamespace method inside API

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2023-02-03 16:23:19 +03:00
parent db0cb45a30
commit fa87ab5157
3 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/common/k8s-api/endpoints/namespace.api.ts
View File

@ -33,6 +33,10 @@ export class Namespace extends KubeObject<
getStatus() { getStatus() {
return this.status?.phase ?? "-"; return this.status?.phase ?? "-";
} }
isSubnamespace(){
return this.getAnnotations().find(annotation => annotation.includes("hnc.x-k8s.io/subnamespace-of"));
}
} }
export class NamespaceApi extends KubeApi<Namespace> { export class NamespaceApi extends KubeApi<Namespace> {

80
packages/core/src/renderer/components/+namespaces/__snapshots__/namespace-tree-view.test.tsx.snap
View File

@ -4,6 +4,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves collapses item by cli
<body> <body>
<div> <div>
<div <div
class="TreeView"
data-testid="namespace-tree-view" data-testid="namespace-tree-view"
> >
<div <div
@ -43,13 +44,13 @@ exports[`<NamespaceTreeView /> once the subscribe resolves collapses item by cli
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-16 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
levels-deep levels-deep
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-15 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -89,14 +90,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves collapses item by cli
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-16 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-child-a level-deep-child-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-15 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -136,14 +137,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves collapses item by cli
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-16 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-child-b level-deep-child-b
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-15" class="MuiCollapse-root MuiTreeItem-group group"
role="group" role="group"
style="min-height: 0px; height: 0px; transition-duration: 300ms;" style="min-height: 0px; height: 0px; transition-duration: 300ms;"
> >
@ -183,14 +184,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves collapses item by cli
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-16 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-subchild-a level-deep-subchild-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-15 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -221,6 +222,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves expands item by click
<body> <body>
<div> <div>
<div <div
class="TreeView"
data-testid="namespace-tree-view" data-testid="namespace-tree-view"
> >
<div <div
@ -260,13 +262,13 @@ exports[`<NamespaceTreeView /> once the subscribe resolves expands item by click
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-18 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
levels-deep levels-deep
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-17 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -306,14 +308,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves expands item by click
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-18 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-child-a level-deep-child-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-17 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -353,14 +355,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves expands item by click
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-18 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-child-b level-deep-child-b
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-17" class="MuiCollapse-root MuiTreeItem-group group"
role="group" role="group"
style="min-height: 0px; height: 0px; transition-duration: 300ms;" style="min-height: 0px; height: 0px; transition-duration: 300ms;"
> >
@ -400,14 +402,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves expands item by click
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-18 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-subchild-a level-deep-subchild-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-17 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -438,6 +440,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders 2 levels deep
<body> <body>
<div> <div>
<div <div
class="TreeView"
data-testid="namespace-tree-view" data-testid="namespace-tree-view"
> >
<div <div
@ -477,13 +480,13 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders 2 levels deep
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-12 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
levels-deep levels-deep
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-11 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -523,14 +526,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders 2 levels deep
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-12 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-child-a level-deep-child-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-11 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -570,14 +573,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders 2 levels deep
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-12 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-child-b level-deep-child-b
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-11 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -617,14 +620,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders 2 levels deep
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-12 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
level-deep-subchild-a level-deep-subchild-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-11 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -655,6 +658,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
<body> <body>
<div> <div>
<div <div
class="TreeView"
data-testid="namespace-tree-view" data-testid="namespace-tree-view"
> >
<div <div
@ -694,13 +698,13 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-4 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
acme-org acme-org
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-3 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -740,14 +744,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-4 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
team-a team-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-3 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -790,14 +794,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-4 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
team-b team-b
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-3 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -824,6 +828,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
<body> <body>
<div> <div>
<div <div
class="TreeView"
data-testid="namespace-tree-view" data-testid="namespace-tree-view"
> >
<div <div
@ -863,13 +868,13 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
</svg> </svg>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-6 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
org-a org-a
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-5 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -909,7 +914,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-6 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
service-1 service-1
@ -923,7 +928,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-5 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -966,14 +971,14 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders namespace wit
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-6 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
team-c team-c
</div> </div>
</div> </div>
<ul <ul
class="MuiCollapse-root MuiTreeItem-group Component-group-5 MuiCollapse-entered" class="MuiCollapse-root MuiTreeItem-group group MuiCollapse-entered"
role="group" role="group"
style="min-height: 0px;" style="min-height: 0px;"
> >
@ -1006,6 +1011,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders one namespace
<body> <body>
<div> <div>
<div <div
class="TreeView"
data-testid="namespace-tree-view" data-testid="namespace-tree-view"
> >
<div <div
@ -1048,7 +1054,7 @@ exports[`<NamespaceTreeView /> once the subscribe resolves renders one namespace
</div> </div>
</div> </div>
<div <div
class="MuiTypography-root MuiTreeItem-label Component-label-2 MuiTypography-body1" class="MuiTypography-root MuiTreeItem-label label MuiTypography-body1"
> >
single-root single-root
</div> </div>

2
packages/core/src/renderer/components/+namespaces/subnamespace-badge.tsx
View File

@ -14,7 +14,7 @@ interface SubnamespaceBadgeProps extends React.HTMLAttributes<HTMLSpanElement> {
} }
export function SubnamespaceBadge({ namespace, id, ...other }: SubnamespaceBadgeProps) { export function SubnamespaceBadge({ namespace, id, ...other }: SubnamespaceBadgeProps) {
if (!namespace.getAnnotations().find(annotation => annotation.includes("hnc.x-k8s.io/subnamespace-of"))) { if (!namespace.isSubnamespace()) {
return null; return null;
} }