From c6c03be8bcb0f4a7f6045a2e7b44da91d3072088 Mon Sep 17 00:00:00 2001
From: Florent BENOIT <fbenoit@codenvy.com>
Date: Mon, 29 Feb 2016 17:56:04 +0100
Subject: [PATCH] CHE-581 Code refactoring not applied on workspace import

Change-Id: I28e0b628e899bee96065a7850d69f7719999e991
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
---
 .../create-workspace.controller.js             | 18 +++++++++++++++---
 .../create-workspace/create-workspace.html     |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js b/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js
index acb026ed17..cce313e85d 100644
--- a/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js
+++ b/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js
@@ -52,6 +52,7 @@ export class CreateWorkspaceCtrl {
     this.stack = null;
     this.recipeUrl = null;
     this.recipeScript = null;
+    this.importWorkspace = '';
   }
 
   /**
@@ -114,6 +115,10 @@ export class CreateWorkspaceCtrl {
           this.cheNotification.showError(error.data.message ? error.data.message : 'Error during recipe creation.');
         });
       }
+    } else if (this.selectSourceOption === 'select-source-import') {
+      let workspaceConfig = this.importWorkspace.length > 0 ? angular.fromJson(this.importWorkspace).config : {};
+      let creationPromise = this.cheAPI.getWorkspace().createWorkspaceFromConfig(null, workspaceConfig);
+      this.redirectAfterSubmitWorkspace(creationPromise);
     } else {
       //check predefined recipe location
       if (this.stack && this.stack.source && this.stack.source.type === 'location') {
@@ -188,16 +193,23 @@ export class CreateWorkspaceCtrl {
    */
   submitWorkspace() {
     let attributes = this.stack ? {stackId: this.stack.id} : {};
-
     let creationPromise = this.cheAPI.getWorkspace().createWorkspace(null, this.workspaceName, this.recipeUrl, this.workspaceRam, attributes);
-    creationPromise.then((workspaceData) => {
+    this.redirectAfterSubmitWorkspace(creationPromise);
+  }
+
+
+  /**
+   * Handle the redirect for the given promise after workspace has been created
+   * @param promise used to gather workspace data
+     */
+  redirectAfterSubmitWorkspace(promise) {
+    promise.then((workspaceData) => {
       let infoMessage = 'Workspace ' + workspaceData.name + ' successfully created.';
       this.cheNotification.showInfo(infoMessage);
       this.$location.path('/workspace/' + workspaceData.id);
     }, (error) => {
       let errorMessage = error.data.message ? error.data.message : 'Error during workspace creation.';
       this.cheNotification.showError(errorMessage);
-      this.$location.path('/workspaces');
     });
   }
 
diff --git a/dashboard/src/app/workspaces/create-workspace/create-workspace.html b/dashboard/src/app/workspaces/create-workspace/create-workspace.html
index 0f5bc45c6f..c5307c9e93 100644
--- a/dashboard/src/app/workspaces/create-workspace/create-workspace.html
+++ b/dashboard/src/app/workspaces/create-workspace/create-workspace.html
@@ -26,7 +26,7 @@
     <che-panel che-title="Import workspace" ng-if="createWorkspaceCtrl.selectSourceOption === 'select-source-import'">
 
       <ui-codemirror class="workspace-editor" ui-codemirror="createWorkspaceCtrl.editorOptions"
-                     ng-model="createWorkspaceCtrl.workspaceConfig"></ui-codemirror>
+                     ng-model="createWorkspaceCtrl.importWorkspace"></ui-codemirror>
 
     </che-panel>
     <che-workspace-select-stack ng-if="createWorkspaceCtrl.selectSourceOption === 'select-source-recipe'"