From abe78de99f00e52fc5b07b26095ef42980ee4afb Mon Sep 17 00:00:00 2001 From: Wroud Date: Mon, 13 Dec 2021 13:18:41 +0300 Subject: [PATCH] fix(plugin-sql-editor): CB-1474 CB-1464 save cursor position --- .../plugin-data-viewer/src/TableViewer/TableGrid.tsx | 2 +- .../plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx index 28f0ca5593..8d264e42e4 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx @@ -54,7 +54,7 @@ export const TableGrid = observer(function TableGrid({ DatabaseEditAction ); - if (editor?.isEdited()) { + if (editor?.isEdited() && model.source.executionContext?.context) { const result = await commonDialogService.open(ConfirmationDialog, { title: 'data_viewer_result_edited_title', message: 'data_viewer_result_edited_message', diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx index 3b10440ace..211fcaf0f3 100644 --- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx +++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx @@ -282,8 +282,14 @@ export class SqlEditorController implements IInitializableController, IDestructi }; setQuery(query: string): void { + const editorPosition = this.editor?.getCursor(); + this.state.query = query; this.parser.setScript(query); + + if (editorPosition && this.editor) { + this.editor.setCursor(editorPosition); + } } private async executeQueryAction(