fix: ControlledBy link for all namespaces (#3130)

* fix: controlledby link for all namespaces * fix: controlledby link for all resources
kyma-project · Aug 20, 2024 · 0cda124 · 0cda124
1 parent 8fb0252
commit 0cda124
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 14 deletions.
diff --git 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 => (
-        <ControlledBy ownerReferences={secret.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={secret.metadata.ownerReferences}
+          namespace={secret.metadata.namespace}
+        />
       ),
     },
   ];

diff --git 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 => (
-        <ControlledBy ownerReferences={resource.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={resource.metadata.ownerReferences}
+          namespace={resource.metadata.namespace}
+        />
       ),
     },
   ];

diff --git 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 => (
-        <ControlledBy ownerReferences={deployment.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={deployment.metadata.ownerReferences}
+          namespace={deployment.metadata.namespace}
+        />
       ),
     },
   ];

diff --git 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 => (
-        <ControlledBy ownerReferences={job.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={job.metadata.ownerReferences}
+          namespace={job.metadata.namespace}
+        />
       ),
     },
   ];

diff --git 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 => (
-        <ControlledBy ownerReferences={job.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={job.metadata.ownerReferences}
+          namespace={job.metadata.namespace}
+        />
       ),
     },
   ];

diff --git a/src/resources/Pods/PodDetails.js b/src/resources/Pods/PodDetails.js
diff --git 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 => (
-        <ControlledBy ownerReferences={resource.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={resource.metadata.ownerReferences}
+          namespace={resource.metadata.namespace}
+        />
       ),
     },
     {

diff --git 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 => (
-        <ControlledBy ownerReferences={secret.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={secret.metadata.ownerReferences}
+          namespace={secret.metadata.namespace}
+        />
       ),
     },
   ];

diff --git 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 => (
-        <ControlledBy ownerReferences={set.metadata.ownerReferences} />
+        <ControlledBy
+          ownerReferences={set.metadata.ownerReferences}
+          namespace={set.metadata.namespace}
+        />
       ),
     },
   ];

diff --git 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 (
-      <div key={owner.name} className={className}>
+      <div key={owner.name}>
         {owner.kind}
         {!kindOnly && (
           <>
@@ -68,6 +74,7 @@ export const ControlledBy = ({
               kind={owner.kind}
               apiVersion={owner.apiVersion}
               name={owner.name}
+              namespace={namespace}
             />
           </>
         )}