Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

set scale to default to false on report plots if we get a report without scaling informaiton #917

Merged
merged 4 commits into from
Apr 30, 2021
Merged

set scale to default to false on report plots if we get a report without scaling informaiton #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c00231f
set scale to default to false on report plots if we get a report with…
rwblair Apr 30, 2021
7c5a431
fix br tag not being closed in status
rwblair Apr 30, 2021
df07958
pass our scale variable in loadReports when generating new report ins…
rwblair Apr 30, 2021
d556b27
variable context for previous commit was incorrect
rwblair Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions neuroscout/frontend/src/analysis_builder/Report.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ export class Report extends React.Component<ReportProps, ReportState> {
if (res.result === undefined) {
return;
}
let scale = true;
let scale = false;
if (this.state.scale !== undefined) {
scale = this.state.scale;
} else if (res.scale !== null) {
Expand All @@ -270,7 +270,7 @@ export class Report extends React.Component<ReportProps, ReportState> {
state.reportTraceback = res.traceback;
this.setState({reportsPosted: true});
} else if (res.statusCode === 404 && !this.state.reportsPosted) {
this.generateReport();
this.generateReport(false);
this.setState({reportsPosted: true, reportsLoaded: false});
return;
} else {
Expand Down
119 changes: 61 additions & 58 deletions neuroscout/frontend/src/analysis_builder/Status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class Submit extends React.Component<submitProps, {tosAgree: boolean, val
<div className="statusTOS">
{!this.props.name &&
<span>
<br/><Alert message="Analysis needs name to be generated" type="warning" showIcon={true} closable={true} />
<br /><Alert message="Analysis needs name to be generated" type="warning" showIcon={true} closable={true} />
</span>
}
<br/>
Expand Down Expand Up @@ -268,65 +268,68 @@ export class StatusTab extends React.Component<submitProps, statusTabState> {
this.analysisIdChange(this.props.analysisId);
return(
<div>
<div className="statusHeader">
{this.props.userOwns &&
<>
<PubAccess private={this.props.private} updateAnalysis={this.props.updateAnalysis!} />
<span>{' '}</span>
</>}
<DateTag modified_at={this.props.modified_at} />
<StatusTag status={this.props.status} analysisId={this.props.analysisId} />
</div>
{this.props.children}
{(this.props.status === 'PASSED') &&
<div>
<h3>Analysis Passed</h3>
<p>
{this.props.userOwns && 'Congratulations, your analysis has been compiled!'}
<br>Run the analysis with this this command, replacing '/local/out' with a local directory.
See the <a href="https://neuroscout.github.io/neuroscout/cli/">neuroscout-cli documentation </a>
for a complete user guide.
</p>
<pre>
<code>
docker run --rm -it -v /local/outputdirectory:/out
{` neuroscout/neuroscout-cli${this.state.imageVersion}`} run /out {this.props.analysisId}
</code>
</pre>
<Card size="small" title="System Requirements" style={{ width: 400 }}>
<p>OS: Windows/Linux/Mac OS with <a href="https://docs.docker.com/install/">Docker</a></p>
<p>RAM: 8GB+ RAM</p>
<p>Disk space: 4GB + ~1 GB/subject</p>
</Card>
<br/>
<div className="statusHeader">
{this.props.userOwns &&
<>
<PubAccess private={this.props.private} updateAnalysis={this.props.updateAnalysis!} />
<span>{' '}</span>
</>
}
<DateTag modified_at={this.props.modified_at} />
<StatusTag status={this.props.status} analysisId={this.props.analysisId} />
</div>
}
{(this.props.status === 'DRAFT' || this.props.status === 'FAILED') &&
<Submit
status={this.props.status}
name={this.props.name}
analysisId={this.props.analysisId}
confirmSubmission={this.props.confirmSubmission}
private={this.props.private}
/>
}
{(this.props.status === 'FAILED') &&
<div>
<br/>
<Tracebacks
message="Analysis failed to compile"
traceback={this.state.compileTraceback}
{this.props.children}
{(this.props.status === 'PASSED') &&
<div>
<h3>Analysis Passed</h3>
<p>
{this.props.userOwns && 'Congratulations, your analysis has been compiled!'}
<br />Run the analysis with this this command, replacing '/local/out' with a local directory.
See the <a href="https://neuroscout.github.io/neuroscout/cli/">neuroscout-cli documentation </a>
for a complete user guide.
</p>
<pre>
<code>
docker run --rm -it -v /local/outputdirectory:/out
{` neuroscout/neuroscout-cli${this.state.imageVersion}`} run /out {this.props.analysisId}
</code>
</pre>
<Card size="small" title="System Requirements" style={{ width: 400 }}>
<p>OS: Windows/Linux/Mac OS with <a href="https://docs.docker.com/install/">Docker</a></p>
<p>RAM: 8GB+ RAM</p>
<p>Disk space: 4GB + ~1 GB/subject</p>
</Card>
<br/>
</div>
}
{(this.props.status === 'DRAFT' || this.props.status === 'FAILED') &&
<Submit
status={this.props.status}
name={this.props.name}
analysisId={this.props.analysisId}
confirmSubmission={this.props.confirmSubmission}
private={this.props.private}
/>
<br/>
</div>
}
{(this.props.status === 'PENDING' || this.props.status === 'SUBMITTING') &&
<div>
<h3>Analysis Pending Generation</h3>
<p>Analysis generation may take some time. This page will update when complete.</p>
</div>
}
{this.state.nvUploads && this.nvStatus(this.state.nvUploads)}
}
{(this.props.status === 'FAILED') &&
<div>
<br/>
<Tracebacks
message="Analysis failed to compile"
traceback={this.state.compileTraceback}
/>
<br/>
</div>
}
{(this.props.status === 'PENDING' || this.props.status === 'SUBMITTING') &&
<div>
<h3>Analysis Pending Generation</h3>
<p>Analysis generation may take some time. This page will update when complete.</p>
</div>
}
{this.state.nvUploads &&
this.nvStatus(this.state.nvUploads)
}
</div>
);
}
Expand Down