Merge branch 'GH-59' into candidate-0.0.x

# Conflicts: # src/eclTree.ts
hpcc-systems · Dec 5, 2017 · 7323cb8 · 7323cb8
2 parents 8c4fe46 + bf5f9f2
commit 7323cb8
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,12 @@ The following Visual Studio Code settings are available for the ECL extension.
 
   // Add '-legacy' arguement to eclcc.
   "ecl.legacyMode": false,
+
+  // Open workunits in external browser.
+  "ecl.WUOpenExternal": false
+
+  // Automatically open WU in browser on creation.
+  "ecl.WUAutoOpen": false
 ```
 
 #### Launch Settings

diff --git a/package.json b/package.json
@@ -342,18 +342,28 @@
                         "type": "string"
                     },
                     "default": [],
-                    "description": "External folders use by IMPORT"
+                    "description": "External folders use by IMPORT."
                 },
                 "ecl.eclccPath": {
                     "type": "string",
                     "default": "",
-                    "description": "Override eclcc auto detection"
+                    "description": "Override eclcc auto detection."
                 },
                 "ecl.legacyMode": {
                     "type": "boolean",
                     "default": false,
                     "description": "Add '-legacy' arguement to eclcc."
                 },
+                "ecl.WUOpenExternal": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Open WU in external browser."
+                },
+                "ecl.WUAutoOpen": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Automatically open WU on creation."
+                },
                 "ecl.defaultServer": {
                     "type": "string",
                     "description": "Default Server"

diff --git a/src/eclCommand.ts b/src/eclCommand.ts
@@ -67,10 +67,15 @@ export class ECLCommands {
     }
 
     openWUDetails(url: string, wuid: string) {
-        const uri = encodeLocation(url, wuid);
-        return vscode.commands.executeCommand("vscode.previewHtml", uri, vscode.ViewColumn.Two, wuid).then((success) => {
-        }, (reason) => {
-            vscode.window.showErrorMessage(reason);
-        });
+        const eclConfig = vscode.workspace.getConfiguration("ecl");
+        if (eclConfig.get<boolean>("WUOpenExternal")) {
+            opn(url);
+        } else {
+            const uri = encodeLocation(url, wuid);
+            return vscode.commands.executeCommand("vscode.previewHtml", uri, vscode.ViewColumn.Two, wuid).then((success) => {
+            }, (reason) => {
+                vscode.window.showErrorMessage(reason);
+            });
+        }
     }
 }
diff --git a/src/eclTree.ts b/src/eclTree.ts
@@ -186,6 +186,11 @@ export class ECLTree implements vscode.TreeDataProvider<ECLNode> {
             switch (event.event) {
                 case "WUCreated":
                     this.refresh();
+                    const eclConfig = vscode.workspace.getConfiguration("ecl");
+                    if (eclConfig.get<boolean>("WUAutoOpen")) {
+                        const launchConfig = new LaunchConfig(event.body);
+                        eclCommands.openWUDetails(launchConfig.wuDetailsUrl(event.body.wuid), event.body.wuid);
+                    }
                     break;
             }
         }, null, ctx.subscriptions);
@@ -213,15 +218,6 @@ export class ECLTree implements vscode.TreeDataProvider<ECLNode> {
             node._treeItem = new vscode.TreeItem(node.getLabel(), node.collapseState());
             node._treeItem.command = node.command();
         }
-        /*
-        treeItem.command = {
-            command: 'extension.openJsonSelection',
-            title: '',
-            arguments: [new vscode.Range(this.editor.document.positionAt(node.offset), this.editor.document.positionAt(node.offset + node.length))]
-        };
-        treeItem.iconPath = this.getIcon(node);
-        treeItem.contextValue = this.getNodeType(node);
-        */
         return node._treeItem;
     }
 

diff --git a/src/util.ts b/src/util.ts
@@ -25,3 +25,18 @@ export function initLogger(level: Level) {
     logger.writer(new VSCodeWriter());
     logger.level(level);
 }
+
+export class LaunchConfig {
+    _config: any;
+    constructor(config: any) {
+        this._config = config;
+    }
+
+    espUrl() {
+        return `${this._config.protocol}://${this._config.serverAddress}:${this._config.port}`;
+    }
+
+    wuDetailsUrl(wuid: string) {
+        return `${this.espUrl()}/?Wuid=${wuid}&Widget=WUDetailsWidget`;
+    }
+}