Skip to content

Commit

Permalink
Merge pull request #775 from dbmi-bgm/utk_react_18
Browse files Browse the repository at this point in the history
Bootstrap v5, React bootstrap v2, React 18, Redux and Misc. Npm Packages Upgrade
  • Loading branch information
Onurcankaratay authored Nov 19, 2024
2 parents 234db4b + 21033f9 commit 016ba44
Show file tree
Hide file tree
Showing 144 changed files with 6,009 additions and 22,010 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
test_type: ['UNIT', 'INDEX', 'DOCKER']
# We are really not set up for these next two to be multiplicative, so be careful adding more.
python_version: ['3.11']
node_version: ['18']
node_version: ['20']

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python_version }}

Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ cgap-portal
Change Log
----------

16.0.0
=======

`PR 775: Bootstrap v5, React bootstrap v2, React 18, Redux and Misc. Npm Packages Upgrade <https://github.com/dbmi-bgm/cgap-portal/pull/775>`_

* Upgrade: React v17 to v18
* Upgrade: Redux v4 to v5 (there are breaking changes in store and dispatchers. SPC is updated to support both new and legacy usage)
* Upgrade: HiGlass (React 18-compatible)
* Upgrade: auth0-Lock v11 to v12
* Upgrade: gulp.js v4 to v5
* Upgrade: react-workflow-viz (animation updates to eliminate findDOMNode errors)
* Fix: User Content updates to fix markdown, jsx, and HTML static section rendering
* Upgrade: Bootstrap v5
* Upgrade: React-Bootstrap v2
* Upgrade: FontAwesome v6


15.6.0
=======
* 2024-10-11/dmichaels
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENV NGINX_USER=nginx \
PIP_DISABLE_PIP_VERSION_CHECK=on \
PIP_DEFAULT_TIMEOUT=100 \
NVM_VERSION=v0.39.1 \
NODE_VERSION=18.17.0
NODE_VERSION=20.17.0

# Configure Python3.7 venv
ENV VIRTUAL_ENV=/opt/venv
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ describe('Case View - FSUI', function () {


it("Save buttons disabled initially", function(){
cy.get("div#case-info\\.filtering #snv-filtering .above-variantsample-table-ui .filter-set-ui-header div.pl-16 button:first-child").should(function($btn){
cy.get("div#case-info\\.filtering #snv-filtering .above-variantsample-table-ui .filter-set-ui-header div.ps-16 button:first-child").should(function($btn){
expect($btn.children("span")).to.have.text('Save Case FilterSet');
expect($btn).to.have.attr('disabled');
}).end()
.get("div#case-info\\.filtering #snv-filtering .above-variantsample-table-ui .filter-set-ui-header div.pl-16 button:last-child").should(function($btn){
.get("div#case-info\\.filtering #snv-filtering .above-variantsample-table-ui .filter-set-ui-header div.ps-16 button:last-child").should(function($btn){
expect($btn).to.have.text('Create Preset');
expect($btn).to.have.attr('disabled');
});
Expand Down
16 changes: 15 additions & 1 deletion deploy/post_deploy_testing/cypress/support/e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,18 @@
import './commands'

// Alternatively you can use CommonJS syntax:
// require('./commands')
// require('./commands')

Cypress.on("uncaught:exception", (err) => {
// TODO: Investigate hydration errors occurring during SSR in Cypress tests.
// It appears that Cypress injects a prop into the div on the client side, which doesn't exist on the server side, leading to hydration issues.
// This suppression is temporary and should be removed once the issue is resolved.
// https://github.com/cypress-io/cypress/issues/27204
if (
/hydrat/i.test(err.message) ||
/Minified React error #418/.test(err.message) ||
/Minified React error #423/.test(err.message)
) {
return false;
}
});
Loading

0 comments on commit 016ba44

Please sign in to comment.