From 609c30e8b8a0518a9d1c83f1c2f9fe8ec25d8666 Mon Sep 17 00:00:00 2001
From: testA113 <aliharriss1995@gmail.com>
Date: Fri, 4 Oct 2024 14:46:01 +1300
Subject: [PATCH] update service account type and isSystem check for new api
 endpoint

---
 app/react/components/Badge/SystemBadge.tsx    |  2 +-
 .../columns/index.tsx                         |  6 ++-
 .../ServiceAccountsDatatable/columns/name.tsx | 48 ++++++++++---------
 .../ServiceAccountsView/types.ts              |  5 --
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/app/react/components/Badge/SystemBadge.tsx b/app/react/components/Badge/SystemBadge.tsx
index 17552d755..e09b944ff 100644
--- a/app/react/components/Badge/SystemBadge.tsx
+++ b/app/react/components/Badge/SystemBadge.tsx
@@ -1,5 +1,5 @@
 import { Badge } from '@@/Badge';
 
 export function SystemBadge() {
-  return <Badge type="success">system</Badge>;
+  return <Badge type="success">System</Badge>;
 }
diff --git a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/index.tsx b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/index.tsx
index 409ba79e0..3d5808bd5 100644
--- a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/index.tsx
+++ b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/index.tsx
@@ -1,7 +1,9 @@
+import { PortainerNamespace } from '@/react/kubernetes/namespaces/types';
+
 import { name } from './name';
 import { namespace } from './namespace';
 import { created } from './created';
 
-export function useColumns() {
-  return [name, namespace, created];
+export function useColumns(namespaces?: PortainerNamespace[]) {
+  return [name(namespaces), namespace, created];
 }
diff --git a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/name.tsx b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/name.tsx
index 16bf6ebc1..9b18567b2 100644
--- a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/name.tsx
+++ b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/columns/name.tsx
@@ -1,28 +1,30 @@
+import { isSystemNamespace } from '@/react/kubernetes/namespaces/queries/useIsSystemNamespace';
+import { PortainerNamespace } from '@/react/kubernetes/namespaces/types';
+
 import { SystemBadge } from '@@/Badge/SystemBadge';
-import { UnusedBadge } from '@@/Badge/UnusedBadge';
 
 import { columnHelper } from './helper';
 
-export const name = columnHelper.accessor(
-  (row) => {
-    let result = row.name;
-    if (row.isSystem) {
-      result += ' system';
+export function name(namespaces?: PortainerNamespace[]) {
+  return columnHelper.accessor(
+    (row) => {
+      let result = row.name;
+      if (isSystemNamespace(row.namespace, namespaces)) {
+        result += ' system';
+      }
+      return result;
+    },
+    {
+      header: 'Name',
+      id: 'name',
+      cell: ({ row }) => (
+        <div className="flex gap-2">
+          <div>{row.original.name}</div>
+          {isSystemNamespace(row.original.namespace, namespaces) && (
+            <SystemBadge />
+          )}
+        </div>
+      ),
     }
-    if (row.isUnused) {
-      result += ' unused';
-    }
-    return result;
-  },
-  {
-    header: 'Name',
-    id: 'name',
-    cell: ({ row }) => (
-      <div className="flex gap-2">
-        <div>{row.original.name}</div>
-        {row.original.isSystem && <SystemBadge />}
-        {!row.original.isSystem && row.original.isUnused && <UnusedBadge />}
-      </div>
-    ),
-  }
-);
+  );
+}
diff --git a/app/react/kubernetes/more-resources/ServiceAccountsView/types.ts b/app/react/kubernetes/more-resources/ServiceAccountsView/types.ts
index deac95ad2..a2134c96a 100644
--- a/app/react/kubernetes/more-resources/ServiceAccountsView/types.ts
+++ b/app/react/kubernetes/more-resources/ServiceAccountsView/types.ts
@@ -1,10 +1,5 @@
 export type ServiceAccount = {
   name: string;
   namespace: string;
-  resourceVersion: string;
-  uid: string;
   creationDate: string;
-
-  isSystem: boolean;
-  isUnused: boolean;
 };