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

Bootstrap v5, React bootstrap v2, React 18, Redux and Misc. Npm Packages Upgrade #775

Merged
merged 63 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
35399b4
new user insert for Onurcan Karatay
Onurcankaratay Oct 2, 2024
d719b18
bump SPC v0.1.91-beta.5, bootstrap v5.3.0
Onurcankaratay Oct 2, 2024
03444ca
Bs5 sass upgrades
Onurcankaratay Oct 2, 2024
aa71f47
Bs5 text align upgrades
Onurcankaratay Oct 2, 2024
991f54e
Update container width for xxl breakpoint
Onurcankaratay Oct 2, 2024
c674f0f
rename .close to .btn-close for Bootstrap 5 migration
Onurcankaratay Oct 2, 2024
e02a735
Bs5 button upgrades
Onurcankaratay Oct 2, 2024
3528b52
update btn css
Onurcankaratay Oct 2, 2024
f2724e8
Bs5 link upgrades
Onurcankaratay Oct 2, 2024
3d8ef66
Bs5 form upgrades
Onurcankaratay Oct 2, 2024
056f2f3
Bs5 mixin upgrades
Onurcankaratay Oct 2, 2024
0dad54e
removed .text-black from NavLink
Onurcankaratay Oct 2, 2024
5688515
fixed css for btn-outline-success
Onurcankaratay Oct 2, 2024
ad39055
bump react-bootstrap v2.10.4
Onurcankaratay Oct 2, 2024
a9baf17
React-Bootstrap5 Accordion upgrades
Onurcankaratay Oct 2, 2024
384b463
React-Bootstrap5 Popover upgrades
Onurcankaratay Oct 2, 2024
f43f397
React-Bootstrap5 Popover upgrades 2
Onurcankaratay Oct 2, 2024
219edbb
Replaced menuAlign with align in DropdownButton
Onurcankaratay Oct 2, 2024
0e970de
removed custom sizing for btn-close in Modal.Title
Onurcankaratay Oct 2, 2024
2e41359
bump @fortawesome v6.6.0
Onurcankaratay Oct 2, 2024
391a9c6
Fixed console Sass errors
Onurcankaratay Oct 2, 2024
11f58da
bump dcicsnovault v11.22.0
Onurcankaratay Oct 2, 2024
b199d59
remove btn-link class and underline links on hover in search-result-c…
Onurcankaratay Oct 2, 2024
3b41552
bump React v18, Redux v5, and miscellaneous npm packages
Onurcankaratay Oct 2, 2024
00c0b33
React 18 and Redux 5 upgrades
Onurcankaratay Oct 2, 2024
72a3f4b
Fix Webpack ESM resolution
Onurcankaratay Oct 2, 2024
56e5e30
Replace defaultProps with JavaScript default parameters
Onurcankaratay Oct 3, 2024
fa88f21
Fix a state mutation. "A state mutation was detected between dispatch…
Onurcankaratay Oct 3, 2024
c221389
Add `dimensionOpts` definition to fix ReferenceError
Onurcankaratay Oct 3, 2024
9370121
Temporarily handle uncaught exceptions related to hydration
Onurcankaratay Oct 3, 2024
052626c
update dockerfile for node 20 upgrade
Onurcankaratay Oct 3, 2024
5e58e62
GH actions node 20 upgrade for main.yml
Onurcankaratay Oct 3, 2024
6f33b33
update FontAwesome font files to v6
Onurcankaratay Oct 3, 2024
ac52484
bump react-tooltip v4.2.21
Onurcankaratay Oct 4, 2024
dfcfd38
Bs5 badge upgrades
Onurcankaratay Oct 4, 2024
cf69f3c
Add css for text alignment compatibility
Onurcankaratay Oct 4, 2024
e29b169
bump SPC v0.1.91-beta.6
Onurcankaratay Oct 4, 2024
76f6a22
resolve version mismatch for SPC
Onurcankaratay Oct 4, 2024
7d71e70
Update SASS variables and adjust Bootstrap classes
Onurcankaratay Oct 6, 2024
3e630bb
Replace Popover.Title with Popover.Header
Onurcankaratay Oct 7, 2024
b7dbe75
bump react-workflow-viz v0.1.11
Onurcankaratay Oct 7, 2024
c06c4c9
Replace defaultProps with default parameters
Onurcankaratay Oct 7, 2024
cecb8ff
Adjust `$dropdown-item-*` and `$body-color` variables, and update CSS
Onurcankaratay Oct 8, 2024
3d45ee2
bump SPC v0.1.91-beta.7
Onurcankaratay Oct 8, 2024
d135640
update Sass variables
Onurcankaratay Oct 8, 2024
101b672
Remove .input-group-append
Onurcankaratay Oct 9, 2024
623327e
improve HiGlass runtime error message
Onurcankaratay Oct 9, 2024
132d2ca
update $body-color variable and apply CSS changes
Onurcankaratay Oct 9, 2024
42320cd
add custom active background and border color for btn
Onurcankaratay Oct 10, 2024
440326f
enable negative margins in Bootstrap config
Onurcankaratay Oct 10, 2024
c1aa4a1
define missing searchFilters variable to resolve ReferenceError
Onurcankaratay Oct 10, 2024
400d7f5
add padding to `access-keys-table`
Onurcankaratay Oct 10, 2024
44ffead
revert active button colors
Onurcankaratay Oct 11, 2024
57853c9
consolidate link styles with `link-underline-hover`
Onurcankaratay Oct 11, 2024
322a49a
Update .btn-close styles
Onurcankaratay Oct 16, 2024
51d013f
Merge branch 'master' into utk_react_18
Onurcankaratay Oct 16, 2024
dbe5ef8
set default `background-color` for thead
Onurcankaratay Oct 17, 2024
a6493de
bump SPC v0.1.91
Onurcankaratay Oct 17, 2024
1da4a7d
bump dcicsnovault v11.22.0
Onurcankaratay Nov 1, 2024
f228c3a
add link hover effect and make `access-keys-table` responsive
Onurcankaratay Nov 11, 2024
8693a58
bump gulp v5.0.0
Onurcankaratay Nov 11, 2024
1fc2840
bug fix
Onurcankaratay Nov 19, 2024
21033f9
bump version + changelog
Onurcankaratay Nov 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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.
Comment on lines +23 to +26
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like that thread has introduced a new solution to this problem. Might be worth revisiting this and see if this can be removed/replaced with a more permanent solution before merge.

// 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
Loading