From 92cd651fa42c335db003f9112ff19b79720059b5 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Fri, 19 Feb 2021 17:33:01 +0100
Subject: [PATCH] Ditch the feature flag.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 packages/app/src/App.tsx     | 6 +-----
 plugins/search/README.md     | 2 +-
 plugins/search/src/plugin.ts | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 99a6f8096f..7bf503daed 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -17,7 +17,6 @@
 import {
   AlertDisplay,
   createApp,
-  LocalStorageFeatureFlags,
   FlatRoutes,
   OAuthRequestDialog,
   SignInPage,
@@ -89,7 +88,6 @@ const app = createApp({
 
 const AppProvider = app.getProvider();
 const AppRouter = app.getRouter();
-const featureFlags = new LocalStorageFeatureFlags();
 
 const routes = (
   <FlatRoutes>
@@ -103,9 +101,7 @@ const routes = (
     </Route>
     <Route path="/catalog-import" element={<CatalogImportPage />} />
     <Route path="/docs" element={<TechdocsPage />} />
-    {featureFlags.isActive('use-search-platform') && (
-      <Route path="/search" element={<SearchPage />} />
-    )}
+    <Route path="/search-next" element={<SearchPage />} />
     <Route path="/create" element={<ScaffolderPage />} />
     <Route path="/explore" element={<ExplorePage />} />
     <Route
diff --git a/plugins/search/README.md b/plugins/search/README.md
index 92e7eda15a..498cc47586 100644
--- a/plugins/search/README.md
+++ b/plugins/search/README.md
@@ -14,7 +14,7 @@ The above search experience is 100% client-side and only looks at the Software C
 
 In order to work on this new search platform, you will need to be aware of the following:
 
-- **The use-search-platform feature flag**: The new search platform will move the primary search page to the App-level, out of the search plugin. You'll need to enable this feature flag to work on the new platform.
+- **In-development app search route**: The new search platform will move the primary search page to the App-level, out of the search plugin. For now, to ensure the old experience is still easy to test, you can work on the new platform at `/search-next` instead of `/search`.
 - **App SearchPage Component**: You'll find a new search page under `/packages/app/src/components/search`. When ready, we'll add an equivalent page to the `@backstage/create-app` template.
 - **Backend**: Don't forget, a lot of functionality will be made available in backend plugins:
   - `@backstage/plugin-search-indexer-backend`, which is responsible for the search index management
diff --git a/plugins/search/src/plugin.ts b/plugins/search/src/plugin.ts
index 81d4489655..37503b7751 100644
--- a/plugins/search/src/plugin.ts
+++ b/plugins/search/src/plugin.ts
@@ -27,9 +27,8 @@ export const rootRouteRef = createRouteRef({
 
 export const searchPlugin = createPlugin({
   id: 'search',
-  register({ router, featureFlags }) {
+  register({ router }) {
     router.addRoute(rootRouteRef, SearchPageComponent);
-    featureFlags.register('use-search-platform');
   },
   routes: {
     root: rootRouteRef,