Fix project creation paths on windows (#204)

* Fix project creation on windows Signed-off-by: Tim Etchells <[email protected]> * Fix alt attribute of toggle buttons Signed-off-by: Tim Etchells <[email protected]> * Add Learn More link eclipse-archived/codewind#434 Signed-off-by: Tim Etchells <[email protected]>
eclipse-archived · Sep 17, 2019 · adc9b3b · adc9b3b
1 parent cc7b2c2
commit adc9b3b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/dev/src/MCUtil.ts b/dev/src/MCUtil.ts
@@ -136,11 +136,11 @@ namespace MCUtil {
     /**
      * C:\\Users\\... -> /C/Users/
      */
-    export function fsPathToContainerPath(fsPath: vscode.Uri): string {
+    export function fsPathToContainerPath(fsPath: vscode.Uri | string): string {
+        const pathStr: string = fsPath instanceof vscode.Uri ? fsPath.fsPath : fsPath;
         if (getOS() !== "windows") {
-            return fsPath.fsPath;
+            return pathStr;
         }
-        const pathStr = fsPath.fsPath;
         const driveLetter = pathStr.charAt(0);
         // we have to convert C:\<path> to /C/<path>
         const containerPath = pathStr.substring(2).replace(/\\/g, "/");

diff --git a/dev/src/codewind/connection/UserProjectCreator.ts b/dev/src/codewind/connection/UserProjectCreator.ts
@@ -75,7 +75,7 @@ namespace UserProjectCreator {
     }
 
     export async function validateAndBind(connection: Connection, pathToBindUri: vscode.Uri): Promise<INewProjectInfo | undefined> {
-        const pathToBind = MCUtil.fsPathToContainerPath(pathToBindUri);
+        const pathToBind = pathToBindUri.fsPath;
         Log.i("Binding to", pathToBind);
 
         const projectName = path.basename(pathToBind);
@@ -251,14 +251,16 @@ namespace UserProjectCreator {
         return selectedDirs[0];
     }
 
-    async function requestBind(connection: Connection, projectName: string, dirToBindContainerPath: string, language: string, projectType: string)
+    async function requestBind(connection: Connection, projectName: string, dirToBindFsPath: string, language: string, projectType: string)
         : Promise<void> {
 
+        const path = MCUtil.fsPathToContainerPath(dirToBindFsPath);
+
         const bindReq = {
             name: projectName,
             language,
             projectType,
-            path: dirToBindContainerPath,
+            path,
         };
 
         Log.d("Bind request", bindReq);

diff --git a/dev/src/command/connection/ManageTemplateReposCmd.ts b/dev/src/command/connection/ManageTemplateReposCmd.ts
@@ -20,6 +20,8 @@ import WebviewUtil from "../webview/WebviewUtil";
 import Log from "../../Logger";
 import Requester from "../../codewind/project/Requester";
 import MCUtil from "../../MCUtil";
+import Commands from "../../constants/Commands";
+import Constants from "../../constants/Constants";
 // import Constants from "../../constants/Constants";
 
 /**
@@ -53,6 +55,7 @@ export interface IRepoEnablement {
 }
 
 const REPOS_PAGE_TITLE = "Template Sources";
+const LEARN_MORE_LINK = Constants.CW_SITE_BASEURL + "mdt-vsc-usingadifferenttemplate.html";
 
 // Only allow one of these for now - This should be moved to be per-connection like how overview is per-project.
 let manageReposPage: vscode.WebviewPanel | undefined;
@@ -173,8 +176,7 @@ async function handleWebviewMessage(this: Connection, msg: WebviewUtil.IWVMessag
                 break;
             }
             case ManageReposWVMessages.HELP: {
-                vscode.window.showInformationMessage("More information about this page, or open a webpage, probably");
-                // vscode.commands.executeCommand(Commands.VSC_OPEN, vscode.Uri.parse(LEARN_MORE_LINK));
+                vscode.commands.executeCommand(Commands.VSC_OPEN, vscode.Uri.parse(LEARN_MORE_LINK));
                 break;
             }
             case ManageReposWVMessages.REFRESH: {

diff --git a/dev/src/command/webview/ManageTemplateReposPage.ts b/dev/src/command/webview/ManageTemplateReposPage.ts
@@ -88,14 +88,17 @@ export default function getManageReposPage(repos: ITemplateRepo[]): string {
             const newEnablement = toggleBtn.getAttribute("${REPO_ENABLED_ATTR}") != "true";
             toggleBtn.setAttribute("${REPO_ENABLED_ATTR}", newEnablement);
 
-            let newToggleImg;
+            let newToggleImg, newToggleAlt;
             if (newEnablement) {
                 newToggleImg = "${getStatusToggleIconSrc(true)}";
+                newToggleAlt = "${getStatusToggleAlt(true)}";
             }
             else {
                 newToggleImg = "${getStatusToggleIconSrc(false)}";
+                newToggleAlt = "${getStatusToggleAlt(false)}";
             }
             toggleBtn.src = newToggleImg;
+            toggleBtn.alt = newToggleAlt;
 
             sendMsg("${ManageReposWVMessages.ENABLE_DISABLE}", { repos: [ getRepoEnablementObj(toggleBtn) ] });
         }
@@ -174,13 +177,16 @@ function buildRepoRow(repo: ITemplateRepo): string {
 }
 
 function getStatusToggleTD(repo: ITemplateRepo): string {
-    const alt = repo.enabled ? `Disable ${repo.description}` : `Enable ${repo.description}`;
     return `<td class="repo-toggle-cell">
-        <input type="image" alt="${alt}" ${REPO_ID_ATTR}="${repo.url}" ${REPO_ENABLED_ATTR}="${repo.enabled}" class="${REPO_TOGGLE_CLASS} btn"
-            src="${getStatusToggleIconSrc(repo.enabled)}" onclick="onToggleRepo(this)"/>
+        <input type="image" alt="${getStatusToggleAlt(repo.enabled)}" ${REPO_ID_ATTR}="${repo.url}" ${REPO_ENABLED_ATTR}="${repo.enabled}"
+            class="${REPO_TOGGLE_CLASS} btn" src="${getStatusToggleIconSrc(repo.enabled)}" onclick="onToggleRepo(this)"/>
     </td>`;
 }
 
+function getStatusToggleAlt(enabled: boolean): string {
+    return enabled ? `Disable source` : `Enable source`;
+}
+
 function getStatusToggleIconSrc(enabled: boolean): string {
     return WebviewUtil.getIcon(enabled ? Resources.Icons.ToggleOnThin : Resources.Icons.ToggleOffThin);
 }