From 2eba17cf136e1fe41da9e3bfa74049bcfc6ea888 Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Wed, 6 Oct 2021 12:13:40 +0300
Subject: [PATCH] fix(plugin-data-viewer): CB-1180 new rows order

---
 .../DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts  | 2 +-
 .../DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts  | 2 ++
 .../DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts
index 0b8e39accc..106630ba88 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts
@@ -54,7 +54,7 @@ export class ResultSetDataAction extends DatabaseDataAction<any, IDatabaseResult
 
   insertRow(row: IResultSetRowKey, value: IResultSetValue[], shift = 0): void {
     if (this.result.data?.rows) {
-      this.result.data.rows.splice(row.index + shift + 1, 0, value);
+      this.result.data.rows.splice(row.index + shift, 0, value);
     }
   }
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts
index dbd2a1c5fa..e59d6fb25d 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts
@@ -176,6 +176,8 @@ export class ResultSetEditAction
 
     if (!row) {
       row = this.data.getDefaultKey().row;
+    } else if (!('key' in row)) {
+      row = { ...row, index: row.index + 1 };
     }
 
     if (!column) {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
index e259699efa..cc446da3d1 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
@@ -30,8 +30,8 @@ export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResult
 
   get rowKeys(): IResultSetRowKey[] {
     return [
-      ...this.data.rows.map((c, index) => ({ index })),
       ...this.editor.addRows,
+      ...this.data.rows.map((c, index) => ({ index })),
     ].sort((a, b) => a.index - b.index);
   }