diff --git a/deadlock-plugins/deadlock-extension/package.json b/deadlock-plugins/deadlock-extension/package.json index 118434ece863e1445ce8f0c40b0318d7d56dcd55..69aa8ecd31ee4a426c3aee800ade330a3baf4327 100644 --- a/deadlock-plugins/deadlock-extension/package.json +++ b/deadlock-plugins/deadlock-extension/package.json @@ -29,8 +29,8 @@ "category": "Deadlock Coding" }, { - "command": "deadlock.openGettingStarted", - "title": "Open Deadlock home page", + "command": "deadlock.openQuickSetup", + "title": "Open Deadlock quick setup page", "category": "Deadlock Coding" }, { @@ -71,7 +71,7 @@ "viewsWelcome": [ { "view": "help", - "contents": "[Getting Started](command:deadlock.openGettingStarted)\n" + "contents": "[Quick Setup](command:deadlock.openQuickSetup)\n" } ], "menus": { diff --git a/deadlock-plugins/deadlock-extension/src/core/controller.ts b/deadlock-plugins/deadlock-extension/src/core/controller.ts index 2877d4c59bee0e91c57d8a20ff73123b3ec243fa..da3c8b386ad3a5b9a8e6fd986cb00eb6d275e29e 100644 --- a/deadlock-plugins/deadlock-extension/src/core/controller.ts +++ b/deadlock-plugins/deadlock-extension/src/core/controller.ts @@ -1,8 +1,8 @@ import * as vscode from 'vscode'; import { KEYCLOAK_DEVICE_AUTH_URL, KEYCLOAK_TOKEN_CREATE_URL, KEYCLOAK_USER_INFO_URL } from '../config'; -import { OPEN_GETTING_STARTED_COMMAND } from '../theia/command'; +import { OPEN_QUICK_SETUP_COMMAND } from '../theia/command'; import BriefingView from '../view/briefingView'; -import GettingStartedView from '../view/gettingStartedView'; +import QuickSetupView from '../view/quickSetupView'; import { CHOOSE_MISSION_WORKDIR_COMMAND, CommandHandler, OPEN_URL_IN_BROWSER_COMMAND } from './commandHandler'; import ExtensionStore from './extensionStore'; import KeycloakOAuth2DeviceFlowConnection from './keycloakOAuth2DeviceFlowConnection'; @@ -11,11 +11,11 @@ export default class Controller { public connection: KeycloakOAuth2DeviceFlowConnection; private commandHandler: CommandHandler; private briefingView: BriefingView; - private gettingStartedView: GettingStartedView; + private quickSetupView: QuickSetupView; private extensionStore: ExtensionStore; constructor(private context: vscode.ExtensionContext) { this.briefingView = new BriefingView(); - this.gettingStartedView = new GettingStartedView(context.extensionUri); + this.quickSetupView = new QuickSetupView(context.extensionUri); this.commandHandler = new CommandHandler(this); this.connection = new KeycloakOAuth2DeviceFlowConnection( KEYCLOAK_DEVICE_AUTH_URL, @@ -45,7 +45,7 @@ export default class Controller { }); const exensionStorage = ExtensionStore.getInstance(); - this.gettingStartedView.isAlreadyConnected = !!(await exensionStorage.getAccessToken()); + this.quickSetupView.isAlreadyConnected = !!(await exensionStorage.getAccessToken()); } async chooseMissionWorkdir() { const actualMissionWorkDir = this.extensionStore.getMissionWorkdir(); @@ -69,7 +69,7 @@ export default class Controller { public async clear() { const exensionStorage = ExtensionStore.getInstance(); await exensionStorage.clear(); - this.gettingStartedView.isAlreadyConnected = false; + this.quickSetupView.isAlreadyConnected = false; } public async authenticate() { @@ -79,7 +79,7 @@ export default class Controller { const tokens = await this.connection.getToken({ openLink: Controller.openBrowserWithUrl }); await this.extensionStore.setAccessToken(tokens.accessToken); await this.extensionStore.setRefreshToken(tokens.refreshToken); - this.gettingStartedView.isAlreadyConnected = true; + this.quickSetupView.isAlreadyConnected = true; } public static openBrowserWithUrl(url: string) { vscode.commands.executeCommand(OPEN_URL_IN_BROWSER_COMMAND.cmd, vscode.Uri.parse(url)); @@ -102,7 +102,7 @@ export default class Controller { vscode.window.showInformationMessage('Déjà connecté: session récupérée'); } - vscode.commands.executeCommand(OPEN_GETTING_STARTED_COMMAND.cmd); + vscode.commands.executeCommand(OPEN_QUICK_SETUP_COMMAND.cmd); } } } diff --git a/deadlock-plugins/deadlock-extension/src/theia/command.ts b/deadlock-plugins/deadlock-extension/src/theia/command.ts index 8f38fba61336458770c6f7b1ad2a910648667d56..53638bd941e7cc69623287b76f5670be8e78cb2c 100644 --- a/deadlock-plugins/deadlock-extension/src/theia/command.ts +++ b/deadlock-plugins/deadlock-extension/src/theia/command.ts @@ -16,4 +16,4 @@ export class Command { } export const OPEN_BRIEFING_COMMAND = new Command('Open Briefing', 'deadlock.openBriefing'); -export const OPEN_GETTING_STARTED_COMMAND = new Command('Open Deadlock home page', 'deadlock.openGettingStarted'); +export const OPEN_QUICK_SETUP_COMMAND = new Command('Open Deadlock quick setup page', 'deadlock.openQuickSetup'); diff --git a/deadlock-plugins/deadlock-extension/src/view/gettingStartedView.ts b/deadlock-plugins/deadlock-extension/src/view/quickSetupView.ts similarity index 92% rename from deadlock-plugins/deadlock-extension/src/view/gettingStartedView.ts rename to deadlock-plugins/deadlock-extension/src/view/quickSetupView.ts index 5a99d2ec0fc78ce530f3aa13484a15ef67deb250..0c09a3432b10756053286f85229c1f4adc17b138 100644 --- a/deadlock-plugins/deadlock-extension/src/view/gettingStartedView.ts +++ b/deadlock-plugins/deadlock-extension/src/view/quickSetupView.ts @@ -2,18 +2,18 @@ import * as vscode from 'vscode'; import { AUTHENTICATE_COMMAND, CHOOSE_MISSION_WORKDIR_COMMAND } from '../core/commandHandler'; import ExtensionStore from '../core/extensionStore'; import { log } from '../recorder/utils'; -import { OPEN_GETTING_STARTED_COMMAND } from '../theia/command'; +import { OPEN_QUICK_SETUP_COMMAND } from '../theia/command'; import { WebviewBase } from './webviewBase'; -export const GETTING_STARTED_ID = 'gettingStarted'; +export const QUICK_SETUP_ID = 'quickSetup'; -export default class GettingStartedView extends WebviewBase { +export default class QuickSetupView extends WebviewBase { private extensionUri: vscode.Uri; private extensionStore: ExtensionStore; private _isAlreadyConnected: boolean; constructor(extensionUri: vscode.Uri) { - super(GETTING_STARTED_ID, 'GettingStarted', OPEN_GETTING_STARTED_COMMAND); + super(QUICK_SETUP_ID, 'QuickSetup', OPEN_QUICK_SETUP_COMMAND); this.extensionUri = extensionUri; this.extensionStore = ExtensionStore.getInstance(); this._isAlreadyConnected = false; @@ -41,7 +41,7 @@ export default class GettingStartedView extends WebviewBase { const hadMissionWorkdir = this.extensionStore.getMissionWorkdir() !== undefined; return ` - <h1>Getting Started</h1> + <h1>Quick Setup</h1> <div class="deadlock-getting-started-card-container"> ${this.renderCardHtml(