aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-09-17Convert "target_string" to a str type...* wqflask/base/trait.py (retrieve_trait_info): Convert "target_string" to a str, otherwise an exception will be thrown if it's None. BonfaceKilz
2020-09-17Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-17Mock "SECRET_HMAC_CODE"...* wqflask/tests/utility/test_hmac.py: Mock app.config's "SECRET_HMAC_CODE" value. BonfaceKilz
2020-09-17Replace string arguments to "hmac.new" with bytearray...Same as: https://github.com/genenetwork/genenetwork2/pull/422/commits/46443ec8d2cdfd7c60358a889d90a90e4f7daaf4 BonfaceKilz
2020-09-17Fix errors in tests...* wqflask/tests/utility/test_authentication_tools.py test_check_resource_availability_non_default_mask): Mock flask's global 'g' variable properly. * wqflask/tests/base/test_trait.py: Ditto. * wqflask/tests/utility/test_authentication_tools.py: Ditto. BonfaceKilz
2020-09-17Apply pep8...* wqflask/base/trait.py: Apply pep8. * wqflask/utility/authentication_tools.py: Ditto. BonfaceKilz
2020-09-17Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-17Merge pull request #443 from BonfaceKilz/tests/test-auth-and-utf8...Tests/test auth and utf8BonfaceKilz
2020-09-17Apply pep8...* wqflask/utility/hmac.py: Apply pep8 and fix typo. BonfaceKilz
2020-09-17Add tests for hmac utility...* wqflask/tests/utility/test_hmac.py: New tests. BonfaceKilz
2020-09-16Add new tests for "base/trait.py"...* wqflask/tests/base/test_trait.py: New tests. BonfaceKilz
2020-09-16Apply pep8...* wqflask/utility/authentication_tools.py: Apply pep8 formatting to file. BonfaceKilz
2020-09-16Add tests for "add_new_resource" method...* wqflask/tests/utility/test_authentication_tools.py: Add them. BonfaceKilz
2020-09-16Remove unnecessary if branch...* wqflask/utility/authentication_tools.py (check_resource_availability): Combine if statements into one boolean check in one if branch. BonfaceKilz
2020-09-16Add tests for authentication tools...Catches bugs in: - https://github.com/genenetwork/genenetwork2/pull/422/commits/70dbeeb5832711ed5271434e482c18bc7ea095b8 * wqflask/tests/utility/test_authentication_tools.py: New file. Add tests for "check_resource_availability". BonfaceKilz
2020-09-15Fix failing tests...* wqflask/tests/base/test_data_set.py: Update failing tests introduced by the change in 301bdd2f4. BonfaceKilz
2020-09-08Changed the Add button color for all the different pages that use it...* wqflask/wqflask/templates/collections/view.html - changed Add button color * wqflask/wqflask/templates/correlation_matrix.html - changed Add button color * wqflask/wqflask/templates/correlation_page.html - changed Add button color * wqflask/wqflask/templates/mapping_results.html - changed Add button color * wqflask/wqflask/templates/search_result_page.html - changed Add button color zsloan
2020-09-08Search code now checks if there are more than 50,000 results before...running the code that queries the DB for max LRS locus information (which is what takes the most time to run) and sets a variable that indicates to the template (search_results.html) that it shouldn't show the results * wqflask/wqflask/search_results.py - Check number of results from base query in order to prevent certain searches from running too long zsloan
2020-09-08Changed regular and global search results table to use the new sort...method that always places NAs at bottom, changed the Add to Collection button's color, and added something to the regular search page template to display alternative text if there are more than 50000 results * wqflask/wqflask/templates/gsearch_gene.html - Added natural-minus-na sort to certain columns and changed Add button color * wqflask/wqflask/templates/gsearch_pheno.html - Added natural-minus-na sort to certain columns and changed Add button color * wqflask/wqflask/templates/search_result_page.html - Added natural-minus-na sort to certain columns, changed Add button color, and added template logic that shows alternative text if there are more than 50,000 results zsloan
2020-09-08Added a sort function (derived from the natural sort import) that always...places N/As at the bottom regardless of search direction * wqflask/wqflask/static/new/javascript/search_results.js - created "natural-minus-na" sort zsloan
2020-09-04Merge pull request #437 from BonfaceKilz/fix/use-correct-path-give-a-path-loc......Fix/use correct path give a path locationBonfaceKilz
2020-09-04Update how static js/ css files are fetched...* wqflask/wqflask/views.p:(css, js) Add "css" router decorator. Also, if "js_alt" is in path, fetch the file from "GUIX_PROFILE/share/javascript" instead of the default directory: "GUIX_PROFILE/share/genenetwork2/javascript" See: <https://github.com/genenetwork/genenetwork2/issues/436> BonfaceKilz
2020-09-04Fix false positive tests...* test/requests/link_checker.py: (verify_static_file): Add it. Verify that a static link is fetched by checking for the message "Error: 404 not Found" in page. (check_package_js_files): Add appropriate 'js' or 'css' prefix. BonfaceKilz
2020-09-01There was a missing quote in one of the javascript imports added by the...PR changing them to get fetched from GUIX; I need to check and see if there are other situations like this * wqflask/wqflask/templates/mapping_results.html - Added missing quote zsloan
2020-09-01Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-09-01Fixed indent issue that could cause error when showing the haplotype...analyst in the mapping chromosome view * wqflask/wqflask/marker_regression/display_mapping_results.py - Indented a bit of code that was wrongly indented in such a way that the variable "ind" wasn't set if "plotbxd" is 0 zsloan
2020-09-01Merge pull request #434 from BonfaceKilz/Build/use-md5-js-from-guix...Build/use md5 js from guixBonfaceKilz
2020-09-01Add check for "md5.min.js" library...* test/requests/link_checker.py: Add it. BonfaceKilz
2020-09-01Use "md5.min.js" from guixBonfaceKilz
2020-09-01Merge pull request #433 from BonfaceKilz/Build/remove-cdns...Build/remove cdnsBonfaceKilz
2020-09-01Check availability of several js and css files...* test/requests/link_checker.py: Check availability of: chroma.min.js; d3-tip.js; d3.min.js; underscore.min.js; nv.d3.min.css; and jquery.qtip.min.js BonfaceKilz
2020-09-01Remove commented out script tags that references CDNsBonfaceKilz
2020-09-01Replace CDNs with packages from guixBonfaceKilz
2020-09-01Merge pull request #432 from BonfaceKilz/Fix/add-missing-apostrophe...Add missing apostrophe in url_for argsBonfaceKilz
2020-09-01Add missing apostrophe in url_for argsBonfaceKilz
2020-08-31Remove typo at beginning of line...* wqflask/utility/authentication_tools.py: Remove accidental char at beginning of line. BonfaceKilz
2020-08-31Merge pull request #431 from BonfaceKilz/Build/add-d3-tip...Use d3-tip from guixBonfaceKilz
2020-08-31Fixed text on not_authenticated to use proper grammar...* wqflask/wqflask/templates/new_security/not_authenticated.html - Changed "this" to "these" since "data" is plural zsloan
2020-08-31Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-08-31Fixed issue that was causing updating resource default privileges to not...work * wqflask/utility/redis_tools.py - There was an issue where resources wouldn't be updated if they already existed. This is because the code didn't yet account for the "update" tag (that is meant to give the option of preventing updating resources when running the script to enter all resources into Redis). I changed the logic to add a resource if "update" is True or the resource doesn't already exist (so it won't if update is False and the resource exists). zsloan
2020-08-31Add check for "d3-tip.js" js library...* test/requests/link_checker.py (check_packaged_js_files): Add it. BonfaceKilz
2020-08-31Merge pull request #429 from BonfaceKilz/chore/add-gh-templates...Add github templates for filing bugs, user stories/ features and PRsBonfaceKilz
2020-08-31Use d3-tip from guixBonfaceKilz
2020-08-31Merge pull request #430 from BonfaceKilz/Build/add-chroma-js...Build/add chroma jsBonfaceKilz
2020-08-31Add github templates for filing bugs, user stories/ features and PRs...* .github/ISSUE_TEMPLATE/bug_report.md : Add template for filing bug reports. * .github/ISSUE_TEMPLATE/feature_request.md: Add template for filing a feature. * .github/ISSUE_TEMPLATE/user_story.md: Add a template for creating a user story for a feature. * .github/PULL_REQUEST_TEMPLATE.md: Add a template for filing a PR. BonfaceKilz
2020-08-31Add check for "chroma.js" dataTables extension plugin...* test/requests/link_checker.py (check_packaged_js_files): Add it. BonfaceKilz
2020-08-31Use chroma from guix...* wqflask/wqflask/templates/correlation_matrix.html: Fetch chroma from guix profile BonfaceKilz
2020-08-31Merge pull request #428 from BonfaceKilz/chore/delete-datatables-extensions-f......Delete dataTables and it's extensions from gitBonfaceKilz
2020-08-31Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-08-29Fixed issue where exporting traits would throw an error if a dataset's...group didn't have an InbredSetCode set in the DB * wqflask/utility/authentication_tools.py - Changed get_group_code to return an empty string instead of None if InbredSetCode doesn't exist for a dataset group * wqflask/wqflask/views.py - Changed zipped export filename to "export_(datetime)" instead of "collection_(datetime)" since this export can occur from both the collection page and the global search page zsloan