8000 Show user fields dialog again if upload fails by AlbyIanna · Pull Request #1415 · arduino/arduino-ide · GitHub
[go: up one dir, main page]
Skip to content

Show user fields dialog again if upload fails #1415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2022
Merged

Show user fields dialog again if upload fails #1415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc2ce86
Show user fields dialog again if upload fails
Sep 8, 2022
a34f6ff
move user fields logic into own contribution
Sep 9, 2022
94ca5f3
apply suggestions
Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
apply suggestions
  • Loading branch information
Alberto Iannaccone committed Sep 16, 2022
commit 94ca5f3f5fdb93bfc57a12e6113b984fa27f6ea1
2 changes: 1 addition & 1 deletion arduino-ide-extension/src/browser/contributions/upload-sketch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class UploadSketch extends CoreServiceContribution {
override registerCommands(registry: CommandRegistry): void {
registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH, {
execute: async () => {
if (await this.userFields.checkUserFieldsDialog(false)) {
if (await this.userFields.checkUserFieldsDialog()) {
this.uploadSketch();
}
},
Expand Down
25 changes: 13 additions & 12 deletions arduino-ide-extension/src/browser/contributions/user-fields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { inject, injectable } from '@theia/core/shared/inversify';
import { DisposableCollection, nls } from '@theia/core/lib/common';
import { BoardUserField } from '../../common/protocol';
import { BoardUserField, CoreError } from '../../common/protocol';
import { BoardsServiceProvider } from '../boards/boards-service-provider';
import { UserFieldsDialog } from '../dialogs/user-fields/user-fields-dialog';
import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
Expand All @@ -18,7 +18,7 @@ export class UserFields extends Contribution {
private readonly userFieldsDialog: UserFieldsDialog;

@inject(BoardsServiceProvider)
protected readonly boardsServiceProvider: BoardsServiceProvider;
private readonly boardsServiceProvider: BoardsServiceProvider;

@inject(MenuModelRegistry)
private readonly menuRegistry: MenuModelRegistry;
Expand Down Expand Up @@ -58,17 +58,17 @@ export class UserFields extends Contribution {
}
}

private selectedFqbnAddress(): string {
private selectedFqbnAddress(): string | undefined {
const { boardsConfig } = this.boardsServiceProvider;
const fqbn = boardsConfig.selectedBoard?.fqbn;
if (!fqbn) {
return '';
return undefined;
}
const address =
boardsConfig.selectedBoard?.port?.address ||
boardsConfig.selectedPort?.address;
if (!address) {
return '';
return undefined;
}
return fqbn + '|' + address;
}
Expand All @@ -78,9 +78,7 @@ export class UserFields extends Contribution {
): Promise<BoardUserField[] | undefined> {
const cached = this.cachedUserFields.get(key);
// Deep clone the array of board fields to avoid editing the cached ones
this.userFieldsDialog.value = (
cached ?? (await this.boardsServiceProvider.selectedBoardUserFields())
).map((f) => ({ ...f }));
this.userFieldsDialog.value = cached ? cached.slice() : await this.boardsServiceProvider.selectedBoardUserFields();
const result = await this.userFieldsDialog.open();
if (!result) {
return;
Expand All @@ -91,7 +89,7 @@ export class UserFields extends Contribution {
return result;
}

async checkUserFieldsDialog(forceOpen: boolean): Promise<boolean> {
async checkUserFieldsDialog(forceOpen = false): Promise<boolean> {
const key = this.selectedFqbnAddress();
if (!key) {
return false;
Expand Down Expand Up @@ -130,7 +128,11 @@ export class UserFields extends Contribution {
}

getUserFields(): BoardUserField[] {
return this.cachedUserFields.get(this.selectedFqbnAddress()) ?? [];
const fqbnAddress = this.selectedFqbnAddress();
if (!fqbnAddress) {
return [];
}
return this.cachedUserFields.get(fqbnAddress) ?? [];
}

isRequired(): boolean {
Expand All @@ -140,8 +142,7 @@ export class UserFields extends Contribution {
notifyFailedWithError(e: Error): void {
if (
this.boardRequiresUserFields &&
typeof e.message === 'string' &&
e.message.startsWith('Upload error:')
CoreError.UploadFailed.is(e)
) {
this.userFieldsSet = false;
}
Expand Down
0