diff --git a/src/resources/ConfigMaps/ConfigMapDetails.js b/src/resources/ConfigMaps/ConfigMapDetails.js index cdd5661593..86c0ec896f 100644 --- a/src/resources/ConfigMaps/ConfigMapDetails.js +++ b/src/resources/ConfigMaps/ConfigMapDetails.js @@ -25,7 +25,10 @@ export function ConfigMapDetails(props) { { header: t('common.headers.owner'), value: secret => ( - + ), }, ]; diff --git a/src/resources/DaemonSets/DaemonSetDetails.js b/src/resources/DaemonSets/DaemonSetDetails.js index 09d7c44d01..db39dac2ed 100644 --- a/src/resources/DaemonSets/DaemonSetDetails.js +++ b/src/resources/DaemonSets/DaemonSetDetails.js @@ -64,7 +64,10 @@ export function DaemonSetDetails(props) { { header: t('common.headers.owner'), value: resource => ( - + ), }, ]; diff --git a/src/resources/Deployments/DeploymentDetails.js b/src/resources/Deployments/DeploymentDetails.js index c56da81494..5740639484 100644 --- a/src/resources/Deployments/DeploymentDetails.js +++ b/src/resources/Deployments/DeploymentDetails.js @@ -19,7 +19,10 @@ export function DeploymentDetails(props) { { header: t('common.headers.owner'), value: deployment => ( - + ), }, ]; diff --git a/src/resources/Jobs/JobDetails.js b/src/resources/Jobs/JobDetails.js index 29fa12f29c..6191b331dd 100644 --- a/src/resources/Jobs/JobDetails.js +++ b/src/resources/Jobs/JobDetails.js @@ -44,7 +44,10 @@ export function JobDetails(props) { { header: t('common.headers.owner'), value: job => ( - + ), }, ]; diff --git a/src/resources/Jobs/JobList.js b/src/resources/Jobs/JobList.js index 2595aea6b1..619cc0c807 100644 --- a/src/resources/Jobs/JobList.js +++ b/src/resources/Jobs/JobList.js @@ -21,7 +21,10 @@ export const JobList = props => { { header: t('common.headers.owner'), value: job => ( - + ), }, ]; diff --git a/src/resources/Pods/PodDetails.js b/src/resources/Pods/PodDetails.js index 0081a663cc..f273be37dd 100644 --- a/src/resources/Pods/PodDetails.js +++ b/src/resources/Pods/PodDetails.js @@ -34,7 +34,10 @@ export function PodDetails(props) { { header: t('common.headers.owner'), value: pod => ( - + ), }, ]; diff --git a/src/resources/ReplicaSets/ReplicaSetDetails.js b/src/resources/ReplicaSets/ReplicaSetDetails.js index 7599628598..eba5f0ee2f 100644 --- a/src/resources/ReplicaSets/ReplicaSetDetails.js +++ b/src/resources/ReplicaSets/ReplicaSetDetails.js @@ -29,7 +29,10 @@ export function ReplicaSetsDetails(props) { { header: t('common.headers.owner'), value: resource => ( - + ), }, { diff --git a/src/resources/Secrets/SecretDetails.js b/src/resources/Secrets/SecretDetails.js index eeb7236b66..235cc2b478 100644 --- a/src/resources/Secrets/SecretDetails.js +++ b/src/resources/Secrets/SecretDetails.js @@ -35,7 +35,10 @@ export function SecretDetails(props) { { header: t('common.headers.owner'), value: secret => ( - + ), }, ]; diff --git a/src/resources/StatefulSets/StatefulSetDetails.js b/src/resources/StatefulSets/StatefulSetDetails.js index 6c74ed6815..213a572384 100644 --- a/src/resources/StatefulSets/StatefulSetDetails.js +++ b/src/resources/StatefulSets/StatefulSetDetails.js @@ -28,7 +28,10 @@ export function StatefulSetDetails(props) { { header: t('common.headers.owner'), value: set => ( - + ), }, ]; diff --git a/src/shared/components/ControlledBy/ControlledBy.js b/src/shared/components/ControlledBy/ControlledBy.js index 11c1dcafc5..b67af4ee72 100644 --- a/src/shared/components/ControlledBy/ControlledBy.js +++ b/src/shared/components/ControlledBy/ControlledBy.js @@ -9,7 +9,12 @@ import { useUrl } from 'hooks/useUrl'; import { getExtensibilityPath } from 'components/Extensibility/helpers/getExtensibilityPath'; import { Link } from '../Link/Link'; -export const GoToDetailsLink = ({ kind, name, noBrackets = false }) => { +export const GoToDetailsLink = ({ + kind, + name, + namespace, + noBrackets = false, +}) => { const extensions = useRecoilValue(extensionsState); const { namespaceUrl, clusterUrl } = useUrl(); @@ -22,14 +27,14 @@ export const GoToDetailsLink = ({ kind, name, noBrackets = false }) => { if (resource) { const partialPath = pluralize(kind || '')?.toLowerCase(); if (resource.namespaced) { - path = namespaceUrl(`${partialPath}/${name}`); + path = namespaceUrl(`${partialPath}/${name}`, { namespace }); } else { path = clusterUrl(`${partialPath}/${name}`); } } else if (extResource) { const partialPath = getExtensibilityPath(extResource.general); if (extResource.general.scope === 'namespace') { - path = namespaceUrl(`${partialPath}/${name}`); + path = namespaceUrl(`${partialPath}/${name}`, { namespace }); } else { path = clusterUrl(`${partialPath}/${name}`); } @@ -48,6 +53,7 @@ export const GoToDetailsLink = ({ kind, name, noBrackets = false }) => { export const ControlledBy = ({ ownerReferences, + namespace, kindOnly, placeholder = EMPTY_TEXT_PLACEHOLDER, }) => { @@ -57,9 +63,9 @@ export const ControlledBy = ({ ) return placeholder; - const OwnerRef = ({ owner, className }) => { + const OwnerRef = ({ owner }) => { return ( -
+
{owner.kind} {!kindOnly && ( <> @@ -68,6 +74,7 @@ export const ControlledBy = ({ kind={owner.kind} apiVersion={owner.apiVersion} name={owner.name} + namespace={namespace} /> )}