-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Connect welcome view (UI) and new connection status bar (#24)
* New UI/functionality - Welcome view added. - Status bar added - NodeConfig view removed and the functionality was moved to the status bar. * Update package.json - removing redundant condition. Co-authored-by: Xuefei Han <[email protected]> * The welcome view messages updated. Co-authored-by: Manas Kumar Das <[email protected]> --------- Co-authored-by: Xuefei Han <[email protected]> Co-authored-by: Manas Kumar Das <[email protected]>
- Loading branch information
3 people
committed
Jan 31, 2023
1 parent
a3be7f5
commit 25290d5
Showing
6 changed files
with
174 additions
and
333 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| import * as vscode from "vscode"; | ||
| import * as client from "../utilities/pyrsiaClient"; | ||
| import { Util } from "../utilities/Util"; | ||
|
|
||
| export class ConnectionStatusBar { | ||
| public static readonly updateStatusBarCommandId: string = "pyrsia.status-bar.update"; // NOI18N | ||
| public static readonly showMessageStatusBarCommandId: string = "pyrsia.status-bar.show-message"; // NOI18N | ||
| public static readonly configNodeCommandId = "pyrsia.node-config.update-url"; // NOI18N | ||
| private readonly statusBar; | ||
|
|
||
| constructor(context: vscode.ExtensionContext) { | ||
| // create a new status bar item that we can now manage | ||
| this.statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100); | ||
| this.statusBar.command = ConnectionStatusBar.showMessageStatusBarCommandId; | ||
| context.subscriptions.push(this.statusBar); | ||
|
|
||
| // register the command to update the Pyrsia connection status bar | ||
| const updateStatusBarCommand = vscode.commands.registerCommand(ConnectionStatusBar.updateStatusBarCommandId, async () => { | ||
| await this.requestUpdateStatusBar(); | ||
| }); | ||
| context.subscriptions.push(updateStatusBarCommand); | ||
|
|
||
| // register the show message command | ||
| const showMessageStatusBarCommand = vscode.commands.registerCommand(ConnectionStatusBar.showMessageStatusBarCommandId, async () => { | ||
| await this.clickOnStatusBarShowMessage(); | ||
| }); | ||
| context.subscriptions.push(showMessageStatusBarCommand); | ||
|
|
||
| // Add a command to update the Pyrsia node configuration (actually just URL) | ||
| const configureNodeCommand = vscode.commands.registerCommand( | ||
| ConnectionStatusBar.configNodeCommandId, | ||
| async () => { | ||
| // the update node url input box | ||
| const options: vscode.InputBoxOptions = { | ||
| prompt: "Update the Pyrsia node address (e.g. localhost:7888)", | ||
| validateInput(value) { | ||
| let errorMessage: string | undefined; | ||
| console.debug(`Node configuration input: ${value}`); | ||
| if (!value.toLocaleLowerCase().startsWith(Util.getNodeConfig.prototype)) { | ||
| value = `${Util.getNodeConfig().protocol}://${value}`; | ||
| } | ||
| try { | ||
| new URL(value); | ||
| } catch (error) { | ||
| errorMessage = | ||
| "Incorrect Pyrsia node address, please provide a correct address (e.g localhost:7888)"; | ||
| } | ||
|
|
||
| return errorMessage; | ||
| }, | ||
| value: Util.getNodeConfig().host | ||
| }; | ||
| context.subscriptions.push(configureNodeCommand); | ||
|
|
||
| // show the url input box so the user can provide a new node address | ||
| Util.getNodeConfig().url = await vscode.window.showInputBox(options); | ||
| await this.requestUpdateStatusBar(); | ||
| // check the new url connection | ||
| const healthy = await client.isNodeHealthy(); | ||
| if (!healthy) { | ||
| vscode.window.showErrorMessage(`Cannot connect to Pyrsi node: '${Util.getNodeConfig().url}', | ||
| please make sure the Pyrsia node is available.'`); | ||
| } | ||
| } | ||
| ); | ||
| context.subscriptions.push(configureNodeCommand); | ||
| // update the status bar | ||
| this.requestUpdateStatusBar(); | ||
| } | ||
|
|
||
| public async requestUpdateStatusBar() { | ||
| const connected: boolean = await client.isNodeHealthy(); | ||
| this.statusBar.text = connected ? "🟢 Pyrsia" : "🔴 Pyrsia"; | ||
| this.statusBar.show(); | ||
| Util.nodeConnected = connected; | ||
| } | ||
|
|
||
| private async clickOnStatusBarShowMessage() { | ||
| const connected: boolean = await client.isNodeHealthy(); | ||
| const nodeConfig = Util.getNodeConfig(); | ||
| if (connected) { | ||
| vscode.window.showInformationMessage(`Connected, Pyrsia node: '${nodeConfig.host}'`); | ||
| } else { | ||
| const connectOptions = "Connect"; | ||
| const result = await vscode.window.showErrorMessage(`Not connected, Pyrsia node: '${nodeConfig.host}'`, connectOptions); | ||
| if (result === connectOptions) { | ||
| vscode.commands.executeCommand(ConnectionStatusBar.configNodeCommandId); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
Oops, something went wrong.