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 CMIP6Plus to projects setup file #573

Merged
merged 130 commits into from
Jan 9, 2024
Merged

Add CMIP6Plus to projects setup file #573

merged 130 commits into from
Jan 9, 2024

Conversation

sashakames
Copy link
Collaborator

Adds the CMIP6Plus project

downiec and others added 30 commits September 22, 2022 18:22
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* enable settings on the backend for urls

* add the settings for workflow

* add missing import

* add newline
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…environment variables. Otherwise local build of backend will fail.
…ests. Removed unneccessary type checking in the import headers of the test models. Updated coverage for some files that didn't have 100% coverage. Updated some django dependencies after testing to make sure nothing broke. Updated some deprecated imports to remove warnings. Updated pytest and coverage libraries.
…h the application from users perspective was working fine)
…nges that came with react-router-dom v6. Tests are passing now.
* Refactored the joyrideTutorials in order to reduce the chances for errors with misspelling target names. Created unique target calssnames to simplify the process of adding and using targets. Removed the chance of duplicate target names causing errors etc. Added a test startup component that should show when first opening metagrid. Startup window still needs some work to improve visuals.

* Added a welcome and changelog template component to use with thh startup display. Made the startup display change based on existing version so that a new changelog will appear when version is changed. Modified the startup component behavior to hadle a welcome and changelog template based on whether its first-time startup or not.

* Updated django-all-auth to 0.54.0

* Upgraded the antd library to latest version. Updated components to work with the latests antd library and added some styling to correct some undesired changes. Added a temporary drawer component which can be opened by clicking a new message button in the top-right navbar. Fixed some styling issues with window resizing to make the top navbar work better with smaller windows and improve visual behavior. Removed redundant components that are no longer needed with the new antd library (which is now working with typescript well). Created a popup window that shows at the start for new users. Created a startup template system that allows different templates to be used for displaying popup messages. More fixed needed for tests and the welcome popup tutorials need work.

* Worked to correct issues with tests hanging by reverting back the antd library. Also updated to node version 18. Restored previously deleted files and will remove them later when all tests are passing. Still need to correct tests to pass. Still need to complete messaging feature and update tutorial.

* Updated tests so that they pass, coverage will still be needed.

* Updated the Startup template functionality and added actions that can be triggered by the templates. Updated the welcome message buttons to work properly and select between pages to start tutorials.

* Removed redundant and unneccessary components as they are now directly taken from antd library. Removed commented out import statements.

* Refactored some names and added messages for the right drawer. Added ability to create messages for the message bar and provide content from markdown files. Updated the changelog to have useful information on latest changes. Need to troubleshoot tests and complete coverage.

* Added markdown file support for the messages. Did refactoring so messages on the right drawer and popups will show the markdown. Created new markdown files with version info and example message. Added flexibility to popup so that styles can be modified on a per message basis. Modified the changelog template and types.

* Created a new welcome tour which will show users the help buttons to encourage them to use them if they have issues. Updated the navbar tour to include the new news button. Created new test files and updated tests to bring back 100% text coverage. Removed obsolete tour target related files, as they've been updated with target object class. Troubleshooted and ran tests to fix some bugs and added more functionality for jest tests. Deleted test markdown files and updated message markdown slightly.

* modify the messages for release (#522)

---------

Co-authored-by: Sasha Ames <sashakames@users.noreply.github.com>
* Refactored the joyrideTutorials in order to reduce the chances for errors with misspelling target names. Created unique target calssnames to simplify the process of adding and using targets. Removed the chance of duplicate target names causing errors etc. Added a test startup component that should show when first opening metagrid. Startup window still needs some work to improve visuals.

* Added a welcome and changelog template component to use with thh startup display. Made the startup display change based on existing version so that a new changelog will appear when version is changed. Modified the startup component behavior to hadle a welcome and changelog template based on whether its first-time startup or not.

* Updated django-all-auth to 0.54.0

* Upgraded the antd library to latest version. Updated components to work with the latests antd library and added some styling to correct some undesired changes. Added a temporary drawer component which can be opened by clicking a new message button in the top-right navbar. Fixed some styling issues with window resizing to make the top navbar work better with smaller windows and improve visual behavior. Removed redundant components that are no longer needed with the new antd library (which is now working with typescript well). Created a popup window that shows at the start for new users. Created a startup template system that allows different templates to be used for displaying popup messages. More fixed needed for tests and the welcome popup tutorials need work.

* Worked to correct issues with tests hanging by reverting back the antd library. Also updated to node version 18. Restored previously deleted files and will remove them later when all tests are passing. Still need to correct tests to pass. Still need to complete messaging feature and update tutorial.

* Updated tests so that they pass, coverage will still be needed.

* Updated the Startup template functionality and added actions that can be triggered by the templates. Updated the welcome message buttons to work properly and select between pages to start tutorials.

* Removed redundant and unneccessary components as they are now directly taken from antd library. Removed commented out import statements.

* Refactored some names and added messages for the right drawer. Added ability to create messages for the message bar and provide content from markdown files. Updated the changelog to have useful information on latest changes. Need to troubleshoot tests and complete coverage.

* Added markdown file support for the messages. Did refactoring so messages on the right drawer and popups will show the markdown. Created new markdown files with version info and example message. Added flexibility to popup so that styles can be modified on a per message basis. Modified the changelog template and types.

* Created a new welcome tour which will show users the help buttons to encourage them to use them if they have issues. Updated the navbar tour to include the new news button. Created new test files and updated tests to bring back 100% text coverage. Removed obsolete tour target related files, as they've been updated with target object class. Troubleshooted and ran tests to fix some bugs and added more functionality for jest tests. Deleted test markdown files and updated message markdown slightly.

* modify the messages for release (#522)

* Updated the node status information alert so that text displays if there is an api error.

* Updated Django to 4.1.9

* Fixed a test regarding the changes to the error message.

---------

Co-authored-by: Sasha Ames <sashakames@users.noreply.github.com>
…null items don't cause an error and prevent the site from displaying.
sturoscy-personal and others added 23 commits October 10, 2023 08:55
…ated the test settings, removed unused server handler, modified the auth context for keycloak cverage (temporarily for tests are failing there). Added a new test file for the Tabs.tsx component, and provided full coverage. Created a new file and started test coverage for DatasetDownload.tsx (still needs more tests). Fixed 3 more App.tsx tests which were failing, so that they now pass. Coverage increased to nearly 80% overall.
…reated new tests for the datasetdownload component and more tests for other components to improve coverage. Did a refactoring of the datasetdownload component to make it easier to test and improve reliability.
…ts, created new fixtures for the tests as well as mock values for the tests. Coverage for the datasetDownload components has increased to nearly 60% overall
…keycloak' into mergingGlobusUpdatesWithLoginUpdates
* First commit for keycloak and globus auth

* Updated keycloak-js to 19.0.3 and using login.esgf.io for localhost

* Updating yarn lock file with new version of keycloak

* Feature: add a choice for auth type at time of deployment

* Fixing up env files

* Moved Globus key and secret to env file

* Removed commented code

* Removed local keycloak container

* Updated wget URL

* Revert realm json file

* Updated and ran pre-commit

* Minor settings update

* Removed key and secret

* Black formatting

* Removing key/secret and updating keycloak URL

* Updating messaging and test setup

* Formatting
… as the auth provider. Created some tests and updated server-handlers etc. to acknowledge the new keycloak/globus auth options.
* Updated the DatasetDownload tests to include testing the PKCE response, whether it will pass or fail, and also added test for successful transfer scenario

* Added a few more tests to get general coverage over 95%

* Updating workflow files and Django version, to see if backend passes tests

* Check if updating node version or package.json, would affect tests.

* Globus dev demo updates tests (#575)

* Stashing

* Fixing NavBar tests

* Finally fixed issue with istanbul coverage display incorrectly displayed for App.tsx. The issue was with the statement /* istanbul ignore if */ and where it was placed. Changed the statement to /* istanbul ignore next */ and that removed the issue for App.tsx and other files that used this statement. Updated the github yaml files to revert the node version update, in order to remove the frontend tests failing in github actions. Will need to resolve this issue later. Fixed some broken tests which were failing due to the auth context now working. Updated some other minor issues.

* Updated package.json to se if lockfile error will go away. Updated the lockfile by running yarn instal, restored the frontend.yml and pre-commit.yml to use newer node version. Unskipped and updated a few tests.

* Fixed a few more tests by creating new helper function which correctly opens a select dropdown and other updates. Created a new test file for the GlobusToolTip component and brought it's coverage to 100%, updated the customRender function to utilize the KeycloakAuthProvider copmonent (thus improving coverage further), moved the mock js-pkce file to the tests folder. Disabled a test that involves pkce because the mock is unreliable when trying to change the response. Ignoring coverage for the else cases that require pkce to return an error or other values, for the time being.

* Consolidated the test setup, by moving test mocks to the setupTests.ts file. Removed reduntand and uneccessary files/lines of code. Improved coverage for the app.tsx file by creating a new render option to render unauthorized users (thus fixing some tests that were broken)

* Had to skip a test that seems to only fail on github CI, but works locally.

* Added config file for codecov so that we can set the coverage thresholds to match the ones used by istanbul. Set the code coverage to auto, but with 5% threshold. Which allows the coverage of the new branch to be 5% less than base, at most.

* Updated the patch threshold for codecov and removed unneded print statement in one of the tests.

---------

Co-authored-by: Steve Turoscy <sturoscy@globus.org>
Copy link

codecov bot commented Jan 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (862826d) 98.49% compared to head (a995b92) 98.49%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #573   +/-   ##
=======================================
  Coverage   98.49%   98.49%           
=======================================
  Files          76       76           
  Lines        2729     2729           
  Branches      415      415           
=======================================
  Hits         2688     2688           
  Misses         41       41           
Flag Coverage Δ
backend 100.00% <ø> (ø)
frontend 97.75% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sashakames sashakames changed the base branch from v1.0.10 to master January 9, 2024 19:03
@downiec downiec merged commit 6e57521 into master Jan 9, 2024
6 checks passed
@sashakames sashakames deleted the CMIP6Plus branch January 10, 2024 19:06
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