From 0748b3fae0408d2777300235c12ae74417f355b5 Mon Sep 17 00:00:00 2001
From: Oliwia Gowor <72342415+OliwiaGowor@users.noreply.github.com>
Date: Wed, 5 Feb 2025 11:52:54 +0100
Subject: [PATCH] Revert "fix: Use correct paths for cluster urls (#3652)"

This reverts commit 51f22136e8f3ee64b7184b14775db8c764028aa7.
---
 src/components/CustomResources/CustomResources.js      |  2 +-
 src/resources/CustomResourceDefinitions/CRCreate.js    |  9 +++++++--
 .../CustomResourceDefinitions/useCustomResourceUrl.js  | 10 +++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/CustomResources/CustomResources.js b/src/components/CustomResources/CustomResources.js
index f75fa7908e..f1197b8ff2 100644
--- a/src/components/CustomResources/CustomResources.js
+++ b/src/components/CustomResources/CustomResources.js
@@ -19,7 +19,7 @@ export function CustomResources({
 }) {
   const { group, names } = crd.spec;
   const name = names.plural;
-  const customUrl = useCustomResourceUrl(crd);
+  const customUrl = useCustomResourceUrl(crd, true);
   const { namespace } = useUrl();
   const resourceUrl =
     namespace && namespace !== '-all-'
diff --git a/src/resources/CustomResourceDefinitions/CRCreate.js b/src/resources/CustomResourceDefinitions/CRCreate.js
index f078fcae7d..c12f7a1aca 100644
--- a/src/resources/CustomResourceDefinitions/CRCreate.js
+++ b/src/resources/CustomResourceDefinitions/CRCreate.js
@@ -28,11 +28,16 @@ function CRCreate({
   const [initialResource] = useState(
     initialCustomResource || createTemplate(crd),
   );
-  const customUrl = useCustomResourceUrl(crd);
+  const currUrl = window.location.href;
+
+  const customUrl = useCustomResourceUrl(
+    crd,
+    currUrl.includes('customresources/'),
+  );
 
   const navigate = useNavigate();
   const { nextQuery, currentQuery } = usePrepareLayout(layoutNumber);
-  const goToLayoutQuery = customUrl(cr)?.includes('customresources/')
+  const goToLayoutQuery = customUrl(cr).includes('customresources/')
     ? nextQuery
     : currentQuery;
 
diff --git a/src/resources/CustomResourceDefinitions/useCustomResourceUrl.js b/src/resources/CustomResourceDefinitions/useCustomResourceUrl.js
index fccc615766..b9a802ac33 100644
--- a/src/resources/CustomResourceDefinitions/useCustomResourceUrl.js
+++ b/src/resources/CustomResourceDefinitions/useCustomResourceUrl.js
@@ -3,8 +3,8 @@ import { useRecoilValue } from 'recoil';
 import { allNodesSelector } from 'state/navigation/allNodesSelector';
 import { useUrl } from 'hooks/useUrl';
 
-export function useCustomResourceUrl(crd) {
-  const { clusterUrl, namespaceUrl } = useUrl();
+export function useCustomResourceUrl(crd, columnLayout = false) {
+  const { resourceUrl, clusterUrl, namespaceUrl } = useUrl();
   const clusterNodes = useRecoilValue(allNodesSelector).filter(
     node => !node.namespaced,
   );
@@ -22,10 +22,14 @@ export function useCustomResourceUrl(crd) {
     );
 
     if (clusterNode) {
+      return resourceUrl(cr, { resourceType: clusterNode.pathSegment });
+    } else if (namespaceNode && !columnLayout) {
+      return resourceUrl(cr, { resourceType: namespaceNode.pathSegment });
+    } else if (crd.spec.scope === 'Cluster') {
       return clusterUrl(
         `customresources/${crd.metadata.name}/${cr.metadata.name}`,
       );
-    } else if (namespaceNode) {
+    } else {
       return namespaceUrl(
         `customresources/${crd.metadata.name}/${cr.metadata.name}`,
         { namespace: cr.metadata.namespace },