fix: StartingStepOpenWorkspace render

Signed-off-by: Oleksii Orel <oorel@redhat.com>
eclipse-che · Sep 30, 2024 · 211933a · 211933a
1 parent c5b25c9
commit 211933a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/...end/src/components/WorkspaceProgress/StartingSteps/OpenWorkspace/__tests__/index.spec.tsx b/...end/src/components/WorkspaceProgress/StartingSteps/OpenWorkspace/__tests__/index.spec.tsx
@@ -391,6 +391,29 @@ describe('Starting steps, opening an editor', () => {
         .build();
     });
 
+    test('should not show notification alert if STARTING', async () => {
+      store = new FakeStoreBuilder()
+        .withDevWorkspaces({
+          workspaces: [
+            new DevWorkspaceBuilder()
+              .withName(workspaceName)
+              .withNamespace(namespace)
+              .withStatus({ phase: 'STARTING' })
+              .build(),
+          ],
+        })
+        .build();
+      renderComponent(store);
+      jest.runAllTimers();
+
+      // trigger timeout
+      const timeoutButton = screen.queryByRole('button', {
+        name: 'onTimeout',
+      });
+      expect(timeoutButton).toBeNull();
+      expect(mockOnError).not.toHaveBeenCalled();
+    });
+
     test('notification alert', async () => {
       renderComponent(store);
       jest.runAllTimers();

diff --git a/...dashboard-frontend/src/components/WorkspaceProgress/StartingSteps/OpenWorkspace/index.tsx b/...dashboard-frontend/src/components/WorkspaceProgress/StartingSteps/OpenWorkspace/index.tsx
@@ -233,8 +233,8 @@ class StartingStepOpenWorkspace extends ProgressStep<Props, State> {
   render(): React.ReactNode {
     const { distance, hasChildren } = this.props;
     const { name, lastError } = this.state;
-
-    const isActive = distance === 0;
+    const workspace = this.findTargetWorkspace(this.props);
+    const isActive = workspace?.isRunning && distance === 0;
     const isError = false;
     const isWarning = lastError !== undefined;