fix: separate path and query params

Author: PeterYurkovich

web/src/components/dashboards/legacy/legacy-dashboard-page.tsx

@@ -58,7 +58,7 @@ const LegacyDashboardsPage_: FC<LegacyDashboardsPageProps> = ({ urlBoard }) => {
 const LegacyDashboardsPageWithFallback = withFallback(LegacyDashboardsPage_);
 
 export const MpCmoLegacyDashboardsPage: FC = () => {
-  const params = useParams<{ ns?: string; dashboardName: string }>();
+  const params = useParams<{ dashboardName: string }>();
 
   return (
     <MonitoringProvider monitoringContext={{ plugin: 'monitoring-plugin', prometheus: 'cmo' }}>

web/src/components/dashboards/legacy/useLegacyDashboards.ts

@@ -124,7 +124,7 @@ export const useLegacyDashboards = (namespace: string, urlBoard: string) => {
       const queryArguments = getAllQueryArguments();
       const params = new URLSearchParams(queryArguments);
 
-      const url = getLegacyDashboardsUrl(perspective, newBoard) + params.toString();
+      const url = `${getLegacyDashboardsUrl(perspective, newBoard)}?${params.toString()}`;
 
       if (newBoard !== urlBoard || initialLoad) {
         if (params.get(QueryParams.Dashboard) !== newBoard) {

web/src/components/dashboards/legacy/useOpenshiftProject.ts

@@ -27,23 +27,23 @@ export const useOpenshiftProject = () => {
     // set the activeNamespace to match the URL parameter
     if (openshiftProject && openshiftProject !== activeNamespace) {
       setActiveNamespace(openshiftProject);
-      if (variableNamespace !== openshiftProject) {
+      if (variableNamespace !== openshiftProject && openshiftProject !== ALL_NAMESPACES_KEY) {
         dispatch(
           dashboardsPatchVariable('namespace', {
             // Dashboards space variable shouldn't use the ALL_NAMESPACES_KEY
-            value: openshiftProject === ALL_NAMESPACES_KEY ? '' : openshiftProject,
+            value: openshiftProject,
           }),
         );
       }
       return;
     }
     if (!openshiftProject) {
       setOpenshiftProject(activeNamespace);
-      if (variableNamespace !== activeNamespace) {
+      if (variableNamespace !== activeNamespace && openshiftProject !== ALL_NAMESPACES_KEY) {
         // Dashboards space variable shouldn't use the ALL_NAMESPACES_KEY
         dispatch(
           dashboardsPatchVariable('namespace', {
-            value: activeNamespace === ALL_NAMESPACES_KEY ? '' : activeNamespace,
+            value: activeNamespace,
           }),
         );
       }