Cb 4270 row counter add cancel button for big tables #2545

sergeyteleshev · 2024-04-11T10:23:07Z

No description provided.

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts

webapp/packages/plugin-data-viewer/src/locales/zh.ts

webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx

webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts

webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts

sergeyteleshev · 2024-04-12T14:00:55Z

webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts

@@ -163,6 +163,7 @@ export class SqlQueryResultService {

        // TODO: we need to dispose table model, but don't close execution context, so now we only
        const model = this.tableViewerStorageService.get(group.modelId);
+        model?.source.cancelLoadTotalCount();


since there is no dispose, we need to cancel it in result set tab manually on close

then it's a bug cuz we need to call dispose for each unused table model
but in SQL editor we have special behavior where we can reuse the same model for different queries so check it please

you can move cancelLoadTotalCount call to cancel fn

This reverts commit f8bffa2.

devnaumov · 2024-04-12T14:42:58Z

webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterRowCount.tsx

+      const cancelled = model.source.cancelLoadTotalCountTask?.cancelled;
+
+      if (!cancelled) {
+        notificationService.logException(e, 'data_viewer_total_count_cancel_failed_title', typeof e === 'string' ? e : undefined);


why do we need typeof e === 'string' ? e : undefined here?

devnaumov · 2024-04-12T14:44:52Z

webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterRowCount.tsx

+  return <TotalCountAction loading={loading} resultIndex={resultIndex} model={model} onClick={loadTotalCount} />;
+});
+
+const CancelTotalCountAction = observer(function CancelTotalCountAction({ onClick }: { onClick: VoidFunction }) {


Please do not declare multiple components in one file

devnaumov · 2024-04-12T14:54:19Z

webapp/packages/plugin-data-viewer/src/locales/it.ts

@@ -39,6 +46,7 @@ export default [
  ['data_viewer_refresh_result_set', 'Refresh result set'],
  ['data_viewer_total_count_tooltip', 'Get total count'],
  ['data_viewer_total_count_failed', 'Failed to get total count'],
+  ['data_viewer_total_count_cancel_failed_title', 'Failed to cancel getting of total count'],


I am not sure that we should create new message token as "Task was cancelled" is throw by the task itself

…ig-tables

…functions

webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts

webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts

…esult tab flow

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts

…extended classes

Wroud · 2024-04-16T07:03:26Z

webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts

+
+  async closeResults(results: IDatabaseResultSet[]): Promise<void> {
+    await this.connectionExecutionContextService.load();
+


await this.connectionExecutionContextService.load();
can be removed

Wroud · 2024-04-16T07:03:50Z

webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts

+          model?.source.closeResults?.(model.getResults());
+          model?.cancel();


model.source.closeResults(model.getResults()); model.cancel();

…ig-tables

devnaumov · 2024-04-19T10:55:31Z

webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.tsx

-      <span className={styles.cancelText}>{translate('ui_processing_cancel')}</span>
+    <Container
+      className={s(style, { action: true })}
+      title={loading ? translate('ui_processing_canceling') : translate('ui_processing_cancel')}


translate(loading ? 'ui_processing_canceling' : 'ui_processing_cancel')

Wroud · 2024-04-19T13:58:05Z

webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts

-    if (this.currentTask) {
-      await this.currentTask.cancel();
-    }
+    await Promise.all([this.currentTask?.cancel(), super.cancel()]);


await super.cancel();
await this.currentTask?.cancel()

Wroud · 2024-04-19T13:59:10Z

webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts

+  async cancel(): Promise<void> {
+    await Promise.all([this.cancelLoadTotalCount(), super.cancel()]);
+  }


await super.cancel();
await this.cancelLoadTotalCount();

Wroud · 2024-04-19T14:03:38Z

webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/CancelTotalCountAction.tsx

+  loading: boolean;
+}
+
+export const CancelTotalCountAction = observer(function CancelTotalCountAction({ onClick, loading }: Props) {


please use observer<Props>

Wroud · 2024-04-19T14:04:28Z

webapp/packages/plugin-sql-editor/src/QueryDataSource.ts

-    if (this.currentTask) {
-      await this.currentTask.cancel();
-    }
+    await Promise.all([this.currentTask?.cancel(), super.cancel()]);


await super.cancel();
await this.currentTask?.cancel();

…ig-tables

sergeyteleshev added 3 commits April 10, 2024 17:58

CB-4270 adds cancel option for load total count of rows in table

d4b5296

CB-4270 adds ui for load total count of rows in table

a6da7c5

CB-4270 fix: task cancels in a true way

de7c6e4

sergeyteleshev self-assigned this Apr 11, 2024

sergeyteleshev added 7 commits April 11, 2024 12:25

CB-4270 cleanup

bfcfaa0

CB-4270 cancel load total count on close table tab

7c424c6

CB-4270 cancel load total count on close sql editor tab

110c1d8

CB-4270 fix: cancel close only task if it is not already cancelled

d58b80c

CB-4270 chore: tasks -> cancelLoadTotalCountTasks

9eea88c

CB-4270 stops counting rows when tab closes

9ddb968

CB-4270 reverts incorrect calls of cancelLoadTotalCount

bcc43ce

Wroud requested changes Apr 11, 2024

View reviewed changes

sergeyteleshev added 9 commits April 12, 2024 09:07

CB-4270 reverts ToolsActions unneeded props

064a737

CB-4270 pr fixes

2e5f4f8

СB-4270 cancel load total count for refresh action

96f4ea0

CB-4270 fix: place cancelLoadTotalCount to DatabaseDataSource

8417093

CB-4270 fix: cancel load rows in refresh data in data source

13f3eae

CB-4270 cancels load on close result set tab

62d282f

CB-4270 refactor: move cancelLoadTotalCount to resultsetdatasource

10623ce

CB-4270 cancel load total count execute only for resultsetdatasource

1fbb20c

CB-4270 adds constraint for TableFooterRowCount

c96508e

sergeyteleshev commented Apr 12, 2024

View reviewed changes

sergeyteleshev added 3 commits April 12, 2024 16:21

CB-4270 fix: do not load new value if cancelled rows loading

12c3d99

CB-4270 cleanup

f8bffa2

Revert "CB-4270 cleanup"

24f2e12

This reverts commit f8bffa2.

devnaumov reviewed Apr 12, 2024

View reviewed changes

CB-4270 pr fixes

95fa2ed

sergeyteleshev requested review from devnaumov and Wroud April 12, 2024 15:17

Merge branch 'devel' into CB-4270-row-counter-add-cancel-button-for-b…

8acd987

…ig-tables

sergeyteleshev and others added 5 commits April 15, 2024 12:14

CB-4270 pr fixes

dee0295

CB-4270 deletes cross icon icon

708d658

CB-4270 DataSources has correct tree of calls for cancel and dispose …

4a3445e

…functions

CB-4270 cleanup

815cd26

chore: add experimental cancellable promise implementation

8b185d5

sergeyteleshev requested a review from Wroud April 15, 2024 14:44

Wroud requested changes Apr 15, 2024

View reviewed changes

webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts Outdated Show resolved Hide resolved

Wroud requested changes Apr 15, 2024

View reviewed changes

CB-4270 pr fixes: remove unneeded disposes + close results in close r…

46b89da

…esult tab flow

sergeyteleshev requested a review from Wroud April 15, 2024 18:27

Wroud requested changes Apr 16, 2024

View reviewed changes

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts Outdated Show resolved Hide resolved

CB-4270 removes closeResults abstraction leak in ResultSetDataSource …

c665a13

…extended classes

Wroud requested changes Apr 16, 2024

View reviewed changes

CB-4270 removes unused context in data sources

a37d332

sergeyteleshev requested a review from Wroud April 16, 2024 07:34

Wroud approved these changes Apr 16, 2024

View reviewed changes

dariamarutkina and others added 5 commits April 16, 2024 11:30

Merge branch 'devel' into CB-4270-row-counter-add-cancel-button-for-b…

a35fa39

…ig-tables

Merge branch 'devel' into CB-4270-row-counter-add-cancel-button-for-b…

44c8f5a

…ig-tables

Merge branch 'devel' into CB-4270-row-counter-add-cancel-button-for-b…

6581fa4

…ig-tables

CB-4270 adds loader for CancelTotalCountAction on cancel task action

6f4482d

CB-4270 cancel row count job fix

d894010

yagudin10 force-pushed the CB-4270-row-counter-add-cancel-button-for-big-tables branch from 65ef929 to d894010 Compare April 18, 2024 13:28

CB-4270 cancel row counter with notification

f7b9328

devnaumov reviewed Apr 19, 2024

View reviewed changes

CB-4270 pr fixes

ea2a1cf

Wroud approved these changes Apr 19, 2024

View reviewed changes

sergeyteleshev and others added 2 commits April 19, 2024 16:36

CB-4270 pr fixes

8e7f48b

Merge branch 'devel' into CB-4270-row-counter-add-cancel-button-for-b…

c37cd9f

…ig-tables

Wroud merged commit 51ef899 into devel Apr 23, 2024
4 of 5 checks passed

Wroud deleted the CB-4270-row-counter-add-cancel-button-for-big-tables branch April 23, 2024 06:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cb 4270 row counter add cancel button for big tables #2545

Cb 4270 row counter add cancel button for big tables #2545

sergeyteleshev commented Apr 11, 2024

sergeyteleshev Apr 12, 2024 •

edited

Loading

Wroud Apr 12, 2024

Wroud Apr 15, 2024

devnaumov Apr 12, 2024

devnaumov Apr 12, 2024

devnaumov Apr 12, 2024

Wroud Apr 16, 2024

Wroud Apr 16, 2024

devnaumov Apr 19, 2024

Wroud Apr 19, 2024

Wroud Apr 19, 2024

Wroud Apr 19, 2024

Wroud Apr 19, 2024


		async closeResults(results: IDatabaseResultSet[]): Promise<void> {
		await this.connectionExecutionContextService.load();

		model?.source.closeResults?.(model.getResults());
		model?.cancel();

Cb 4270 row counter add cancel button for big tables #2545

Cb 4270 row counter add cancel button for big tables #2545

Conversation

sergeyteleshev commented Apr 11, 2024

sergeyteleshev Apr 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sergeyteleshev Apr 12, 2024 •

edited

Loading