From 52c171f4dc48af403106d01f89700cef1dcf653c Mon Sep 17 00:00:00 2001
From: alex <48489896+devnaumov@users.noreply.github.com>
Date: Fri, 26 May 2023 15:20:54 +0200
Subject: [PATCH] CB-3185 stop executing on cancel (#1696)

---
 .../plugin-data-viewer/src/ContainerDataSource.ts      |  4 ++++
 .../src/DatabaseDataModel/DatabaseDataSource.ts        |  1 +
 .../src/DatabaseDataModel/IDatabaseDataSource.ts       |  1 +
 .../packages/plugin-sql-editor/src/QueryDataSource.ts  |  4 ++++
 .../src/SqlResultTabs/SqlQueryService.ts               | 10 +++++++++-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index 6774d706e2..a2e0b3cf26 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -30,6 +30,10 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
     return this.currentTask?.cancellable || false;
   }
 
+  get cancelled(): boolean {
+    return this.currentTask?.cancelled || false;
+  }
+
   constructor(
     readonly serviceInjector: IServiceInjector,
     private readonly graphQLService: GraphQLService,
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
index 5b44500a5c..1fb86f02aa 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
@@ -36,6 +36,7 @@ implements IDatabaseDataSource<TOptions, TResult> {
   outdated: boolean;
 
   abstract get canCancel(): boolean;
+  abstract get cancelled(): boolean;
 
   readonly serviceInjector: IServiceInjector;
   protected disabled: boolean;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
index dfe64ebae6..26633874cb 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
@@ -42,6 +42,7 @@ export interface IDatabaseDataSource<TOptions, TResult extends IDatabaseDataResu
   readonly error: Error | null;
   readonly executionContext: IConnectionExecutionContext | null;
   readonly canCancel: boolean;
+  readonly cancelled: boolean;
   readonly serviceInjector: IServiceInjector;
   readonly outdated: boolean;
 
diff --git a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
index daf7d3a685..af58c1f5b3 100644
--- a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
@@ -31,6 +31,10 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     return this.currentTask?.cancellable || false;
   }
 
+  get cancelled(): boolean {
+    return this.currentTask?.cancelled || false;
+  }
+
   constructor(
     readonly serviceInjector: IServiceInjector,
     protected readonly graphQLService: GraphQLService,
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts
index 6e7f2531a8..cda1900d71 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts
@@ -257,6 +257,8 @@ export class SqlQueryService {
           .setSlice(0)
           .request();
 
+        const cancelled = model.source.cancelled;
+
         statistics.executedQueries++;
         statistics.executeTime += source.requestInfo.requestDuration;
 
@@ -285,7 +287,13 @@ export class SqlQueryService {
 
           model = source = undefined;
         }
+
         options?.onQueryExecuted?.(query, i, true);
+
+        if (cancelled) {
+          break;
+        }
+
       } catch (exception: any) {
         if (model) {
           const tabGroup = this.sqlQueryResultService.createGroup(editorState, model.id, query);
@@ -331,7 +339,7 @@ export class SqlQueryService {
             DatabaseEditAction
           );
 
-          const edited =  editor?.isEdited() && model.source.executionContext?.context;
+          const edited = editor?.isEdited() && model.source.executionContext?.context;
 
           if (edited && activeGroupId !== tabGroup.groupId) {
             this.sqlQueryResultService.selectResult(