Skip to content

show loading screen while replacing user code in skillmap tutorials #11540

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
Richard Knoll (riknoll) merged 1 commit into from
Aug 25, 2026
Merged

show loading screen while replacing user code in skillmap tutorials #11540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions webapp/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2286,17 +2286,24 @@ export class ProjectView
const header = mainPkg.header;
if (!header?.tutorial?.templateCode) return;

if (keepAssets) {
// Convert all temporary assets to named assets before we load in the template
let currentText = await workspace.getTextAsync(header.id);
const imageJres = appendTemporaryAssets(currentText[pxt.MAIN_BLOCKS], currentText[pxt.IMAGES_JRES]);
pkg.mainEditorPkg().setFile(pxt.IMAGES_JRES, imageJres);
await mainPkg.saveFilesAsync();
}
try {
core.showLoading("reset-tutorial", lf("Replacing tutorial code..."));

if (keepAssets) {
// Convert all temporary assets to named assets before we load in the template
let currentText = await workspace.getTextAsync(header.id);
const imageJres = appendTemporaryAssets(currentText[pxt.MAIN_BLOCKS], currentText[pxt.IMAGES_JRES]);
pkg.mainEditorPkg().setFile(pxt.IMAGES_JRES, imageJres);
await mainPkg.saveFilesAsync();
}

header.tutorial.templateLoaded = false;
delete header.tutorial.mergeHeaderId;
await this.reloadHeaderAsync();
header.tutorial.templateLoaded = false;
delete header.tutorial.mergeHeaderId;
await this.reloadHeaderAsync();
}
finally {
core.hideLoading("reset-tutorial");
}
}

removeProject() {
Expand Down
Loading