Show Open Workspace button on creation

If user is not in workspace already Fix eclipse-archived/codewind#151 Signed-off-by: Tim Etchells <timetchells@ibm.com>
eclipse-archived · Sep 5, 2019 · 96eee88 · 96eee88
1 parent 9306c2c
commit 96eee88
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/dev/.vscode/launch.json b/dev/.vscode/launch.json
@@ -11,7 +11,8 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}"
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "/Users/tim/programs/codewind/codewind-workspace"
             ],
             "outFiles": [
                 "${workspaceFolder}/dev/out/**/*.js"
@@ -30,7 +31,7 @@
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionTestsPath=${workspaceFolder}/out/test",
                 // Replace below with your local codewind-workspace
-                "/Users/tim/programs/tempest/codewind-workspace"
+                "/Users/tim/programs/codewind/codewind-workspace"
                 // "/Users/tim/codewind-workspace/"
             ],
             "outFiles": [

diff --git a/dev/src/command/connection/ActivateConnectionCmd.ts b/dev/src/command/connection/ActivateConnectionCmd.ts
@@ -17,8 +17,9 @@ import Connection from "../../codewind/connection/Connection";
 import CWEnvironment from "../../codewind/connection/CWEnvironment";
 import Translator from "../../constants/strings/translator";
 import StringNamespaces from "../../constants/strings/StringNamespaces";
-import Commands from "../../constants/Commands";
 import { CWConfigurations } from "../../constants/Configurations";
+import MCUtil from "../../MCUtil";
+import openWorkspaceCmd from "../OpenWorkspaceCmd";
 
 const STRING_NS = StringNamespaces.STARTUP;
 
@@ -39,14 +40,8 @@ export default async function activateConnection(url: vscode.Uri): Promise<void>
  */
 async function onConnectSuccess(connection: Connection): Promise<void> {
     Log.i("Successfully connected to codewind at " + connection.url);
-    let isInWorkspace = false;
-    // See if the user has this connection's workspace open
-    const wsFolders = vscode.workspace.workspaceFolders;
-    if (wsFolders != null) {
-        isInWorkspace = wsFolders.some((folder) => folder.uri.fsPath.includes(connection.workspacePath.fsPath));
-    }
 
-    if (!isInWorkspace) {
+    if (!await MCUtil.isUserInCwWorkspaceOrProject()) {
         // Provide a button to change their workspace to the codewind-workspace if they wish, and haven't disabled this feature.
         let promptOpenWs = vscode.workspace.getConfiguration().get(CWConfigurations.PROMPT_TO_OPEN_WORKSPACE);
         if (promptOpenWs == null) {
@@ -63,7 +58,7 @@ async function onConnectSuccess(connection: Connection): Promise<void> {
         );
 
         if (openWsRes === openWsBtn) {
-            vscode.commands.executeCommand(Commands.VSC_OPEN_FOLDER, connection.workspacePath);
+            openWorkspaceCmd(connection);
         }
         else if (openWsRes === dontShowAgainBtn) {
             vscode.window.showInformationMessage(

diff --git a/dev/src/command/connection/BindProjectCmd.ts b/dev/src/command/connection/BindProjectCmd.ts
@@ -16,6 +16,7 @@ import Connection from "../../codewind/connection/Connection";
 import MCUtil from "../../MCUtil";
 import UserProjectCreator from "../../codewind/connection/UserProjectCreator";
 import { isRegistrySet, onRegistryNotSet } from "../../codewind/connection/Registry";
+import { showOpenWorkspacePrompt } from "./CreateUserProjectCmd";
 
 /**
  * @param create true for Create page, false for Import page
@@ -46,7 +47,14 @@ export default async function bindProject(connection: Connection): Promise<void>
         if (response == null) {
             return;
         }
-        vscode.window.showInformationMessage(`Adding ${MCUtil.containerPathToFsPath(response.projectPath)} as ${response.projectName}`);
+
+        const addedMsg = `Added ${MCUtil.containerPathToFsPath(response.projectPath)} as ${response.projectName}`;
+        if (await MCUtil.isUserInCwWorkspaceOrProject()) {
+            vscode.window.showInformationMessage(addedMsg);
+        }
+        else {
+            showOpenWorkspacePrompt(connection, addedMsg);
+        }
     }
     catch (err) {
         const errMsg = "Error importing project: ";

diff --git a/dev/src/command/connection/CreateUserProjectCmd.ts b/dev/src/command/connection/CreateUserProjectCmd.ts
@@ -17,6 +17,7 @@ import MCUtil from "../../MCUtil";
 import UserProjectCreator, { IMCTemplateData } from "../../codewind/connection/UserProjectCreator";
 import Requester from "../../codewind/project/Requester";
 import { isRegistrySet, onRegistryNotSet } from "../../codewind/connection/Registry";
+import openWorkspaceCmd from "../OpenWorkspaceCmd";
 
 const CREATE_PROJECT_WIZARD_TITLE = "Create a New Project";
 const CREATE_PROJECT_WIZARD_NO_STEPS = 2;
@@ -59,7 +60,14 @@ export default async function createProject(connection: Connection): Promise<voi
             // user cancelled
             return;
         }
-        vscode.window.showInformationMessage(`Created project ${response.projectName} at ${MCUtil.containerPathToFsPath(response.projectPath)}`);
+
+        const createdMsg = `Created project ${response.projectName} at ${MCUtil.containerPathToFsPath(response.projectPath)}`;
+        if (await MCUtil.isUserInCwWorkspaceOrProject()) {
+            vscode.window.showInformationMessage(createdMsg);
+        }
+        else {
+            showOpenWorkspacePrompt(connection, createdMsg);
+        }
     }
     catch (err) {
         const errMsg = "Error creating new project: ";
@@ -68,6 +76,16 @@ export default async function createProject(connection: Connection): Promise<voi
     }
 }
 
+export async function showOpenWorkspacePrompt(connection: Connection, msg: string): Promise<void> {
+    const openWorkspaceBtn = "Open Workspace";
+    vscode.window.showInformationMessage(msg, openWorkspaceBtn)
+    .then((res) => {
+        if (res === openWorkspaceBtn) {
+            openWorkspaceCmd(connection);
+        }
+    });
+}
+
 const TEMPLATE_QP_PLACEHOLDER = "Select the project type to create";
 
 async function promptForTemplate(connection: Connection): Promise<IMCTemplateData | undefined> {