Fix feedback and add test

Signed-off-by: David Kwon <dakwon@redhat.com>
eclipse-che · Jun 16, 2022 · 06cc24e · 06cc24e
1 parent 4a4d43c
commit 06cc24e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/packages/dashboard-frontend/src/Layout/ErrorReporter/Issue/index.tsx b/packages/dashboard-frontend/src/Layout/ErrorReporter/Issue/index.tsx
@@ -108,8 +108,8 @@ export class IssueComponent extends React.PureComponent<Props> {
       };
     };
 
-    let ideLoader;
-    let workspaceDetails;
+    let ideLoader: React.ReactNode;
+    let workspaceDetails: React.ReactNode;
 
     if (workspaceRoutes) {
       ideLoader = (

diff --git a/packages/dashboard-frontend/src/preload/__tests__/location.spec.ts b/packages/dashboard-frontend/src/preload/__tests__/location.spec.ts
@@ -10,7 +10,8 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { buildFactoryLoaderPath } from '../';
+import SessionStorageService, { SessionStorageKey } from '../../services/session-storage';
+import { buildFactoryLoaderPath, storePathIfNeeded } from '../';
 
 describe('Location test', () => {
   test('new policy', () => {
@@ -49,3 +50,22 @@ describe('Location test', () => {
     );
   });
 });
+
+describe('storePathnameIfNeeded test', () => {
+  let mockUpdate: jest.Mock;
+
+  beforeAll(() => {
+    mockUpdate = jest.fn();
+    SessionStorageService.update = mockUpdate;
+  });
+
+  test('empty path', () => {
+    storePathIfNeeded('/');
+    expect(mockUpdate).toBeCalledTimes(0);
+  });
+
+  test('regular path', () => {
+    storePathIfNeeded('/test');
+    expect(mockUpdate).toBeCalledWith(SessionStorageKey.ORIGINAL_LOCATION_PATH, '/test');
+  });
+});
diff --git a/packages/dashboard-frontend/src/preload/index.ts b/packages/dashboard-frontend/src/preload/index.ts
@@ -17,12 +17,7 @@ import SessionStorageService, { SessionStorageKey } from '../services/session-st
     return;
   }
 
-  if (window.location.pathname !== '/') {
-    SessionStorageService.update(
-      SessionStorageKey.ORIGINAL_LOCATION_PATH,
-      window.location.pathname,
-    );
-  }
+  storePathIfNeeded(window.location.pathname);
 
   const hash = window.location.hash.replace(/(\/?)#(\/?)/, '#');
   if (hash.startsWith('#http')) {
@@ -37,6 +32,12 @@ import SessionStorageService, { SessionStorageKey } from '../services/session-st
   }
 })();
 
+export function storePathIfNeeded(path: string) {
+  if (path !== '/') {
+    SessionStorageService.update(SessionStorageKey.ORIGINAL_LOCATION_PATH, path);
+  }
+}
+
 export function buildFactoryLoaderPath(url: string): string {
   const fullUrl = new window.URL(url);
   const editor = extractUrlParam(fullUrl, 'che-editor');

diff --git a/packages/dashboard-frontend/src/services/bootstrap/index.ts b/packages/dashboard-frontend/src/services/bootstrap/index.ts
@@ -285,8 +285,8 @@ export default class Bootstrap {
       return;
     }
 
-    if (workspace.isRunning) {
-      window.location.href = workspace.ideUrl!;
+    if (workspace.isRunning && workspace.ideUrl) {
+      window.location.href = workspace.ideUrl;
       return;
     }