Skip to content
Snippets Groups Projects
Commit a597ff4f authored by Erlend Ydse's avatar Erlend Ydse
Browse files

Fix errorview not showing up on error

parent 30cd1506
Branches issue-10-fxmapcontrol
No related tags found
No related merge requests found
......@@ -138,15 +138,7 @@ export default function QueryRecorder() {
);
const t1 = performance.now();
setRecordingTime(t1 - t0);
if (result.error === 'cancelled') {
updateContext(
result,
t1 - t0,
recordingLabel,
recordingColor,
'Query was cancelled'
);
} else if (result?.error) {
if (result?.error) {
let error;
if (result.error?.info) {
const errorcode = JSON.stringify(
......@@ -160,6 +152,8 @@ export default function QueryRecorder() {
2
);
error = `Errorcode: ${errorcode}\n${errormsg}`;
} else if (result.error === 'cancelled') {
error = 'Query was cancelled';
} else {
error = String(result.error);
}
......
......@@ -12,7 +12,7 @@ export interface Recording {
optimizerTrace?: ResultValue[][];
queryOutput?: QueryOutput;
explainAnalyze: boolean;
explainAnalyzeTree: ExplainAnalyzeNode;
explainAnalyzeTree?: ExplainAnalyzeNode;
error?: string;
label: string; // On both in order to avoid having to create an 'activeRecordingListItem'
uuid: string;
......
......@@ -108,16 +108,13 @@ export default class SqlManager {
if (result?.error) {
stateCallback?.call(undefined, 'Error detected, aborting monitoring');
await this.reset();
stateCallback?.call(undefined, 'Getting optimizer trace');
const optimizerTrace = await this.runner.getOptimizerTrace();
stateCallback?.call(undefined, '');
return {
result,
optimizerTrace: DataProcessor.processOptimizerTrace(
optimizerTrace.results
),
error: result.error,
explainAnalyze: DataProcessor.processExplainAnalyze(result.results),
explainAnalyze: result.results
? DataProcessor.processExplainAnalyze(result.results)
: undefined,
};
}
stateCallback?.call(undefined, 'Getting optimizer trace');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment