Reduce nesting in if-statement

This commit is contained in:
Koen Vlaswinkel
2023-03-31 16:13:22 +02:00
parent b4b020800e
commit cb2b4f432a

View File

@@ -162,30 +162,28 @@ export class ResultsApp extends React.Component<
private updateStateWithNewResultsInfo(resultsInfo: ResultsInfo): void { private updateStateWithNewResultsInfo(resultsInfo: ResultsInfo): void {
this.setState((prevState) => { this.setState((prevState) => {
if (resultsInfo === null) { if (resultsInfo === null && prevState.isExpectingResultsUpdate) {
if (prevState.isExpectingResultsUpdate) { // Display loading message
// Display loading message return {
return { displayedResults: {
displayedResults: { resultsInfo: null,
resultsInfo: null, results: null,
results: null, errorMessage: "Loading results…",
errorMessage: "Loading results…", },
}, isExpectingResultsUpdate: prevState.isExpectingResultsUpdate,
isExpectingResultsUpdate: prevState.isExpectingResultsUpdate, nextResultsInfo: resultsInfo,
nextResultsInfo: resultsInfo, };
}; } else if (resultsInfo === null) {
} else { // No results to display
// No results to display return {
return { displayedResults: {
displayedResults: { resultsInfo: null,
resultsInfo: null, results: null,
results: null, errorMessage: "No results to display",
errorMessage: "No results to display", },
}, isExpectingResultsUpdate: prevState.isExpectingResultsUpdate,
isExpectingResultsUpdate: prevState.isExpectingResultsUpdate, nextResultsInfo: resultsInfo,
nextResultsInfo: resultsInfo, };
};
}
} }
let results: Results | null = null; let results: Results | null = null;