Fix adding projects to devfile

Signed-off-by: Anna Shumilova <ashumilo@redhat.com>
eclipse-che · Jun 12, 2019 · 11b4fe5 · 11b4fe5
1 parent 00a7b0a
commit 11b4fe5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.ts b/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.ts
@@ -299,7 +299,7 @@ export class CreateWorkspaceController {
    */
   createWorkspace(): ng.IPromise<che.IWorkspace> {
     // update workspace name
-    this.selectedDevfile.name = this.workspaceName;
+    this.selectedDevfile.metadata.name = this.workspaceName;
     return this.createWorkspaceSvc.createWorkspaceFromDevfile(this.selectedDevfile, null);
   }
 

diff --git a/dashboard/src/app/workspaces/create-workspace/create-workspace.service.ts b/dashboard/src/app/workspaces/create-workspace/create-workspace.service.ts
@@ -193,9 +193,22 @@ export class CreateWorkspaceSvc {
     const namespaceId = this.namespaceSelectorSvc.getNamespaceId(),
           projectTemplates = this.projectSourceSelectorService.getProjectTemplates();
 
+    let projects = [];
+    projectTemplates.forEach((template: che.IProjectTemplate) => {
+      let project = {
+        name: template.displayName,
+        source: {
+          type: template.source.type,
+          location: template.source.location
+        }
+      };
+      projects.push(project);
+    });      
+
     return this.checkEditingProgress().then(() => {
-      workspaceDevfile.projects = projectTemplates;
-      this.addProjectCommands({devfile: workspaceDevfile}, projectTemplates);
+      workspaceDevfile.projects = projects;
+     //TODO waits for fix https://github.com/eclipse/che/issues/13514
+     //this.addProjectCommands({devfile: workspaceDevfile}, projectTemplates);
       return this.cheWorkspace.createWorkspaceFromDevfile(namespaceId, workspaceDevfile, attributes).then((workspace: che.IWorkspace) => {
         return this.cheWorkspace.fetchWorkspaces().then(() => this.cheWorkspace.getWorkspaceById(workspace.id));
       })

diff --git a/.../workspaces/workspace-details/workspace-projects/workspace-details-projects.controller.ts b/.../workspaces/workspace-details/workspace-projects/workspace-details-projects.controller.ts
@@ -190,7 +190,6 @@ export class WorkspaceDetailsProjectsCtrl {
       if (!projectTemplate.type && projectTemplate.projectType) {
         projectTemplate.type = projectTemplate.projectType;
       }
-
       this.workspaceDetailsProjectsService.addProjectTemplate(projectTemplate);
       this.workspaceDataManager.addProject(this.workspaceDetails, projectTemplate);
     });

diff --git a/dashboard/src/components/api/workspace/workspace-data-manager.ts b/dashboard/src/components/api/workspace/workspace-data-manager.ts
@@ -96,10 +96,17 @@ export class WorkspaceDataManager {
    * @param workspace workspace 
    * @param project project to be added to pointed workspace 
    */
-  addProject(workspace: che.IWorkspace, project: any): void {
+  addProject(workspace: che.IWorkspace, projectTemplate: che.IProjectTemplate): void {
     if (workspace.config) {
-      workspace.config.projects.push(project);
+      workspace.config.projects.push(projectTemplate);
     } else if (workspace.devfile) {
+      let project = {
+        name: projectTemplate.displayName,
+        source: {
+          type: projectTemplate.source.type,
+          location: projectTemplate.source.location
+        }
+      };
       workspace.devfile.projects.push(project);
     }
   }