Fix SideNav links when navigation from a cluster-scoped page

When navigating from a cluster-scoped resource / list, e.g. ClusterTasks, to any namespaced resource / list, the URL should include the namespace of the currently selected global namespace filter. This will become even more important once the namespace dropdown is moved to the header in the very near future. Use the selected namespace instead of the URL as the source of truth when determining whether the target URL should include the namespace as it will not be present in the current URL when viewing cluster scoped resources.
zhonghuilin · Jan 13, 2022 · 856878f · 856878f
1 parent 7871ba1
commit 856878f
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/containers/SideNav/SideNav.js b/src/containers/SideNav/SideNav.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 The Tekton Authors
+Copyright 2019-2022 The Tekton Authors
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -48,7 +48,7 @@ function SideNav({ expanded, intl, showKubernetesResources }) {
   const location = useLocation();
   const { namespace } = useParams();
 
-  const { selectNamespace } = useSelectedNamespace();
+  const { selectedNamespace, selectNamespace } = useSelectedNamespace();
   const tenantNamespace = useTenantNamespace();
   const { data: extensions = [] } = useExtensions(
     {
@@ -74,8 +74,15 @@ function SideNav({ expanded, intl, showKubernetesResources }) {
   }
 
   function getPath(path, namespaced = true) {
-    if (namespaced && namespace && namespace !== ALL_NAMESPACES) {
-      return urls.byNamespace({ namespace, path });
+    if (
+      namespaced &&
+      selectedNamespace &&
+      selectedNamespace !== ALL_NAMESPACES
+    ) {
+      return urls.byNamespace({
+        namespace: selectedNamespace,
+        path
+      });
     }
 
     return path;