git+binary workflow fix

src/openshift/component.ts

@@ -17,7 +17,7 @@ import { Platform } from '../util/platform';
 import path = require('path');
 import fs = require('fs-extra');
 import globby = require('globby');
-import { selectWorkspaceFolder } from '../util/workspace';
+import { workspaceUtil } from '../util/workspaceUtil';
 
 interface WorkspaceFolderItem extends QuickPickItem {
     uri: Uri;
@@ -380,7 +380,7 @@ export class Component extends OpenShiftItem {
 
         if (!application) application = await Component.getOpenshiftData(context);
         if (!application) return null;
-        const workspacePath = await selectWorkspaceFolder();
+        const workspacePath = await workspaceUtil.selectWorkspaceFolder();
         if (!workspacePath) return null;
 
         const componentList: Array<OpenShiftObject> = await Component.odo.getComponents(application);
@@ -426,7 +426,10 @@ export class Component extends OpenShiftItem {
         let application: OpenShiftObject = context;
         if (!application) application = await Component.getOpenshiftData(context);
         if (!application) return null;
+        const workspacePath = await workspaceUtil.selectWorkspaceFolder();
+        if (!workspacePath) return null;
         const delayer = new Delayer<string>(500);
+
         const repoURI = await window.showInputBox({
             prompt: 'Git repository URI',
             validateInput: (value: string) => {
@@ -459,65 +462,26 @@ export class Component extends OpenShiftItem {
 
         if (!componentTypeVersion) return null;
 
-        const folder = await window.showOpenDialog({
-            canSelectFiles: false,
-            canSelectFolders: true,
-            canSelectMany: false,
-            defaultUri: Uri.file(Platform.getUserHomePath()),
-            openLabel: "Select Context Folder for Component"
-        });
-
-        if (!folder) return null;
-
         window.showInformationMessage('Do you want to clone git repository for created Component?', 'Yes', 'No').then((value) => {
             value === 'Yes' && commands.executeCommand('git.clone', repoURI);
         });
 
-        await Component.odo.createComponentFromGit(application, componentTypeName, componentTypeVersion, componentName, repoURI, folder[0], gitRef.label);
+        await Component.odo.createComponentFromGit(application, componentTypeName, componentTypeVersion, componentName, repoURI, workspacePath, gitRef.label);
         return `Component '${componentName}' successfully created`;
     }
 
     static async createFromBinary(context: OpenShiftObject): Promise<string> {
 
         let application: OpenShiftObject = context;
-        let folder: WorkspaceFolderItem[] = [];
+
         if (!application) application = await Component.getOpenshiftData(context);
+
         if (!application) return null;
-        if (workspace.workspaceFolders && workspace.workspaceFolders.length > 0) {
-            folder = workspace.workspaceFolders.filter(
-                (value) => {
-                    let result = true;
-                    try {
-                        result = !fs.statSync(path.join(value.uri.fsPath, '.odo', 'config.yaml')).isFile();
-                    } catch (ignore) {
-                    }
-                    return result;
-                }
-            ).map(
-                (folder) => ({ label: `$(file-directory) ${folder.uri.fsPath}`, uri: folder.uri })
-            );
-        }
-        const addWorkspaceFolder = new CreateWorkspaceItem();
-        const choice: any = await window.showQuickPick([addWorkspaceFolder, ...folder], {placeHolder: "Select context folder"});
 
-        if (!choice) return null;
-        let workspacePath: Uri;
-
-        if (choice.label === addWorkspaceFolder.label) {
-            const folders = await window.showOpenDialog({
-                canSelectFiles: false,
-                canSelectFolders: true,
-                canSelectMany: false,
-                defaultUri: Uri.file(Platform.getUserHomePath()),
-                openLabel: "Add context Folder for Component"
-            });
-            if (!folders) return null;
-            workspacePath = folders[0];
-        } else {
-            workspacePath = choice.uri;
-        }
+        const workspacePath = await workspaceUtil.selectWorkspaceFolder();
 
         if (!workspacePath) return null;
+
         const globPath = process.platform === 'win32' ? workspacePath.fsPath.replace(/\\/g, '/') : workspacePath.path;
         const paths = globby.sync(`${globPath}/*.+(jar|war)`, { extglob: true });
 
@@ -560,7 +524,7 @@ export class Component extends OpenShiftItem {
             throw new Error(`Cannot import unknown Component type '${componentType}'.`);
         }
 
-        const workspaceFolder = await selectWorkspaceFolder();
+        const workspaceFolder = await workspaceUtil.selectWorkspaceFolder();
         if (!workspaceFolder) return null;
         return await Progress.execFunctionWithProgress(`Importing component '${compName}'`, async (progress) => {
             try {

src/util/workspaceUtil.ts

@@ -0,0 +1,67 @@
+import { workspace, QuickPickItem, window, Uri } from "vscode";
+import { Platform } from "./platform";
+import path = require('path');
+import fs = require('fs-extra');
+
+interface WorkspaceFolderItem extends QuickPickItem {
+    uri: Uri;
+}
+
+class CreateWorkspaceItem implements QuickPickItem {
+
+	constructor() { }
+
+	get label(): string { return `$(plus) Add new context folder.`; }
+    get description(): string { return 'Folder which does not have an openshift context'; }
+
+}
+
+export class workspaceUtil {
+
+    static async selectWorkspaceFolder(): Promise<Uri> {
+        let folder: WorkspaceFolderItem[] = [];
+        if (workspace.workspaceFolders && workspace.workspaceFolders.length > 0) {
+            folder = workspace.workspaceFolders.filter(
+                (value) => {
+                    let result = true;
+                    try {
+                        result = !fs.statSync(path.join(value.uri.fsPath, '.odo', 'config.yaml')).isFile();
+                    } catch (ignore) {
+                    }
+                    return result;
+                }
+            ).map(
+                (folder) => ({ label: `$(file-directory) ${folder.uri.fsPath}`, uri: folder.uri })
+            );
+        }
+        const addWorkspaceFolder = new CreateWorkspaceItem();
+        const choice: any = await window.showQuickPick([addWorkspaceFolder, ...folder], {placeHolder: "Select context folder"});
+        if (!choice) return null;
+
+        let workspacePath: Uri;
+
+        if (choice === addWorkspaceFolder) {
+            const folders = await window.showOpenDialog({
+                canSelectFiles: false,
+                canSelectFolders: true,
+                canSelectMany: false,
+                defaultUri: Uri.file(Platform.getUserHomePath()),
+                openLabel: "Add context folder for component in workspace."
+            });
+            if (!folders) return null;
+            if (await this.checkComponentFolder(folders[0])) {
+                window.showErrorMessage('The folder selected already contains a component. Please select a different folder');
+                return null;
+            } else {
+                workspacePath = folders[0];
+            }
+        } else if (choice) {
+            workspacePath = choice.uri;
+        }
+        return workspacePath;
+    }
+
+    static async checkComponentFolder(folder) {
+        return fs.existsSync(path.join(folder.path, '.odo', 'config.yaml'));
+    }
+}