diff --git a/src/components/experiment-list/experiment-list-element.js b/src/components/experiment-list/experiment-list-element.js index 546f6ffe5bec7d450acf28e0fdb611f666b494ab..0ff1c462ce33adef3676b237b4146b489fd38580 100644 --- a/src/components/experiment-list/experiment-list-element.js +++ b/src/components/experiment-list/experiment-list-element.js @@ -1,4 +1,5 @@ import React from 'react'; +import { Link } from 'react-router-dom'; import { FaTrash, FaFileExport, FaShareAlt, FaClone } from 'react-icons/fa'; import { RiPlayFill, RiPlayLine, RiPlayList2Fill } from 'react-icons/ri'; import { VscTriangleUp, VscTriangleDown } from 'react-icons/vsc'; @@ -161,15 +162,16 @@ export default class ExperimentListElement extends React.Component { }}> <div className='btn-group' role='group' > {exp.rights.launch ? - <button - onClick={() => { - ExperimentExecutionService.instance.startNewExperiment(exp, false); - }} + /*<button + onClick={() => this.openExperimentWorkbench(exp)} disabled={this.isLaunchDisabled()} className='nrp-btn btn-default' title={this.launchButtonTitle} > <AiFillExperiment className='icon' />Open - </button> + </button>*/ + <Link to={'/experiment/' + exp.id} className="nrp-btn btn-default" disabled={this.isLaunchDisabled()}> + <AiFillExperiment className='icon' />Open + </Link> : null} {/*exp.rights.launch && config.brainProcesses > 1 ? diff --git a/src/components/experiment-workbench/experiment-workbench.js b/src/components/experiment-workbench/experiment-workbench.js index 771a93765d71e48d2f4a7183e9ad187e31b0199a..6b3a668aaaec41dcf246c8a62757bdc181179f30 100644 --- a/src/components/experiment-workbench/experiment-workbench.js +++ b/src/components/experiment-workbench/experiment-workbench.js @@ -59,7 +59,7 @@ export default class ExperimentWorkbench extends React.Component { } async componentDidMount() { - await this.updateSimulationInfo(); + //await this.updateSimulationInfo(); let experiments = await ExperimentStorageService.instance.getExperiments(); this.experimentInfo = experiments.find(experiment => experiment.id === this.experimentID); console.info('ExperimentWorkbench - experimentInfo'); @@ -68,7 +68,7 @@ export default class ExperimentWorkbench extends React.Component { let experimentName = this.experimentInfo.configuration.name; this.setState({experimentName: experimentName}); - let server = this.experimentInfo.joinableServers.find( + /*let server = this.experimentInfo.joinableServers.find( server => server.runningSimulation.creationUniqueID === this.state.simulationInfo.creationUniqueID); this.serverConfig = await ServerResourcesService.instance.getServerConfig(server.server); console.info('this.serverConfig'); @@ -78,15 +78,15 @@ export default class ExperimentWorkbench extends React.Component { (data) => { this.onStatusInfoROS(data); } - ); + );*/ } - async updateSimulationInfo() { + /*async updateSimulationInfo() { let simInfo = await RunningSimulationService.instance.getInfo(this.serverURL, this.simulationID); this.setState({simulationInfo: simInfo}); console.info('SimulationView.updateSimulationInfo - simulationInfo'); console.info(this.state.simulationInfo); - } + }*/ onStatusInfoROS(message) { this.setState({ diff --git a/src/services/experiments/files/experiment-storage-service.js b/src/services/experiments/files/experiment-storage-service.js index 36942d6c996b583b2dbb7d4d59b2cfd4aaea494f..60203559d889e593e4e69c8fb49251dc8a7599d1 100644 --- a/src/services/experiments/files/experiment-storage-service.js +++ b/src/services/experiments/files/experiment-storage-service.js @@ -74,7 +74,6 @@ class ExperimentStorageService extends HttpService { if (!this.experiments || forceUpdate) { try { let experimentList = await (await this.httpRequestGET(storageExperimentsURL)).json(); - console.info(['ExperimentStorageService.getExperiments()', experimentList]); // filter out experiments with incomplete configuration (probably storage corruption) experimentList = experimentList.filter(experiment => experiment.configuration); this.sortExperiments(experimentList);