No longer replace results with error and instead undo cell change

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/views/results/html.ts

@@ -95,6 +95,32 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
               }
             }, { threshold: [0] }).observe(document.getElementById(messageSpanId));
 
+            let updateRequests = {};
+
+            function requestCellUpdate(cellNode, originalValue, statement, bindings) {
+              const randomId = Math.floor(Math.random() * 1000000);
+              updateRequests[randomId] = {cellNode, originalValue};
+
+              vscode.postMessage({
+                command: 'update',
+                id: randomId,
+                update: statement,
+                bindings: bindings
+              });
+            }
+
+            function handleCellResponse(id, success) {
+              const previousRequest = updateRequests[id];
+
+              if (previousRequest) {
+                if (!success) {
+                  previousRequest.cellNode.innerText = previousRequest.originalValue;
+                }
+
+                delete updateRequests[id];
+              }
+            }
+
             document.getElementById('resultset').onclick = function(e){
               console.log('click')
               if (updateTable === undefined) return;
@@ -219,11 +245,7 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
 
                   editableNode = undefined;
 
-                  vscode.postMessage({
-                    command: 'update',
-                    update: updateStatement,
-                    bindings: bindings
-                  });
+                  requestCellUpdate(target, chosenValue, updateStatement, bindings);
                 }
 
                 editableNode.addEventListener('blur', (e) => {
@@ -246,6 +268,11 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
               }
 
               switch (data.command) {
+                case 'cellResponse':
+                  if (data.id) {
+                    handleCellResponse(data.id, data.success === true);
+                  }
+                  break;
                 case 'rows':
                   hideSpinner();
 

src/views/results/resultSetPanelProvider.ts

@@ -1,4 +1,4 @@
-import { CancellationToken, WebviewPanel, WebviewView, WebviewViewProvider, WebviewViewResolveContext, commands } from "vscode";
+import { window, CancellationToken, WebviewPanel, WebviewView, WebviewViewProvider, WebviewViewResolveContext, commands } from "vscode";
 
 import { setCancelButtonVisibility } from ".";
 import { JobManager } from "../../config";
@@ -44,21 +44,33 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
     };
 
     webviewView.webview.html = html.getLoadingHTML();
+
+    const postCellResponse = (id: number, success: boolean) => {
+      this._view.webview.postMessage({
+        command: `cellResponse`,
+        id,
+        success
+      });
+    }
+
     this._view.webview.onDidReceiveMessage(async (message) => {
       switch (message.command) {
         case `cancel`:
           this.endQuery();
           break;
 
         case `update`:
-          if (message.update && message.bindings) {
+          if (message.id && message.update && message.bindings) {
             try {
               const result = await JobManager.runSQL(message.update, {parameters: message.bindings});
+              postCellResponse(message.id, true);
             } catch (e) {
-              this.setError(e.message);
-              if (this.currentQuery) {
-                this.currentQuery.close();
-              }
+              // this.setError(e.message);
+              // if (this.currentQuery) {
+              //   this.currentQuery.close();
+              // }
+              postCellResponse(message.id, false);
+              window.showWarningMessage(e.message);
             }
           }
           break;