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

Fix handling supported versions based on the devfile introduction 

Signed-off-by: Anna Shumilova <ashumilo@redhat.com>
7.20.x
Anna Shumilova 2019-05-24 15:04:57 +03:00
parent 6709fdca40
commit d27872b09f
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dashboard/src/app/ide/ide.controller.ts
View File

@ -140,7 +140,8 @@ class IdeCtrl {
this.workspaces = this.cheWorkspace.getWorkspaces();
for (let i = 0; i < this.workspaces.length; i++) {
if (this.workspaces[i].config.name === this.selectedWorkspaceName) {
let name = this.cheWorkspace.getWorkspaceDataManager().getName(this.workspaces[i]);
if (name === this.selectedWorkspaceName) {
this.selectedWorkspace = this.workspaces[i];
}
}

3
dashboard/src/app/ide/ide.service.ts
View File

@ -145,7 +145,8 @@ class IdeSvc {
let workspace = this.cheWorkspace.getWorkspaceById(workspaceId);
this.openedWorkspace = workspace;
let workspaceLoaderUrl = this.cheWorkspace.getWorkspaceLoaderUrl(workspace.namespace, workspace.config.name);
let name = this.cheWorkspace.getWorkspaceDataManager().getName(workspace);
let workspaceLoaderUrl = this.cheWorkspace.getWorkspaceLoaderUrl(workspace.namespace, name);
let ideUrlLink = workspaceLoaderUrl || workspace.links.ide;
if (this.ideAction != null) {

3
dashboard/src/app/navbar/recent-workspaces/recent-workspaces.controller.ts
View File

@ -331,7 +331,8 @@ export class NavbarRecentWorkspacesController {
let workspace = this.cheWorkspace.getWorkspaceById(workspaceId);
this.updateRecentWorkspace(workspaceId);
this.cheWorkspace.startWorkspace(workspace.id, workspace.config.defaultEnv).catch((error: any) => {
this.cheWorkspace.startWorkspace(workspace.id, workspace.config ? workspace.config.defaultEnv: null).catch((error: any) => {
this.$log.error(error);
this.cheNotification.showError('Run workspace error.', error);
});

17
dashboard/src/app/workspaces/workspaces.service.ts
View File

@ -13,7 +13,7 @@
import {CheWorkspace} from '../../components/api/workspace/che-workspace.factory';
const MINIMAL_SUPORTED_VERSION = 7;
const MINIMAL_SUPPORTED_VERSION = 7;
/**
* This is a helper class for workspaces.
@ -58,13 +58,10 @@ export class WorkspacesService {
/**
* Returns `true` if supported.
* @param {che.IWorkspace} workspace
* @param {string=} envName environment name
* @returns {boolean}
*/
isSupported(workspace: che.IWorkspace, envName?: string): boolean {
envName = envName || workspace.config.defaultEnv;
return this.isSupportedRecipeType(workspace, envName) && this.isSupportedVersion(workspace);
isSupported(workspace: che.IWorkspace): boolean {
return this.isSupportedRecipeType(workspace) && this.isSupportedVersion(workspace);
}
/**
@ -73,11 +70,15 @@ export class WorkspacesService {
* @returns {boolean}
*/
isSupportedVersion(workspace: che.IWorkspace): boolean {
if (workspace.devfile) {
return true;
}
if (!workspace || !workspace.config) {
return false;
}
const config = workspace.config;
const machines = config.environments[config.defaultEnv];
const machines = config.environments[config.defaultEnv].machines;
let version: number;
if (!Object.keys(machines).length || config.attributes.editor || config.attributes.plugins) {
@ -92,7 +93,7 @@ export class WorkspacesService {
}
}
return version && version >= MINIMAL_SUPORTED_VERSION;
return version && version >= MINIMAL_SUPPORTED_VERSION;
}
}