fix: cancel previous multipart request if the new one starts

Author: astandrik

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

@@ -145,6 +145,8 @@ export default function QueryEditor(props: QueryEditorProps) {
         const queryId = uuidv4();
 
         if (isStreamingEnabled) {
+            queryManagerInstance.abortQuery();
+
             const query = streamQuery({
                 actionType: 'execute',
                 query: text,
@@ -155,6 +157,8 @@ export default function QueryEditor(props: QueryEditorProps) {
 
             queryManagerInstance.registerQuery(query);
         } else {
+            queryManagerInstance.abortQuery();
+
             const query = sendQuery({
                 actionType: 'execute',
                 query: text,

src/store/reducers/query/query.ts

@@ -296,6 +296,10 @@ export const queryApi = api.injectEndpoints({
                     return {data: null};
                 } catch (error) {
                     const state = getState() as RootState;
+                    if (state.query.result?.startTime !== startTime) {
+                        // This query is no longer current, don't update state
+                        return {error};
+                    }
                     dispatch(
                         setQueryResult({
                             ...state.query.result,
@@ -321,7 +325,7 @@ export const queryApi = api.injectEndpoints({
                     enableTracingLevel,
                     queryId,
                 },
-                {signal, dispatch},
+                {signal, dispatch, getState},
             ) => {
                 const startTime = Date.now();
                 dispatch(
@@ -410,6 +414,11 @@ export const queryApi = api.injectEndpoints({
                     );
                     return {data: null};
                 } catch (error) {
+                    const state = getState() as RootState;
+                    if (state.query.result?.startTime !== startTime) {
+                        // This query is no longer current, don't update state
+                        return {error};
+                    }
                     dispatch(
                         setQueryResult({
                             type: actionType,