Skip to content

[Bug fix] DAT-126: Prevent crashes on directly navigating to classifcations and results pages #20

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

Open
tonyc856 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Bug fix] DAT-126: Prevent crashes on directly navigating to classifcations and results pages #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/SetList/SetList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@ export default class SetList extends Component {
}

getClassificationResults = () => {
const data = this.props.location.state.results; // classification results passed in from Classify view
let categories = Object.keys(data);
const results = categories.map(category => {
return {category: category, data: data[category]};
});
this.setState({
results: results
});
if (this.props.location.state) {
const data = this.props.location.state.results; // classification results passed in from Classify view
let categories = Object.keys(data);
const results = categories.map(category => {
return {category: category, data: data[category]};
});
this.setState({
results: results
});
} else {
this.props.history.push('/');
}
};

renderResultsView = (index) => {
Expand Down
26 changes: 15 additions & 11 deletions src/SetList/SetResults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@ export default class SetResult extends Component {
}

componentWillMount() {
const jsonData = this.props.location.state.data;
const download = {
filename: this.generateDownloadFilename(jsonData),
rhef: this.generateDownloadHref(jsonData)
};
this.setState({
title: this.props.location.state.data.category,
results: this.props.location.state.data.data,
download: download
});
if (this.props.location.state) {
const jsonData = this.props.location.state.data;
const download = {
filename: this.generateDownloadFilename(jsonData),
rhef: this.generateDownloadHref(jsonData)
};
this.setState({
title: this.props.location.state.data.category,
results: this.props.location.state.data.data,
download: download
});
} else {
this.props.history.push('/');
}
}

generateDownloadFilename = (jsonData) => {
Expand Down Expand Up @@ -104,7 +108,7 @@ export default class SetResult extends Component {
</Button>
</Grid>
<Grid item>
{this.renderClassifications(this.state.results)}
{this.state.results ? this.renderClassifications(this.state.results) : null}
</Grid>
</Grid>
</div>
Expand Down