From 205cce43c7fced85dd8fa869934acb80e3ebe9bc Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Wed, 3 Nov 2021 16:09:53 +0200
Subject: [PATCH] Display namespace for subject on ClusterRoleBinding details
 (#4242)

---
 .../+user-management/+cluster-role-bindings/details.tsx   | 8 +++++---
 .../+user-management/+role-bindings/details.tsx           | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx b/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx
index df340ea55e..0edf6b2250 100644
--- a/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx
+++ b/src/renderer/components/+user-management/+cluster-role-bindings/details.tsx
@@ -103,12 +103,13 @@ export class ClusterRoleBindingDetails extends React.Component<Props> {
           <Table selectable className="bindings box grow">
             <TableHead>
               <TableCell checkbox />
-              <TableCell className="binding">Name</TableCell>
               <TableCell className="type">Type</TableCell>
+              <TableCell className="binding">Name</TableCell>
+              <TableCell className="ns">Namespace</TableCell>
             </TableHead>
             {
               subjects.map((subject, i) => {
-                const { kind, name } = subject;
+                const { kind, name, namespace } = subject;
                 const isSelected = selectedSubjects.has(subject);
 
                 return (
@@ -118,8 +119,9 @@ export class ClusterRoleBindingDetails extends React.Component<Props> {
                     onClick={prevDefault(() => this.selectedSubjects.toggle(subject))}
                   >
                     <TableCell checkbox isChecked={isSelected} />
-                    <TableCell className="binding">{name}</TableCell>
                     <TableCell className="type">{kind}</TableCell>
+                    <TableCell className="binding">{name}</TableCell>
+                    <TableCell className="ns">{namespace || "-"}</TableCell>
                   </TableRow>
                 );
               })
diff --git a/src/renderer/components/+user-management/+role-bindings/details.tsx b/src/renderer/components/+user-management/+role-bindings/details.tsx
index 2d2312fdd6..bb8e7d9e5f 100644
--- a/src/renderer/components/+user-management/+role-bindings/details.tsx
+++ b/src/renderer/components/+user-management/+role-bindings/details.tsx
@@ -99,9 +99,9 @@ export class RoleBindingDetails extends React.Component<Props> {
           <Table selectable className="bindings box grow">
             <TableHead>
               <TableCell checkbox />
-              <TableCell className="binding">Name</TableCell>
               <TableCell className="type">Type</TableCell>
-              <TableCell className="type">Namespace</TableCell>
+              <TableCell className="binding">Name</TableCell>
+              <TableCell className="ns">Namespace</TableCell>
             </TableHead>
             {
               subjects.map((subject, i) => {
@@ -115,8 +115,8 @@ export class RoleBindingDetails extends React.Component<Props> {
                     onClick={prevDefault(() => this.selectedSubjects.toggle(subject))}
                   >
                     <TableCell checkbox isChecked={isSelected} />
-                    <TableCell className="binding">{name}</TableCell>
                     <TableCell className="type">{kind}</TableCell>
+                    <TableCell className="binding">{name}</TableCell>
                     <TableCell className="ns">{namespace || "-"}</TableCell>
                   </TableRow>
                 );