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

Add web files required by rosie disco (only) #20

Conversation

sadielbartholomew
Copy link

I've traced the single test failure in metomi#2357 to a lack of HTML, CSS & JS files required by the Rosie Disco Service when it runs in the browser, as standard (see metomi#2355 (comment)). These were removed from the master (Rose 2) branch during metomi#2318.

This PR re-adds the directories & the required web files as in the current 7.8.x branch, excluding those explicitly referencing Rose Bush.

Since only the full directory is explicitly referenced to be read:

https://github.com/metomi/rose/blob/a2309eb25e6768d9c0628d9da75e1f3adb9f91b5/lib/python/rosie/ws.py#L135-L136

... I am not sure of a way to determine which files under lib/html/static/ are used by Rosie Disco Service & which were used only by Rose Bush, so the latter can be removed. Any ideas on how to filter out such Rose Bush files so I can remove them from this PR? Otherwise, I think for not we should just re-add everything under static/, as we may well be adjusting the front-end soon, so I am not sure it is worth too much effort to manually trawl through these.

@oliver-sanders
Copy link
Owner

I am not sure of a way to determine which files under lib/html/static/ are used by Rosie Disco

Most of these are bundled files which it would be good to get out of the library, we can remove them from ACKNOWLEDGEMENT.md in the process.

From a quick pass, I think these aren't necessary for Rosie Disco:

DataTables

This file we are using:

  • lib/html/static/css/jquery.dataTables.css

The others we are not:

  • lib/html/static/css/jquery.dataTables.!(css)*
  • lib/html/static/js/dataTables*

($ git grep dataTables -- lib/html/template/)

Code Highlighting:

  • lib/html/static/css/prettify.css
  • lib/html/static/js/lang-*
  • lib/html/static/js/prettify*

Other

  • lib/html/static/rose-favicon.png
  • lib/html/static/js/search.js

@sadielbartholomew
Copy link
Author

sadielbartholomew commented Jun 17, 2019

Thanks @oliver-sanders, I'll get those removed.

@oliver-sanders oliver-sanders merged commit e59f9ed into oliver-sanders:restore-rosie-stuff Jun 18, 2019
@sadielbartholomew sadielbartholomew deleted the i2357-fix-trailing-slash branch July 9, 2019 18:57
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.

2 participants