ROX-29846: Reverts the UI to rr5 compat layer for OCP compatibility by dvail · Pull Request #16055 · stackrox/stackrox

dvail · 2025-07-16T19:42:12Z

Description

Moves from react-router v6 to react-router-dom-v5-compat in order to have compatibility as an OCP plugin. Fortunately, as the compat layer uses react-router v6 under the hood, we do not need to change any of the existing v6 APIs that were implemented in #13628. Instead, we just need to change the main Router wrapping components at the top level, and revert to the connected-react-router library to wire the history up to context.

The core changes:

Replace import ... from 'react-router-dom'; with import ... from 'react-router-dom-v5-compat'; in all files. This is the vast majority of file diffs, but is a superficial change.
Revert the use of redux-first-history back to connected-react-router. Primarily changing https://github.com/stackrox/stackrox/pull/16055/files#diff-17b63ecf711b742a7a122239cda060614dd22df1c31fa64cca750d83ae1f2dbd and https://github.com/stackrox/stackrox/pull/16055/files#diff-a9b7b8ed21a6d16377e9fbf2442ec7bcfa40b6f2df96e3ccf19b7a78c7074dc6
Reintroduce ConnectedRouter as the main router provider, and then wrap this around a <CompatRouter> from the compatibility library in https://github.com/stackrox/stackrox/pull/16055/files#diff-64c2528d02a317cf6976a2b62b1f7959a7533009d976ade7210696ffe3ae260b

Follow ups

It would be great to fully remove auth and integrations from sagas
If/when we can reverse this change it should be as straightforward as reverting this PR

User-facing documentation

CHANGELOG.md is updated OR update is not needed
documentation PR is created and is linked above OR is not needed

Testing and quality

the change is production ready: the change is GA, or otherwise the functionality is gated by a feature flag
CI results are inspected

Automated testing

How I validated my change

CI

Manual smoke testing of behavior throughout the app.

dvail · 2025-07-16T19:42:14Z

This change is part of the following stack:

chore(ui): Handle encoded and unencoded params in horizontal nav #16074
- ROX-29846: Reverts the UI to rr5 compat layer for OCP compatibility #16055 ◀
  - ROX-29843: Minimal webpack config to build OCP dynamic plugin #15944
    - ROX-29845: Add start-console script to enable local plugin dev #16094
      - ROX-29844: Add configuration of base URL in plugin requests #16097

_{Change managed by git-spice.}

openshift-ci · 2025-07-16T19:42:16Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

red-hat-konflux · 2025-07-16T19:42:19Z

Caution

There are some errors in your PipelineRun template.

PipelineRun	Error
quay-proxy	`no kind "ImageDigestMirrorSet" is registered for version "config.openshift.io/v1" in scheme "k8s.io/client-go/kubernetes/scheme/register.go:83"`

rhacs-bot · 2025-07-16T20:02:40Z

Images are ready for the commit at e952125.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.9.x-299-ge9521253bb.

codecov · 2025-07-16T20:17:15Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.69%. Comparing base (a2e52ee) to head (e952125).
Report is 2 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master   #16055   +/-   ##
=======================================
  Coverage   48.69%   48.69%           
=======================================
  Files        2606     2606           
  Lines      191745   191745           
=======================================
+ Hits        93363    93364    +1     
+ Misses      91051    91049    -2     
- Partials     7331     7332    +1

Flag	Coverage Δ
go-unit-tests	`48.69% <ø> (+<0.01%)`	⬆️

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.

🚀 New features to boost your workflow:

📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

dvail · 2025-07-16T20:56:06Z

/test gke-ui-e2e-tests

dvail · 2025-07-17T16:25:27Z

/test gke-ui-e2e-tests

sourcery-ai

Hey @dvail - I've reviewed your changes and they look great!

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

sachaudh

From your walkthrough and another look, it LGTM. Maybe Brad can take another look since he did the upgrade. He probably has more context about the React Router API differences and any little kinks that could be missed.

dvail · 2025-07-23T15:30:58Z

/retest

…16055)

openshift-ci bot added the do-not-merge/work-in-progress label Jul 16, 2025

github-actions bot added the area/ui label Jul 16, 2025

dvail force-pushed the dv/ROX-29846-revert-to-react-router-v5-compat-layer branch from 55dde77 to e786728 Compare July 16, 2025 20:55

dvail force-pushed the dv/ROX-29846-revert-to-react-router-v5-compat-layer branch from e786728 to d25ece2 Compare July 17, 2025 16:24

dvail added the ai-review label Jul 17, 2025

sourcery-ai bot reviewed Jul 17, 2025

View reviewed changes

This was referenced Jul 17, 2025

ROX-29843: Minimal webpack config to build OCP dynamic plugin #15944

Merged

chore(ui): Handle encoded and unencoded params in horizontal nav #16074

Merged

dvail marked this pull request as ready for review July 18, 2025 17:08

dvail requested review from a team as code owners July 18, 2025 17:08

openshift-ci bot removed the do-not-merge/work-in-progress label Jul 18, 2025

dvail mentioned this pull request Jul 18, 2025

ROX-29845: Add start-console script to enable local plugin dev #16094

Merged

4 tasks

dvail changed the base branch from master to dv/better-active-state-handling-horizontal-nav July 18, 2025 20:33

dvail force-pushed the dv/ROX-29846-revert-to-react-router-v5-compat-layer branch from d25ece2 to 404a6ce Compare July 18, 2025 20:33

dvail mentioned this pull request Jul 18, 2025

ROX-29844: Add configuration of base URL in plugin requests #16097

Merged

9 tasks

dvail force-pushed the dv/better-active-state-handling-horizontal-nav branch from e976e9c to 01cc05a Compare July 21, 2025 12:33

dvail force-pushed the dv/ROX-29846-revert-to-react-router-v5-compat-layer branch from 404a6ce to a3f0366 Compare July 21, 2025 12:33

sachaudh approved these changes Jul 22, 2025

View reviewed changes

pedrottimark approved these changes Jul 22, 2025

View reviewed changes

Base automatically changed from dv/better-active-state-handling-horizontal-nav to master July 23, 2025 12:08

Reverts the UI to rr5 compat layer for OCP compatibility

e952125

dvail force-pushed the dv/ROX-29846-revert-to-react-router-v5-compat-layer branch from a3f0366 to e952125 Compare July 23, 2025 12:10

dvail merged commit a1280b9 into master Jul 23, 2025
139 of 167 checks passed

dvail deleted the dv/ROX-29846-revert-to-react-router-v5-compat-layer branch July 23, 2025 19:10

Stringy pushed a commit that referenced this pull request Aug 15, 2025

ROX-29846: Reverts the UI to rr5 compat layer for OCP compatibility (#…

11c87c7

…16055)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ROX-29846: Reverts the UI to rr5 compat layer for OCP compatibility#16055

ROX-29846: Reverts the UI to rr5 compat layer for OCP compatibility#16055
dvail merged 1 commit intomasterfrom
dv/ROX-29846-revert-to-react-router-v5-compat-layer

dvail commented Jul 16, 2025 •

edited

Loading

Uh oh!

dvail commented Jul 16, 2025 •

edited

Loading

Uh oh!

openshift-ci bot commented Jul 16, 2025

Uh oh!

red-hat-konflux bot commented Jul 16, 2025

Uh oh!

rhacs-bot commented Jul 16, 2025 •

edited

Loading

Uh oh!

codecov bot commented Jul 16, 2025 •

edited

Loading

Uh oh!

dvail commented Jul 16, 2025

Uh oh!

dvail commented Jul 17, 2025

Uh oh!

sourcery-ai bot left a comment

Uh oh!

sachaudh left a comment

Uh oh!

dvail commented Jul 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

dvail commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Follow ups

User-facing documentation

Testing and quality

Automated testing

How I validated my change

Uh oh!

dvail commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jul 16, 2025

Uh oh!

red-hat-konflux bot commented Jul 16, 2025

Uh oh!

rhacs-bot commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dvail commented Jul 16, 2025

Uh oh!

dvail commented Jul 17, 2025

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

sachaudh left a comment

Choose a reason for hiding this comment

Uh oh!

dvail commented Jul 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dvail commented Jul 16, 2025 •

edited

Loading

dvail commented Jul 16, 2025 •

edited

Loading

rhacs-bot commented Jul 16, 2025 •

edited

Loading

codecov bot commented Jul 16, 2025 •

edited

Loading