Skip to content
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.

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

feat: support uploading file from old block factory #2336

Merged
merged 2 commits into from
May 3, 2024

Conversation

maribethb
Copy link
Contributor

The basics

The details

Resolves

Fixes #2291

Proposed Changes

  • Adds the ability to upload one or more files downloaded from the old block factory tool (json format)
  • Will show a message with the results of the upload, then load the first successful block if possible

Reason for Changes

Test Coverage

Documentation

Coming soon!

Additional Information

The corresponding change in the old block factory to let you download the required data is coming soon

Screen.Recording.2024-04-18.at.1.55.20.PM.mov

@maribethb maribethb requested a review from a team as a code owner April 23, 2024 20:04
@maribethb maribethb requested review from cpcallen and removed request for a team April 23, 2024 20:04
Copy link
Contributor

@cpcallen cpcallen left a comment

Choose a reason for hiding this comment

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

I can't really comment on the material design stuff since I'm quite unfamiliar with this, but if it LGTY then it's probably fine.

One thing I note is that it looks like one can drag and drop multiple files at a time, but only load one file at a time via the file picker. That seems like a surprising limitation. Is it a limitation in the HTML living spec, in the @material/web package, or in your code? If the latter it would seem worth removing, since most of the rest of the needed machinery is already present here.

examples/developer-tools/src/controller.ts Outdated Show resolved Hide resolved
examples/developer-tools/src/controller.ts Outdated Show resolved Hide resolved
examples/developer-tools/src/controller.ts Outdated Show resolved Hide resolved
examples/developer-tools/src/controller.ts Outdated Show resolved Hide resolved
examples/developer-tools/src/controller.ts Outdated Show resolved Hide resolved
examples/developer-tools/src/controller.ts Outdated Show resolved Hide resolved
Cancel
</md-text-button>
</div>
</md-dialog>
<md-dialog id="upload-results-modal">
Copy link
Contributor

Choose a reason for hiding this comment

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

What is this I don't even.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can't tell what part of this you are reacting to, is it the custom element? They're fun and also funfact you can't put blockly inside one :)

Copy link
Contributor

@BeksOmega BeksOmega left a comment

Choose a reason for hiding this comment

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

I didn't read through the first commit, but fixes from the previous review all LGTM =) Let me know if you want me to go over the original changes, but Christophers review seemed detailed enough that I trust it!

@maribethb maribethb merged commit 618a6ca into google:developer-tools May 3, 2024
9 checks passed
maribethb added a commit to maribethb/blockly-samples that referenced this pull request Jun 12, 2024
* feat: support uploading file from old block factory

* feat: support multiple file input, minor pr fixes
maribethb added a commit that referenced this pull request Jun 28, 2024
* feat: add basic infrastructure of developer-tools

* chore: add eof newline where missing

* fix: formatting, license, css attributes

* feat: add block factory blocks and toolbox (#2155)

* feat: add block factory blocks and toolbox

* fix: pr comments

* fix: change type to connection check

* fix: formatting and comments

* chore: lint and format developer-tools (#2185)

* chore: autofix lint

* chore: manually fix most of the lint

* chore: format

* feat: add basic saving and loading and start block state (#2187)

* feat: add json definition generator (#2188)

* feat: add javascript definition generators for blocks (#2196)

* feat: add javascript definition generators for blocks

* chore: format

* fix: switch statement style

Co-authored-by: Christopher Allen <[email protected]>

* fix: update to latest blockly to use JavascriptGenerator class

* fix: fix img dropdown option

---------

Co-authored-by: Christopher Allen <[email protected]>

* feat: add controllers and models to switch between definitions (#2219)

* feat: add code header generation for imports and script tags (#2286)

* feat: add save, load, and delete functionality to dev-tools (#2285)

* feat: add save, load, and delete functionality to dev-tools

* chore: format

* chore: update load name

* feat: add generator stubs to block factory (#2295)

* feat: add generator stub generator and output

* feat: add generator headers

* chore: add more tsdoc

* chore: minor refactoring of template strings

* feat: save block factory settings (#2297)

* feat: save block factory settings

* chore: const to named functions

* feat: add ability to convert old block factory json to new (#2304)

* feat: add ability to convert old block factory json to new

* chore: format and use constant

* fix: use better typings, minor refactoring

* feat: add shadow blocks for connection checks and real colour block (#2307)

* feat: add file upload for block factory (#2320)

* feat: add file upload for block factory

* chore: fix questionable html formatting

* chore: rename and comments

* feat: add angle and colour fields to block factory (#2325)

* feat: add angle and colour fields to block factory

* fix: call register fields in script header

* feat: support uploading file from old block factory (#2336)

* feat: support uploading file from old block factory

* feat: support multiple file input, minor pr fixes

* feat: update to blockly v11 & improve style (#2388)

* fix: styling

* fix: changes for v11

* fix: set max height in narrow mode

* fix: min height of code divs

* chore: format

* chore: remove log

* feat: use a js legal name for the block in code output (#2392)

* feat: use a js legal name for the block in code output

* fix: legal js name probably

* feat: add help button and favicon (#2396)

* feat: include developer-tools when publishing to gh-pages (#2395)

---------

Co-authored-by: Christopher Allen <[email protected]>
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