Merge branch 'dev' into 'master'

Dev

See merge request erlenyd/mysql-query-profiler!81

app/components/QueryRecorder.tsx

@@ -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);
         }

app/package.json

 {
   "name": "mysql-query-profiler",
   "productName": "MySQL Query Profiler",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A profiler for MySQL queries using Electron and React",
   "main": "./main.prod.js",
   "author": {

app/types/Recording.ts

@@ -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;

backend/recorder/SqlManager.ts

@@ -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');