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

ES6 refactoring of files touched in collection_state branch. #5001

Merged
merged 2 commits into from Nov 14, 2017

Conversation

Projects
None yet
2 participants
@jmchilton
Copy link
Member

jmchilton commented Nov 14, 2017

A few of these actually bump into things I'm touching, a few of these are just me exploring ES6 and cleaning up the code a bit.

@jmchilton jmchilton added this to the 18.01 milestone Nov 14, 2017

'<div class="empty-message infomessagesmall"></div>',
"</div>"
]);
var mainTemplate = () =>

This comment has been minimized.

Copy link
@dannon

dannon Nov 14, 2017

Member

I think mainTemplate should just be the string literal here (no arrow function), unless I'm missing something in the refactoring.

This comment has been minimized.

Copy link
@jmchilton

jmchilton Nov 14, 2017

Author Member

Fair point - I'll give that a try.

This comment has been minimized.

Copy link
@dannon

dannon Nov 14, 2017

Member

Actually (and I haven't tested it yet) it may have to be a function even though it takes no params, now that I think about it a little more. Sorry for the noise, if so!

This comment has been minimized.

Copy link
@jmchilton

jmchilton Nov 14, 2017

Author Member

Looks like it is needed.

screen shot 2017-11-14 at 11 25 24 am

This comment has been minimized.

Copy link
@dannon

dannon Nov 14, 2017

Member

Yep, figured. Good to know, thanks for checking!

@jmchilton

This comment has been minimized.

Copy link
Member Author

jmchilton commented Nov 14, 2017

Marking as WIP since that qunit test failure seems legitimate.

jmchilton added some commits Nov 3, 2017

Random ES6-ing of files working on in collection_state branch downstr…
…eam.

A few of these actually bump into things I'm touching, a few of these are just me exploring ES6 and cleaning up the code a bit.

@jmchilton jmchilton force-pushed the jmchilton:es6_collections_2 branch from 20fe9fd to 53cbbee Nov 14, 2017

@jmchilton jmchilton added status/review and removed status/WIP labels Nov 14, 2017

@jmchilton

This comment has been minimized.

Copy link
Member Author

jmchilton commented Nov 14, 2017

Taking out of WIP - that qunit test picked up an actual bug. I'm impressed by how clean and useful that test was - I may need to rethink unit testing JS - very nice.

@dannon

This comment has been minimized.

Copy link
Member

dannon commented Nov 14, 2017

@jmchilton What was the bug/fix, so I'm aware for future js overhauls like this? (the rebase makes it difficult to track down)

@jmchilton

This comment has been minimized.

Copy link
Member Author

jmchilton commented Nov 14, 2017

@dannon I was just sloppy in building up a URL with the back ticks and local variables.

@dannon

This comment has been minimized.

Copy link
Member

dannon commented Nov 14, 2017

@jmchilton Got it, thanks! Just trying to keep a mental catalog of the types of errors we may make, what to look for, etc., as we modernize all this.

@dannon dannon merged commit 61fda75 into galaxyproject:dev Nov 14, 2017

7 checks passed

api test Build finished. 310 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 162 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 57 tests run, 0 skipped, 0 failed.
Details
lgtm analysis: JavaScript No alert changes
Details
selenium test Build finished. 98 tests run, 1 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.