fixes FB-1873 (#2400)

Co-authored-by: Kord Campbell <kord@Bob.local>
Co-authored-by: Fletcher Haynes <fletcher@capitalprawn.com>
This commit is contained in:
Коrd Campbell 2023-01-11 17:48:03 -07:00 committed by GitHub
parent af475a27f2
commit 17cb2cbb77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -50,16 +50,44 @@ export const QueryContainer: FC<{}> = () => {
});
const handleHTTPQueryMessages = (response) => {
setIsSQL3(true)
console.log(response.data.error);
if (response.status === 400) {
// SQL is true
setIsSQL3(true);
// check status of result
if (response.status >= 400 && response.status < 500) {
// response had status 400-499
streamingResults.error = response.data.error;
setErrorResult(streamingResults);
} else if (response.data.error != undefined) {
// response contained an error, but returned outside 400 range
streamingResults.error = response.data.error;
setErrorResult(streamingResults);
} else {
// sets the history
let recentQueries = JSON.parse(
localStorage.getItem('recent-queries') || '[]'
);
const lastQuery = localStorage.getItem('last-query');
recentQueries.unshift(lastQuery);
recentQueries = uniqBy(recentQueries);
if (recentQueries.length > 10) {
localStorage.setItem(
'recent-queries',
JSON.stringify(recentQueries.slice(0, 9))
);
} else {
localStorage.setItem('recent-queries', JSON.stringify(recentQueries));
}
// stream results for display
streamingResults.roundtrip = moment.duration(moment().diff(startTime)).as('milliseconds');
streamingResults.headers = response.data.schema.fields;
streamingResults.duration = response.data["execution-time"];
streamingResults.rows = response.data.data;
setErrorResult(undefined);
setResults([streamingResults]);
setResults([streamingResults, ...results]);
}
setLoading(false);
}
@ -81,6 +109,7 @@ export const QueryContainer: FC<{}> = () => {
streamingResults.error = statusMessage;
setErrorResult(streamingResults);
} else {
// sets the history
let recentQueries = JSON.parse(
localStorage.getItem('recent-queries') || '[]'
);
@ -148,8 +177,6 @@ export const QueryContainer: FC<{}> = () => {
setIsSQL3(false)
handleHTTPQueryMessages(e.response);
}
});
}
}
@ -173,4 +200,4 @@ export const QueryContainer: FC<{}> = () => {
isSQL3={isSQL3}
/>
);
};
};