seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dashboard: fixed error when a project is adding to the workspace (#7526) 

* Dashboard: fixed error when a project is adding to the workspace

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>

* code clean-up: remove unused methods from CreateWorkspaceSvc

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>
6.19.x
Oleksii Kurinnyi 2017-11-23 15:43:25 +02:00 committed by GitHub
parent 4ed38202c6
commit 516d4f3cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
dashboard/src/app/workspaces/create-workspace/create-workspace.service.ts
View File

@ -218,22 +218,6 @@ export class CreateWorkspaceSvc {
this.$location.search({'init': 'true'});
}
/**
* Creates bunch of projects.
*
* @param {string} workspaceId the workspace ID
* @param {Array<che.IProjectTemplate>} projectTemplates the list of project templates to create
* @return {IPromise<any>}
*/
createProjects(workspaceId: string, projectTemplates: Array<che.IProjectTemplate>): ng.IPromise<any> {
if (projectTemplates.length === 0) {
return this.$q.reject();
}
const workspaceAgent = this.cheWorkspace.getWorkspaceAgent(workspaceId);
return workspaceAgent.getProject().createProjects(projectTemplates);
}
/**
* Adds commands from the bunch of project templates to provided workspace config.
*
@ -252,52 +236,4 @@ export class CreateWorkspaceSvc {
});
}
/**
* Adds bunch of commands for project in row.
* Returns resolved promise if all commands are imported properly, otherwise returns rejected promise with list of names of failed commands.
*
* @param {string} workspaceId the workspace ID
* @param {string} projectName the name of project
* @param {any[]} projectCommands the list of commands
* @return {IPromise<any>}
*/
addCommands(workspaceId: string, projectName: string, projectCommands: any[]): ng.IPromise<any> {
const defer = this.$q.defer();
defer.resolve();
let accumulatorPromise = defer.promise;
if (projectCommands.length === 0) {
return accumulatorPromise;
}
const failedCommands = [];
accumulatorPromise = projectCommands.reduce((_accumulatorPromise: ng.IPromise<any>, command: any) => {
command.name = projectName + ':' + command.name;
return _accumulatorPromise.then(() => {
return this.cheWorkspace.addCommand(workspaceId, command);
}, (error: any) => {
failedCommands.push(command.name);
if (error && error.message) {
this.$log.error(`Adding of command "${command.name}" failed for project "${projectName}" with error: ${error}`);
}
});
}, accumulatorPromise);
return accumulatorPromise.then(() => {
if (failedCommands.length) {
return this.$q.reject(failedCommands);
}
return this.$q.when();
});
}
private getIDE(): any {
const jqIframe = this.$document.find('#ide-application-iframe');
if (!jqIframe || jqIframe.length === 0) {
return null;
}
return (jqIframe as any).contentWindow.IDE;
}
}

2
dashboard/src/app/workspaces/workspace-details/workspace-details.service.ts
View File

@ -302,7 +302,7 @@ export class WorkspaceDetailsService {
}
// add commands
return this.createWorkspaceSvc.addProjectCommands(newWorkspace.id, projectTemplatesToAdd);
return this.createWorkspaceSvc.addProjectCommands(newWorkspace.config, projectTemplatesToAdd);
}).then(() => {
if (WorkspaceStatus[initStatus] === WorkspaceStatus.STOPPED || WorkspaceStatus[initStatus] === WorkspaceStatus.STOPPING) {
// stop workspace