Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

fix(ui): mark resources system correctly [EE-6558] (#10996)

Browse source 
* fix(ui): mark resources system correctly [EE-6558]

* address review comments
This commit is contained in:
Prabhat Khera 2024-01-23 13:49:25 +13:00 • committed by GitHub
parent 85ae705833
commit f7840e0407
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 110 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/react/kubernetes/services/ServicesView/ServicesDatatable/columns/name.tsx
View file

@ -1,5 +1,4 @@
import { Authorized } from '@/react/hooks/useUser';
import { isSystemNamespace } from '@/react/kubernetes/namespaces/utils';
import { Badge } from '@@/Badge';
@ -11,13 +10,12 @@ export const name = columnHelper.accessor(
const isExternal =
!row.Labels || !row.Labels['io.portainer.kubernetes.application.owner'];
const isSystem = isSystemNamespace(row.Namespace);
if (isExternal && !isSystem) {
if (isExternal && !row.IsSystem) {
name = `${name} external`;
}
if (isSystem) {
if (row.IsSystem) {
name = `${name} system`;
}
return name;
@ -27,7 +25,6 @@ export const name = columnHelper.accessor(
id: 'name',
cell: ({ row }) => {
const name = row.original.Name;
const isSystem = isSystemNamespace(row.original.Namespace);
const isExternal =
!row.original.Labels ||
@ -38,13 +35,13 @@ export const name = columnHelper.accessor(
<Authorized authorizations="K8sServiceW" childrenUnauthorized={name}>
{name}
{isSystem && (
{row.original.IsSystem && (
<Badge type="success" className="ml-2">
System
</Badge>
)}
{isExternal && !isSystem && (
{isExternal && !row.original.IsSystem && (
<Badge className="ml-2">External</Badge>
)}
</Authorized>