Revert dashboard related changes.

notoraptor · Dec 8, 2022 · bb042f5 · bb042f5
1 parent 61b89a2
commit bb042f5
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 493 deletions.
diff --git a/.github/workflows/orion/add_uncompleted_experiment.py b/.github/workflows/orion/add_uncompleted_experiment.py
diff --git a/.github/workflows/orion/db_dashboard_full_with_uncompleted_experiment.pkl b/.github/workflows/orion/db_dashboard_full_with_uncompleted_experiment.pkl
diff --git a/dashboard/src/src/__tests__/experiments.databasePage.test.js b/dashboard/src/src/__tests__/experiments.databasePage.test.js
@@ -60,11 +60,6 @@ test('Test if experiment trials are loaded', async () => {
   // Select an experiment
   expect(experiment).toBeInTheDocument();
   await user.click(experiment);
-  expect(
-    await screen.findByText(
-      `Loading trials for experiment "2-dim-shape-exp" ...`
-    )
-  ).toBeInTheDocument();
 
   // Check if trials are loaded
   await waitForExperimentToBeLoaded('2-dim-shape-exp');

diff --git a/dashboard/src/src/experiments/Experiments.js b/dashboard/src/src/experiments/Experiments.js
@@ -38,15 +38,15 @@ class Experiments extends Component {
   renderPage() {
     switch (this.props.match.params.page || 'landing') {
       case 'landing':
-        return <LandingPage key={this.state.experiment} />;
+        return <LandingPage />;
       case 'status':
-        return <StatusPage key={this.state.experiment} />;
+        return <StatusPage />;
       case 'visualizations':
-        return <VisualizationsPage key={this.state.experiment} />;
+        return <VisualizationsPage />;
       case 'database':
-        return <DatabasePage key={this.state.experiment} />;
+        return <DatabasePage />;
       case 'configuration':
-        return <ConfigurationPage key={this.state.experiment} />;
+        return <ConfigurationPage />;
       default:
         break;
     }

diff --git a/dashboard/src/src/experiments/components/ExperimentNavBar/ExperimentNavBar.js b/dashboard/src/src/experiments/components/ExperimentNavBar/ExperimentNavBar.js
@@ -1,13 +1,7 @@
 import React from 'react';
+import ProgressBar from 'react-bootstrap/ProgressBar';
 import { Backend } from '../../../utils/queryServer';
 import { BackendContext } from '../../BackendContext';
-import { ExperimentStatusBar } from '../ExperimentStatusBar';
-
-/**
- * TODO: Try to load bar only for displayed experiments in navbar (e.g. use progressive loading)
- * TODO: Compute progress bar using max(nb_trials, max_trials) instead of number of trials
- * TODO: If max_trials is infinite, display a message like N/A
- */
 
 import {
   SideNav,
@@ -110,7 +104,12 @@ export class ExperimentNavBar extends React.Component {
           <span title={experiment}>{experiment}</span>
         </StructuredListCell>
         <StructuredListCell>
-          <ExperimentStatusBar name={experiment} />
+          <ProgressBar>
+            <ProgressBar variant="success" now={35} key={1} />
+            <ProgressBar variant="warning" now={20} key={2} />
+            <ProgressBar variant="danger" now={10} key={3} />
+            <ProgressBar variant="info" now={15} key={4} />
+          </ProgressBar>
         </StructuredListCell>
       </StructuredListRow>
     ));