diff --git a/deadlock-plugins/deadlock-extension/src/core/controller.ts b/deadlock-plugins/deadlock-extension/src/core/controller.ts index 0cd96e5243a307751506a2066427bce2fdbcca0b..1eebcfc590a7a94910f7c7fd33f0022fc0e2866d 100644 --- a/deadlock-plugins/deadlock-extension/src/core/controller.ts +++ b/deadlock-plugins/deadlock-extension/src/core/controller.ts @@ -22,7 +22,7 @@ import ApiService from './api.service'; export default class Controller { private static instance: Controller; private commandHandler: CommandHandler; - private briefingView: BriefingView; + private briefingView?: BriefingView; private quickSetupView: QuickSetupView; private _extensionStore: ExtensionStore; @@ -40,7 +40,9 @@ export default class Controller { private constructor(public readonly context: ExtensionContext) { this._extensionStore = ExtensionStore.getInstance(context); - this.briefingView = new BriefingView(); + if (isDocker()) { + this.briefingView = new BriefingView(); + } this.quickSetupView = new QuickSetupView(context.extensionUri); this.commandHandler = new CommandHandler(this); @@ -109,7 +111,7 @@ export default class Controller { if (!missionId || !missionVersion) { window.showErrorMessage('Identifiant ou version de la mission incorrect'); } else { - that.launchMission(missionId, missionVersion, userId, storyId); + that.launchMission({ missionId, missionVersion, revieweeId: userId, storyId }); } break; @@ -163,7 +165,17 @@ export default class Controller { commands.executeCommand(openUrlInBrowserCommand.command, Uri.parse(url)); } - public async launchMission(missionId: string, missionVersion: string, revieweeId?: string, storyId?: string) { + public async launchMission({ + missionId, + missionVersion, + revieweeId, + storyId, + }: { + missionId: string; + missionVersion: string; + revieweeId?: string; + storyId?: string; + }) { window.showInformationMessage(`vous lancez la mission ${missionId}`); const hadBeenConnected = (await this._extensionStore.getAccessToken()) !== undefined; @@ -200,7 +212,7 @@ export default class Controller { try { await missionDevcontainer.open(); - } catch(e) { + } catch (e) { window.showErrorMessage('Impossible de lancer la mission'); extensionError(e); } diff --git a/deadlock-plugins/deadlock-extension/src/view/startedMissionsView.ts b/deadlock-plugins/deadlock-extension/src/view/startedMissionsView.ts index 54efd4b9cae3191c94cf3e4cf2bef5a4a5373fc4..8fac6e7ee6e1bb1504b4980c0cdd47bec1447ed9 100644 --- a/deadlock-plugins/deadlock-extension/src/view/startedMissionsView.ts +++ b/deadlock-plugins/deadlock-extension/src/view/startedMissionsView.ts @@ -28,7 +28,11 @@ export default class StartedMissionsView implements WebviewViewProvider { case 'openMission': { const path = join(missionWorkdir, message.mission, '.config', 'user-challenge.json'); const userMission: UserMission = JSON.parse(readFileSync(path, 'utf8')); - Controller.getInstance().launchMission(userMission.missionId, userMission.missionVersion, userMission.storyId); + Controller.getInstance().launchMission({ + missionId: userMission.missionId, + missionVersion: userMission.missionVersion, + storyId: userMission.storyId, + }); return; } }