Skip to content

Move skillmap projects to the editor workspace#8290

Merged
riknoll merged 19 commits into
masterfrom
skillmap-workspace
Jul 13, 2021
Merged

Move skillmap projects to the editor workspace#8290
riknoll merged 19 commits into
masterfrom
skillmap-workspace

Conversation

@riknoll
Copy link
Copy Markdown
Member

@riknoll riknoll commented Jul 13, 2021

Moving all of the skillmap projects from outside the editor iframe to inside! List of changes includes:

  1. Skillmap headers are now saved along all of the other editor projects with a flag to filter them out of "my projects"
  2. When we load the workspace, skillmap projects are automatically imported and soft-deleted from the skillmap workspace
  3. All code carryover project merging now happens inside the iframe when the tutorial is loaded
  4. Created some new tutorial events for reporting progress from the editor to the MakecodeFrame
  5. The skillmap now has the webconfig embedded in the HTML file and points to the correct target version instead of the embedURL for the iframe
  6. The "start fresh"/"keep code" dialog now shows before we load the editor instead of after

Here's a test upload:

Note: If you open this editor/skillmap upload, all of your skillmap tutorial projects will suddenly show up in the beta/released editor. The code to filter skillmap projects out of "My Projects" is part of this PR

TODO:

  1. Now that the dialog is before the editor load, we should start loading the editor in the background to improve perf
  2. I need to fix the loading editor event so that you don't ever see "starting tutorial" when opening an activity

Comment thread skillmap/src/actions/types.ts Outdated
{ label: lf("RESTART"), onClick: () => {
tickEvent("skillmap.activity.restart", { path: mapId, activity: activity!.activityId });
dispatchRestartActivity(mapId, activity!.activityId);
if (showCodeCarryoverModal) dispatchShowCarryoverModal(mapId, activity!.activityId);
Copy link
Copy Markdown
Contributor

@shakao shakao Jul 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it weird to have two subsequent modals like this? do the modals look different enough that kids won't just rapidly click on the rightmost button twice in a row? (probably a thing to discuss/fix in a later pr)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should maybe take a look at it in a design meeting; could be confusing.

Comment thread webapp/src/projects.tsx Outdated
Comment thread skillmap/src/components/makecodeFrame.tsx Outdated
Comment thread webapp/src/app.tsx
Comment thread webapp/src/app.tsx Outdated
Comment thread webapp/src/projects.tsx Outdated
@shakao
Copy link
Copy Markdown
Contributor

shakao commented Jul 13, 2021

hmm the completion modal/confetti autodisplay doesn't seem to be happening in the builds here

@riknoll riknoll merged commit e1d1baf into master Jul 13, 2021
@riknoll riknoll deleted the skillmap-workspace branch July 13, 2021 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants