OCPBUGS-50650: Retain original path when detecting perspective

Author: TheRealJon

frontend/packages/console-app/src/components/detect-perspective/PerspectiveDetector.tsx

@@ -1,9 +1,10 @@
 import * as React from 'react';
+import { useLocation } from 'react-router';
 import { Perspective, ResolvedExtension } from '@console/dynamic-plugin-sdk';
 import { usePerspectives } from '@console/shared/src';
 
 type DetectorProps = {
-  setActivePerspective: (perspective: string) => void;
+  setActivePerspective: (perspective: string, next: string) => void;
   perspectiveExtensions: Perspective[];
   detectors: (
     | undefined
@@ -12,14 +13,15 @@ type DetectorProps = {
 };
 
 type PerspectiveDetectorProps = {
-  setActivePerspective: (perspective: string) => void;
+  setActivePerspective: (perspective: string, next: string) => void;
 };
 
 const Detector: React.FC<DetectorProps> = ({
   setActivePerspective,
   perspectiveExtensions,
   detectors,
 }) => {
+  const { pathname } = useLocation() ?? {};
   let detectedPerspective: string;
   const defaultPerspective =
     perspectiveExtensions.find((p) => p.properties.default) || perspectiveExtensions[0];
@@ -38,16 +40,17 @@ const Detector: React.FC<DetectorProps> = ({
 
   React.useEffect(() => {
     if (detectedPerspective) {
-      setActivePerspective(detectedPerspective);
+      setActivePerspective(detectedPerspective, pathname);
     } else if (defaultPerspective && (detectors.length < 1 || detectionComplete)) {
       // set default perspective if there are no detectors or none of the detections were successfull
-      setActivePerspective(defaultPerspective.properties.id);
+      setActivePerspective(defaultPerspective.properties.id, pathname);
     }
   }, [
     defaultPerspective,
     detectedPerspective,
     detectionComplete,
     detectors.length,
+    pathname,
     setActivePerspective,
   ]);
 

frontend/packages/console-app/src/components/detect-perspective/__tests__/PerspectiveDetector.spec.tsx

@@ -14,6 +14,13 @@ jest.mock('@console/shared/src', () => ({
   usePerspectives: jest.fn(),
 }));
 
+jest.mock('react-router', () => {
+  return {
+    ...require.requireActual('react-router'),
+    useLocation: jest.fn(() => ({ pathname: '' })),
+  };
+});
+
 const mockPerspectives = [
   {
     type: 'console.perspective',
@@ -41,7 +48,7 @@ describe('PerspectiveDetector', () => {
 
     const wrapper = mount(<PerspectiveDetector setActivePerspective={setActivePerspective} />);
     expect(wrapper.isEmptyRender()).toBe(true);
-    expect(setActivePerspective).toHaveBeenCalledWith('admin');
+    expect(setActivePerspective).toHaveBeenCalledWith('admin', '');
   });
 
   it('should set detected perspective if detection is successful', async () => {
@@ -60,7 +67,7 @@ describe('PerspectiveDetector', () => {
       promiseResolver(() => [true, false]);
     });
     expect(wrapper.isEmptyRender()).toBe(true);
-    expect(setActivePerspective).toHaveBeenCalledWith('dev');
+    expect(setActivePerspective).toHaveBeenCalledWith('dev', '');
   });
 
   it('should set default perspective if detection fails', async () => {
@@ -79,7 +86,7 @@ describe('PerspectiveDetector', () => {
       promiseResolver(() => [false, false]);
     });
     expect(wrapper.isEmptyRender()).toBe(true);
-    expect(setActivePerspective).toHaveBeenCalledWith('admin');
+    expect(setActivePerspective).toHaveBeenCalledWith('admin', '');
   });
 
   it('should set admin as default perspective if all perspectives are disabled', async () => {
@@ -127,6 +134,6 @@ describe('PerspectiveDetector', () => {
       promiseResolver(() => [false, false]);
     });
     expect(wrapper.isEmptyRender()).toBe(true);
-    expect(setActivePerspective).toHaveBeenCalledWith('admin');
+    expect(setActivePerspective).toHaveBeenCalledWith('admin', '');
   });
 });

frontend/packages/console-app/src/components/detect-perspective/useValuesForPerspectiveContext.ts

@@ -32,8 +32,6 @@ export const useValuesForPerspectiveContext = (): [
     // Navigate to next or root and let the default page determine where to go to next
     navigate(next || '/');
     fireTelemetryEvent('Perspective Changed', { perspective: newPerspective });
-    // eslint-disable-next-line no-console
-    console.log('DEBUG: setting perspective', newPerspective, next);
   };
 
   return [isValidPerspective ? perspective : undefined, setPerspective, loaded];