From bdfaeca59a53165026366734f86b64d5b7f4abda Mon Sep 17 00:00:00 2001
From: testa113 <testa113>
Date: Tue, 13 Feb 2024 11:56:37 +1300
Subject: [PATCH] fix(configs): correct 'external' display in tables [EE-6649]

---
 .../configs/ListView/ConfigMapsDatatable/columns/name.tsx | 8 ++++----
 .../configs/ListView/SecretsDatatable/columns/name.tsx    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/columns/name.tsx b/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/columns/name.tsx
index 183548043..ebb354700 100644
--- a/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/columns/name.tsx
+++ b/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/columns/name.tsx
@@ -40,10 +40,10 @@ function Cell({ row }: CellContext<ConfigMapRowData, string>) {
   const isSystemToken = name?.includes('default-token-');
   const isSystemConfigMap = isSystemToken || row.original.isSystem;
 
-  const hasConfigurationOwner =
-    !!row.original.metadata?.labels?.[
-      'io.portainer.kubernetes.configuration.owner'
-    ];
+  const hasConfigurationOwner = !!(
+    row.original.metadata?.labels?.[configurationOwnerUsernameLabel] ||
+    row.original.metadata?.labels?.[appOwnerLabel]
+  );
 
   return (
     <Authorized authorizations="K8sConfigMapsR" childrenUnauthorized={name}>
diff --git a/app/react/kubernetes/configs/ListView/SecretsDatatable/columns/name.tsx b/app/react/kubernetes/configs/ListView/SecretsDatatable/columns/name.tsx
index d4617ab81..fe6ee43a5 100644
--- a/app/react/kubernetes/configs/ListView/SecretsDatatable/columns/name.tsx
+++ b/app/react/kubernetes/configs/ListView/SecretsDatatable/columns/name.tsx
@@ -41,10 +41,10 @@ function Cell({ row }: CellContext<SecretRowData, string>) {
   const isSystemToken = name?.includes('default-token-');
   const isSystemSecret = isSystemToken || row.original.isSystem;
 
-  const hasConfigurationOwner =
-    !!row.original.metadata?.labels?.[
-      'io.portainer.kubernetes.configuration.owner'
-    ];
+  const hasConfigurationOwner = !!(
+    row.original.metadata?.labels?.[configurationOwnerUsernameLabel] ||
+    row.original.metadata?.labels?.[appOwnerLabel]
+  );
 
   return (
     <Authorized authorizations="K8sSecretsR" childrenUnauthorized={name}>