From d408d210c21b1e638ed16af30b343276035b4d9b Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <me@vinzscam.dev>
Date: Fri, 4 Feb 2022 14:17:36 +0100
Subject: [PATCH] Remove duplicated SearchContextProvider

Signed-off-by: Vincenzo Scamporlino <me@vinzscam.dev>
---
 packages/app/src/components/Root/Root.tsx             | 9 ++-------
 packages/core-app-api/src/apis/system/ApiProvider.tsx | 7 ++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
index 57f1fa536f..2441ace27b 100644
--- a/packages/app/src/components/Root/Root.tsx
+++ b/packages/app/src/components/Root/Root.tsx
@@ -34,10 +34,7 @@ import {
   Settings as SidebarSettings,
   UserSettingsSignInAvatar,
 } from '@backstage/plugin-user-settings';
-import {
-  SidebarSearchModal,
-  SearchContextProvider,
-} from '@backstage/plugin-search';
+import { SidebarSearchModal } from '@backstage/plugin-search';
 import { Shortcuts } from '@backstage/plugin-shortcuts';
 import {
   Sidebar,
@@ -89,9 +86,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
     <Sidebar>
       <SidebarLogo />
       <SidebarGroup label="Search" icon={<SearchIcon />} to="/search">
-        <SearchContextProvider>
-          <SidebarSearchModal />
-        </SearchContextProvider>
+        <SidebarSearchModal />
       </SidebarGroup>
       <SidebarDivider />
       <SidebarGroup label="Menu" icon={<MenuIcon />}>
diff --git a/packages/core-app-api/src/apis/system/ApiProvider.tsx b/packages/core-app-api/src/apis/system/ApiProvider.tsx
index c75f883a51..f1ebf38d71 100644
--- a/packages/core-app-api/src/apis/system/ApiProvider.tsx
+++ b/packages/core-app-api/src/apis/system/ApiProvider.tsx
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-import React, { useContext, ReactNode, PropsWithChildren } from 'react';
+import React, {
+  useContext,
+  ReactNode,
+  PropsWithChildren,
+  useEffect,
+} from 'react';
 import PropTypes from 'prop-types';
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { ApiAggregator } from './ApiAggregator';