jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-09 04:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Defer settings/certificates load until app ready.

Browse Source 
Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Akos Kitta 2022-08-05 16:24:52 +02:00 committed by Akos Kitta
parent 92bc5ecf7b
commit 7a3e6789d1
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx
View File

@ -19,6 +19,7 @@ import { CommandRegistry } from '@theia/core/lib/common/command';
import { certificateList, sanifyCertString } from './utils'; import { certificateList, sanifyCertString } from './utils';
import { ArduinoFirmwareUploader } from '../../../common/protocol/arduino-firmware-uploader'; import { ArduinoFirmwareUploader } from '../../../common/protocol/arduino-firmware-uploader';
import { nls } from '@theia/core/lib/common'; import { nls } from '@theia/core/lib/common';
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
@injectable() @injectable()
export class UploadCertificateDialogWidget extends ReactWidget { export class UploadCertificateDialogWidget extends ReactWidget {
@ -37,6 +38,9 @@ export class UploadCertificateDialogWidget extends ReactWidget {
@inject(ArduinoFirmwareUploader) @inject(ArduinoFirmwareUploader)
protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader; protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
@inject(FrontendApplicationStateService)
private readonly appStateService: FrontendApplicationStateService;
protected certificates: string[] = []; protected certificates: string[] = [];
protected updatableFqbns: string[] = []; protected updatableFqbns: string[] = [];
protected availableBoards: AvailableBoard[] = []; protected availableBoards: AvailableBoard[] = [];
@ -66,10 +70,12 @@ export class UploadCertificateDialogWidget extends ReactWidget {
} }
}); });
this.arduinoFirmwareUploader.updatableBoards().then((fqbns) => { this.appStateService.reachedState('ready').then(() =>
this.updatableFqbns = fqbns; this.arduinoFirmwareUploader.updatableBoards().then((fqbns) => {
this.update(); this.updatableFqbns = fqbns;
}); this.update();
})
);
this.boardsServiceClient.onAvailableBoardsChanged((availableBoards) => { this.boardsServiceClient.onAvailableBoardsChanged((availableBoards) => {
this.availableBoards = availableBoards; this.availableBoards = availableBoards;

8
arduino-ide-extension/src/browser/dialogs/settings/settings.ts
View File

@ -111,9 +111,11 @@ export class SettingsService {
@postConstruct() @postConstruct()
protected async init(): Promise<void> { protected async init(): Promise<void> {
const settings = await this.loadSettings(); this.appStateService.reachedState('ready').then(async () => {
this._settings = deepClone(settings); const settings = await this.loadSettings();
this.ready.resolve(); this._settings = deepClone(settings);
this.ready.resolve();
});
} }
protected async loadSettings(): Promise<Settings> { protected async loadSettings(): Promise<Settings> {