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

File open dialog #145

Merged
merged 6 commits into from Apr 14, 2016

Conversation

Projects
None yet
3 participants
@will-moore
Member

will-moore commented Mar 15, 2016

This improves the File > Open dialog in a couple of ways.
Faster loading of files from OMERO (using projection query and not parsing json).
We now parse the json from file description during the Javascript render() of files.
The handling of missing thumbnails for deleted images is now done by the webgateway render_thumbnail (same as for webclient) instead of doing an extra query to identify missing images.

To test:

  • Try opening files in figure. Check for any problems. Should work as before.
  • When files are being loaded (and on "Refresh"), you should see a "Loading Files..." placeholder.
  • Loading of files should be faster, although I've previously only noticed it being slow on nightshade (7 secs to load 135 files).
  • The currently opened file should be "disabled" (not clickable) in the File > Open list. Should also be "disabled" after hitting refresh.
  • Try opening another user's File (where canEdit is False) and check that this is still reflected in the UI - shouldn't be able to Save change.

will-moore added some commits Mar 14, 2016

render() handles JSON.parse() of figure.description
This means that only visible files will have description parsed.
Also, missing thumbnails are now handled by webgateway.render_thumbnail
same is in webclient, instead of querying missing images before-hand.
@pwalczysko

This comment has been minimized.

Show comment
Hide comment
@pwalczysko

pwalczysko Mar 16, 2016

Member

All works as expected for every test. Very hard to compare the speed, it seems fast though on eel merge. But even on eel latest the loading is pretty fast.
Ready to merge.

Member

pwalczysko commented Mar 16, 2016

All works as expected for every test. Very hard to compare the speed, it seems fast though on eel merge. But even on eel latest the loading is pretty fast.
Ready to merge.

@snoopycrimecop snoopycrimecop referenced this pull request Apr 5, 2016

Merged

Improve file filter #147

@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore

will-moore Apr 7, 2016

Member

To test the last commit:

  • save a figure file named with some script html in it, E.g. test<script>alert('bad')</script>.
  • shouldn't get any alert popups - name should be displayed correctly
  • Then go to File > Open and check that the name is fully rendered in the file list and no alert popups are shown.
  • Also try refreshing the page or starting from the /figure/ home page and going to File > Open.

screen shot 2016-04-07 at 12 09 18

Member

will-moore commented Apr 7, 2016

To test the last commit:

  • save a figure file named with some script html in it, E.g. test<script>alert('bad')</script>.
  • shouldn't get any alert popups - name should be displayed correctly
  • Then go to File > Open and check that the name is fully rendered in the file list and no alert popups are shown.
  • Also try refreshing the page or starting from the /figure/ home page and going to File > Open.

screen shot 2016-04-07 at 12 09 18

@pwalczysko

This comment has been minimized.

Show comment
Hide comment
@pwalczysko

pwalczysko Apr 8, 2016

Member

Works as expected. Ready to merge.

Member

pwalczysko commented Apr 8, 2016

Works as expected. Ready to merge.

@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore

will-moore Apr 10, 2016

Member

@joshmoore / @jburel Would be great to get this merged if possible, then I can fix conflicts with #147 - Thanks!

Member

will-moore commented Apr 10, 2016

@joshmoore / @jburel Would be great to get this merged if possible, then I can fix conflicts with #147 - Thanks!

@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore

will-moore Apr 13, 2016

Member

@joshmoore / @jburel / @sbesson If you could merge this and #147 then I can prepare release RC1? Thanks.

Member

will-moore commented Apr 13, 2016

@joshmoore / @jburel / @sbesson If you could merge this and #147 then I can prepare release RC1? Thanks.

@jburel jburel merged commit 7b52b85 into ome:master Apr 14, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment