Commit 7a3e678

Akos Kittakittaakos

Akos Kitta

authored and

committed

Defer settings/certificates load until app ready.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

1 parent 92bc5ec commit 7a3e678Copy full SHA for 7a3e678

File tree

2 files changed

+15

-7

lines changed

arduino-ide-extension/src/browser/dialogs
- certificate-uploader
  - certificate-uploader-dialog.tsx
- settings
  - settings.ts

2 files changed

+15

-7

lines changed

`‎arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx‎`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import { CommandRegistry } from '@theia/core/lib/common/command';`
`19`	`19`	`import { certificateList, sanifyCertString } from './utils';`
`20`	`20`	`import { ArduinoFirmwareUploader } from '../../../common/protocol/arduino-firmware-uploader';`
`21`	`21`	`import { nls } from '@theia/core/lib/common';`
	`22`	`+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';`
`22`	`23`
`23`	`24`	`@injectable()`
`24`	`25`	`export class UploadCertificateDialogWidget extends ReactWidget {`
`@@ -37,6 +38,9 @@ export class UploadCertificateDialogWidget extends ReactWidget {`
`37`	`38`	`@inject(ArduinoFirmwareUploader)`
`38`	`39`	`protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;`
`39`	`40`
	`41`	`+ @inject(FrontendApplicationStateService)`
	`42`	`+ private readonly appStateService: FrontendApplicationStateService;`
	`43`	`+`
`40`	`44`	`protected certificates: string[] = [];`
`41`	`45`	`protected updatableFqbns: string[] = [];`
`42`	`46`	`protected availableBoards: AvailableBoard[] = [];`
`@@ -66,10 +70,12 @@ export class UploadCertificateDialogWidget extends ReactWidget {`
`66`	`70`	`}`
`67`	`71`	`});`
`68`	`72`
`69`		`- this.arduinoFirmwareUploader.updatableBoards().then((fqbns) => {`
`70`		`- this.updatableFqbns = fqbns;`
`71`		`- this.update();`
`72`		`- });`
	`73`	`+ this.appStateService.reachedState('ready').then(() =>`
	`74`	`+ this.arduinoFirmwareUploader.updatableBoards().then((fqbns) => {`
	`75`	`+ this.updatableFqbns = fqbns;`
	`76`	`+ this.update();`
	`77`	`+ })`
	`78`	`+ );`
`73`	`79`
`74`	`80`	`this.boardsServiceClient.onAvailableBoardsChanged((availableBoards) => {`
`75`	`81`	`this.availableBoards = availableBoards;`

`‎arduino-ide-extension/src/browser/dialogs/settings/settings.ts‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,11 @@ export class SettingsService {`
`111`	`111`
`112`	`112`	`@postConstruct()`
`113`	`113`	`protected async init(): Promise<void> {`
`114`		`- const settings = await this.loadSettings();`
`115`		`- this._settings = deepClone(settings);`
`116`		`- this.ready.resolve();`
	`114`	`+ this.appStateService.reachedState('ready').then(async () => {`
	`115`	`+ const settings = await this.loadSettings();`
	`116`	`+ this._settings = deepClone(settings);`
	`117`	`+ this.ready.resolve();`
	`118`	`+ });`
`117`	`119`	`}`
`118`	`120`
`119`	`121`	`protected async loadSettings(): Promise<Settings> {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 7a3e678

File tree

2 files changed

2 files changed

`‎arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx‎`

`‎arduino-ide-extension/src/browser/dialogs/settings/settings.ts‎`

0 commit comments