bring back transaction webview for v2 (#2642)

Signed-off-by: Erin Hughes <Erin.Hughes@ibm.com>
IBM-Blockchain · Oct 2, 2020 · 0dc7b26 · 0dc7b26
1 parent ab882ea
commit 0dc7b26
Show file tree

Hide file tree

Showing 19 changed files with 540 additions and 555 deletions.
diff --git a/packages/blockchain-extension/extension/webview/TransactionView.ts b/packages/blockchain-extension/extension/webview/TransactionView.ts
@@ -15,7 +15,6 @@
 'use strict';
 import * as vscode from 'vscode';
 import { ReactView } from './ReactView';
-import { ExtensionCommands } from '../../ExtensionCommands';
 
 export class TransactionView extends ReactView {
     protected appState: any;
@@ -27,25 +26,18 @@ export class TransactionView extends ReactView {
 
     async openPanelInner(panel: vscode.WebviewPanel): Promise<void> {
         panel.webview.onDidReceiveMessage(async (message: {command: string, data: any}) => {
-            if (message.command === 'submit') {
-                const response: string = await vscode.commands.executeCommand(ExtensionCommands.SUBMIT_TRANSACTION, undefined, undefined, undefined, message.data);
-                panel.webview.postMessage({
-                    output: response
-                });
-            } else if (message.command === 'evaluate') {
-                const response: string = await vscode.commands.executeCommand(ExtensionCommands.EVALUATE_TRANSACTION, undefined, undefined, undefined, message.data);
-                panel.webview.postMessage({
-                    output: response
-                });
-            }
+            const response: string = await vscode.commands.executeCommand(message.command, undefined, undefined, undefined, message.data);
+            panel.webview.postMessage({
+                transactionOutput: response
+            });
         });
         this.loadComponent(panel);
     }
 
     loadComponent(panel: vscode.WebviewPanel): void {
         panel.webview.postMessage({
             path: '/transaction',
-            state: this.appState
+            transactionData: this.appState
         });
     }
 }
diff --git a/packages/blockchain-extension/test/webview/TransactionView.test.ts b/packages/blockchain-extension/test/webview/TransactionView.test.ts
@@ -124,7 +124,7 @@ describe('TransactionView', () => {
         createWebviewPanelStub.should.have.been.called;
         postMessageStub.should.have.been.calledWith({
             path: '/transaction',
-            state: mockAppState
+            transactionData: mockAppState
         });
     });
 
@@ -137,7 +137,7 @@ describe('TransactionView', () => {
                     postMessage: mySandBox.stub(),
                     onDidReceiveMessage: async (callback: any): Promise<void> => {
                         await callback({
-                            command: 'submit',
+                            command: ExtensionCommands.SUBMIT_TRANSACTION,
                             data: transactionObject
                         });
                         resolve();
@@ -167,7 +167,7 @@ describe('TransactionView', () => {
                     postMessage: mySandBox.stub(),
                     onDidReceiveMessage: async (callback: any): Promise<void> => {
                         await callback({
-                            command: 'evaluate',
+                            command: ExtensionCommands.EVALUATE_TRANSACTION,
                             data: transactionObject
                         });
                         resolve();
@@ -188,34 +188,4 @@ describe('TransactionView', () => {
         executeCommandStub.should.have.been.calledWith(ExtensionCommands.EVALUATE_TRANSACTION, undefined, undefined, undefined, transactionObject);
     });
 
-    it('should not do anything if it receives an invalid message', async () => {
-        const onDidReceiveMessagePromises: any[] = [];
-
-        onDidReceiveMessagePromises.push(new Promise((resolve: any): void => {
-            createWebviewPanelStub.returns({
-                webview: {
-                    postMessage: mySandBox.stub(),
-                    onDidReceiveMessage: async (callback: any): Promise<void> => {
-                        await callback({
-                            command: 'invalid',
-                            data: transactionObject
-                        });
-                        resolve();
-                    }
-                },
-                reveal: (): void => {
-                    return;
-                },
-                onDidDispose: mySandBox.stub(),
-                onDidChangeViewState: mySandBox.stub()
-            });
-        }));
-
-        const transactionView: TransactionView = new TransactionView(context, mockAppState);
-        await transactionView.openView(false);
-        await Promise.all(onDidReceiveMessagePromises);
-
-        executeCommandStub.should.not.have.been.called;
-    });
-
 });