diff --git a/src/components/experiment-list/experiment-list-element.js b/src/components/experiment-list/experiment-list-element.js index e3616935e04ee54648b4759fc964a3da2d2a14f4..fac3130b0310ade7002fc9438b0e0e6b027944fd 100644 --- a/src/components/experiment-list/experiment-list-element.js +++ b/src/components/experiment-list/experiment-list-element.js @@ -119,7 +119,7 @@ export default class ExperimentListElement extends React.Component { <div className='list-entry-middle flex-container up-down'> <div className='flex-container left-right title-line'> <div className='h4'> - {config.name} + {config.SimulationName} </div> {exp.joinableServers.length > 0 ? <div className='exp-title-sim-info'> @@ -128,9 +128,9 @@ export default class ExperimentListElement extends React.Component { : null} </div> <div> - {!this.state.selected && config.description.length > SHORT_DESCRIPTION_LENGTH ? - config.description.substr(0, SHORT_DESCRIPTION_LENGTH) + ' ...' : - config.description} + {!this.state.selected && config.SimDescription.length > SHORT_DESCRIPTION_LENGTH ? + config.SimDescription.substr(0, SHORT_DESCRIPTION_LENGTH) + ' ...' : + config.SimDescription} <br /> </div> @@ -138,14 +138,14 @@ export default class ExperimentListElement extends React.Component { <div className='experiment-details' > <i> Timeout: - {timeDDHHMMSS(config.timeout)} + {timeDDHHMMSS(config.SimulationTimeout)} ({(config.timeoutType === 'simulation' ? 'simulation' : 'real')} time) </i> <br /> - <i> + {/*<i> Brain processes: {config.brainProcesses} </i> - <br /> + <br />*/} <div style={{ display: 'flex' }}> <i style={{ marginTop: '4px' }}>Server status: </i> <i className={'server-icon ' + this.getServerStatusClass()} diff --git a/src/components/experiment-overview/experiment-overview.js b/src/components/experiment-overview/experiment-overview.js index efca5cc231cedc10837d2a24aa90503ce51f1d31..4ddbc2617c8a85488d43efcb46330eb6223af473 100644 --- a/src/components/experiment-overview/experiment-overview.js +++ b/src/components/experiment-overview/experiment-overview.js @@ -106,7 +106,7 @@ export default class ExperimentOverview extends React.Component { onUpdatePublicExperiments(publicExperiments) { this.setState({ - publicExperiments: publicExperiments.filter(exp => exp.configuration.maturity === 'production') + publicExperiments: publicExperiments //.filter(exp => exp.configuration.maturity === 'production') }); } diff --git a/src/services/experiments/files/public-experiments-service.js b/src/services/experiments/files/public-experiments-service.js index 86b3eb167f7fccb3825c69d05853a338d32dc5e1..88e10eaaa525decfdb7b6bdb0039d54bd51d2dc2 100644 --- a/src/services/experiments/files/public-experiments-service.js +++ b/src/services/experiments/files/public-experiments-service.js @@ -86,8 +86,8 @@ class PublicExperimentsService extends HttpService { sortExperiments(experimentList) { experimentList = experimentList.sort( (a, b) => { - let nameA = a.configuration.name.toLowerCase(); - let nameB = b.configuration.name.toLowerCase(); + let nameA = a.configuration.SimulationName.toLowerCase(); + let nameB = b.configuration.SimulationName.toLowerCase(); if (nameA < nameB) { return -1; }