Skip to content

chore(UI): upgrade react-router-dom v6 → v7 and fix column panel race condition #30580

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.

Sign up for GitHub

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

Open
Rohit0301 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore(UI): upgrade react-router-dom v6 → v7 and fix column panel race condition #30580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dfd6fa9
chore(UI): upgrade react-router-dom v6 → v7 and fix column panel race…
Rohit0301 Jul 28, 2026
3531261
minor fix
Rohit0301 Jul 28, 2026
d006158
Merge branch 'main' into upgrade-react-router-dom-v7
Rohit0301 Jul 28, 2026
ac7e730
Merge branch 'main' into upgrade-react-router-dom-v7
Rohit0301 Jul 29, 2026
ddcc493
Merge branch 'main' into upgrade-react-router-dom-v7
Rohit0301 Jul 30, 2026
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
2 changes: 1 addition & 1 deletion openmetadata-ui/src/main/resources/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
"react-quill-new": "^3.4.0",
"react-reflex": "^4.1.0",
"react-resizable": "^3.1.3",
"react-router-dom": "^6.30.4",
"react-router-dom": "7.18.1",
"reactflow": "^11.10.2",
"reactjs-localstorage": "^1.0.1",
"recharts": "2.10.3",
Expand Down
12 changes: 8 additions & 4 deletions ...ui/src/main/resources/ui/src/components/Customization/GenericProvider/GenericProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export const GenericProvider = <T extends Omit<EntityReference, 'type'>>({
const pageType = useMemo(() => ENTITY_PAGE_TYPE_MAP[type], [type]);
const { tab } = useRequiredParams<{ tab: EntityTabs }>();
const expandedLayout = useRef<WidgetConfig[]>([]);
const selectedColumnRef = useRef<ColumnOrTask | null>(null);
const [layout, setLayout] = useState<WidgetConfig[]>(
getLayoutFromCustomizedPage(pageType, tab, customizedPage, isVersionView)
);
Expand All @@ -95,6 +96,7 @@ export const GenericProvider = <T extends Omit<EntityReference, 'type'>>({
const [selectedColumn, setSelectedColumn] = useState<ColumnOrTask | null>(
null
);
selectedColumnRef.current = selectedColumn;

// State to store the displayed columns (sorted/filtered) from SchemaTable
const [displayedColumns, setDisplayedColumns] = useState<ColumnOrTask[]>([]);
Expand Down Expand Up @@ -137,7 +139,6 @@ export const GenericProvider = <T extends Omit<EntityReference, 'type'>>({

// Sync selected column from prop (deep link)
useEffect(() => {
Comment thread
gitar-bot[bot] marked this conversation as resolved.
// If we have a direct columnFqn from props, try to find and select it
if (columnFqn && extractedColumns.length > 0) {
const col = findFieldByFQN(extractedColumns as Column[], columnFqn);
if (col) {
Expand Down Expand Up @@ -229,8 +230,11 @@ export const GenericProvider = <T extends Omit<EntityReference, 'type'>>({
(column: ColumnOrTask) => {
const columnFqn = column.fullyQualifiedName;

// If the column is already selected, don't do anything to avoid loops
if (selectedColumn?.fullyQualifiedName === columnFqn) {
// Read via ref so this callback is not recreated when selectedColumn changes.
// Without this, closeColumnDetailPanel (setSelectedColumn null) would recreate
// this callback, causing useFqnDeepLink to re-fire with stale URL params and
// reopen the panel (react-router v7 defers navigate() via startTransition).
if (selectedColumnRef.current?.fullyQualifiedName === columnFqn) {
return;
}

Expand All @@ -253,7 +257,7 @@ export const GenericProvider = <T extends Omit<EntityReference, 'type'>>({
tab,
navigate,
location.pathname,
selectedColumn?.fullyQualifiedName,
// selectedColumn?.fullyQualifiedName intentionally omitted — read via selectedColumnRef
]
);

Expand Down
10 changes: 7 additions & 3 deletions openmetadata-ui/src/main/resources/ui/src/hooks/useFqnDeepLink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { useEffect } from 'react';
import { useEffect, useRef } from 'react';
import { findFieldByFQN, getParentKeysToExpand } from '../utils/TablePureUtils';

interface UseFqnDeepLinkProps<T> {
Expand All @@ -32,6 +32,9 @@ export const useFqnDeepLink = <
openColumnDetailPanel,
selectedColumn,
}: UseFqnDeepLinkProps<T>) => {
const selectedColumnRef = useRef(selectedColumn);
Comment thread
gitar-bot[bot] marked this conversation as resolved.
selectedColumnRef.current = selectedColumn;

useEffect(() => {
if (!columnPart || !fqn) {
return;
Expand All @@ -47,7 +50,8 @@ export const useFqnDeepLink = <
const matchedField = findFieldByFQN(data, fullColumnFqn);
if (matchedField) {
if (
selectedColumn?.fullyQualifiedName !== matchedField.fullyQualifiedName
selectedColumnRef.current?.fullyQualifiedName !==
matchedField.fullyQualifiedName
) {
openColumnDetailPanel(matchedField);
}
Expand All @@ -57,7 +61,7 @@ export const useFqnDeepLink = <
fqn,
data,
openColumnDetailPanel,
selectedColumn,
setExpandedRowKeys,
// selectedColumn intentionally omitted — tracked via ref to avoid re-triggering on close
]);
};
34 changes: 17 additions & 17 deletions openmetadata-ui/src/main/resources/ui/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2381,11 +2381,6 @@
resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-3.0.0.tgz#96fdb89d25c62e7b6a5d08caf0ce5114370e3b8f"
integrity sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==

"@remix-run/router@1.23.3":
version "1.23.3"
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.23.3.tgz#957c098d4393d301a8aa7dccf3ef28ea5430e36a"
integrity sha512-4An71tdz9X8+3sI4Qqqd2LWd9vS39J7sqd9EU4Scw7TJE/qB10Flv/UuqbPVgfQV9XoK8Np6jNquZitnZq5i+Q==

"@rjsf/core@5.24.13":
version "5.24.13"
resolved "https://registry.yarnpkg.com/@rjsf/core/-/core-5.24.13.tgz#ef98e5dc6ac064b2be2f56e0887c99df2b1f8d44"
Expand Down Expand Up @@ -5597,7 +5592,7 @@ cookie-storage@^6.1.0:
resolved "https://registry.yarnpkg.com/cookie-storage/-/cookie-storage-6.1.0.tgz#291b2f662d961be44f999626593421cbfcf23790"
integrity sha512-HeVqbVy8BjXhAAuFtL6MTG+witHoLbxfky2jgVh9FmxmyL6IKa9gSSyPNjevXCCCxPu6Tzd9J8+eXTRQzYU/cg==

cookie@0.7.0:
cookie@0.7.0, cookie@^1.0.1:
version "0.7.0"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.0.tgz#2148f68a77245d5c2c0005d264bc3e08cfa0655d"
integrity sha512-qCf+V4dtlNhSRXGAZatc1TasyFO6GjohcOul807YOb5ik3+kQSnb4d7iajeCL8QHaJ4uZEjCgiCJerKXwdRVlQ==
Expand Down Expand Up @@ -11411,20 +11406,20 @@ react-resizable@^3.0.5, react-resizable@^3.1.3:
prop-types "15.x"
react-draggable "^4.5.0"

react-router-dom@^6.30.4:
version "6.30.4"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.30.4.tgz#f7167bf3da6c7d9132130ea985dd06def25e84d5"
integrity sha512-q4HvNl+mmDdkS0g+MqiBZNteQJCuimWoOyHMy4T/RQLAn9Z29+E91QXRaxOujeMl2HTzRSS0KFPd7lxX3PjV0Q==
react-router-dom@7.18.1:
version "7.18.1"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.18.1.tgz#0d1b138e291393059ad481c3e10e366385a978a4"
integrity sha512-KaZh+X/6UtEp28x51AUYZDMg9NGoz2ja3dNHa+ta/tk40vCzKhQ/RypCWBMLbmDr6//E24Vv5uPsrqXFozdkAg==
dependencies:
"@remix-run/router" "1.23.3"
react-router "6.30.4"
react-router "7.18.1"

react-router@6.30.4:
version "6.30.4"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.30.4.tgz#638f35176527bd243d96d81d35d33b757bad46c2"
integrity sha512-SVUsDe+DybHM/WmYKIVYhZh1o5Dcuf16yM6WjG02Q9XVFMZIJyHYhwrr6bFBXZkVP6z69kNkMyBCujt8FaFLJA==
react-router@7.18.1:
version "7.18.1"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.18.1.tgz#61259d1594b95c1ace299ee4c57453570f0c22f1"
integrity sha512-GDLgg3i3uM0aeJO3Fm+TCS+sDQ7gu12T6x0qdTEzcwqEfleci7JwugVNIF3U//0FWKnJT7ptG+20B2jfDqnZAg==
dependencies:
"@remix-run/router" "1.23.3"
cookie "^1.0.1"
set-cookie-parser "^2.6.0"

react-shallow-renderer@^16.15.0:
version "16.15.0"
Expand Down Expand Up @@ -11926,6 +11921,11 @@ set-blocking@^2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==

set-cookie-parser@^2.6.0:
version "2.7.2"
resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz#ccd08673a9ae5d2e44ea2a2de25089e67c7edf68"
integrity sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==

set-function-length@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
Expand Down
Loading