From fe0d432ba436b4205ca5ed6ea19ff089ce329286 Mon Sep 17 00:00:00 2001
From: benjdlambert <ben@blam.sh>
Date: Thu, 21 Aug 2025 08:32:05 +0200
Subject: [PATCH] chore: fix for compatWrapper

Signed-off-by: benjdlambert <ben@blam.sh>
---
 .../src/compatWrapper/compatWrapper.test.tsx  | 41 +++++++++++++++++++
 .../src/compatWrapper/compatWrapper.tsx       | 12 ++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/packages/core-compat-api/src/compatWrapper/compatWrapper.test.tsx b/packages/core-compat-api/src/compatWrapper/compatWrapper.test.tsx
index fe9dab9910..554bba4352 100644
--- a/packages/core-compat-api/src/compatWrapper/compatWrapper.test.tsx
+++ b/packages/core-compat-api/src/compatWrapper/compatWrapper.test.tsx
@@ -40,6 +40,32 @@ import {
 import { convertLegacyRouteRef } from '../convertLegacyRouteRef';
 import { renderInTestApp as renderInOldTestApp } from '@backstage/test-utils';
 
+jest.mock('./BackwardsCompatProvider', () => ({
+  BackwardsCompatProvider: ({ children }: { children: React.ReactNode }) => {
+    const OriginalComponent = jest.requireActual(
+      './BackwardsCompatProvider',
+    ).BackwardsCompatProvider;
+    return (
+      <OriginalComponent>
+        <div data-testid="backwards-compat-provider">{children}</div>
+      </OriginalComponent>
+    );
+  },
+}));
+
+jest.mock('./ForwardsCompatProvider', () => ({
+  ForwardsCompatProvider: ({ children }: { children: React.ReactNode }) => {
+    const OriginalComponent = jest.requireActual(
+      './ForwardsCompatProvider',
+    ).ForwardsCompatProvider;
+    return (
+      <OriginalComponent>
+        <div data-testid="forwards-compat-provider">{children}</div>
+      </OriginalComponent>
+    );
+  },
+}));
+
 describe('BackwardsCompatProvider', () => {
   it('should convert the app context', () => {
     // TODO(Rugvip): Replace with the new renderInTestApp once it's available, and have some plugins
@@ -146,3 +172,18 @@ describe('ForwardsCompatProvider', () => {
     expect(screen.getByText('link: /test')).toBeInTheDocument();
   });
 });
+
+describe('BidirectionalCompatProvider', () => {
+  it('should never render a ForwardsCompatWrapper when in the new system, with one backwards compat provider', () => {
+    renderInNewTestApp(
+      compatWrapper(
+        compatWrapper(compatWrapper(<div data-testid="test-content" />)),
+      ),
+    );
+
+    expect(screen.getByTestId('test-content')).toBeInTheDocument();
+
+    expect(screen.queryAllByTestId('forwards-compat-provider').length).toBe(0);
+    expect(screen.queryAllByTestId('backwards-compat-provider').length).toBe(1);
+  });
+});
diff --git a/packages/core-compat-api/src/compatWrapper/compatWrapper.tsx b/packages/core-compat-api/src/compatWrapper/compatWrapper.tsx
index 206422ffa9..8955b87747 100644
--- a/packages/core-compat-api/src/compatWrapper/compatWrapper.tsx
+++ b/packages/core-compat-api/src/compatWrapper/compatWrapper.tsx
@@ -18,15 +18,21 @@ import { useVersionedContext } from '@backstage/version-bridge';
 import { ReactNode } from 'react';
 import { BackwardsCompatProvider } from './BackwardsCompatProvider';
 import { ForwardsCompatProvider } from './ForwardsCompatProvider';
+import { appTreeApiRef, useApiHolder } from '@backstage/frontend-plugin-api';
 
 function BidirectionalCompatProvider(props: { children: ReactNode }) {
-  const isInNewApp = !useVersionedContext<{ 1: unknown }>('app-context');
+  const isInOldApp = useVersionedContext<{ 1: unknown }>('app-context');
+  const isInNewApp = Boolean(useApiHolder().get(appTreeApiRef));
 
-  if (isInNewApp) {
+  if (isInNewApp && !isInOldApp) {
     return <BackwardsCompatProvider {...props} />;
   }
 
-  return <ForwardsCompatProvider {...props} />;
+  if (isInOldApp && !isInNewApp) {
+    return <ForwardsCompatProvider {...props} />;
+  }
+
+  return props.children;
 }
 
 /**